18328 Commits

Author SHA1 Message Date
Danny Tuppeny
46c950a5b9
Add Monoprice Ultimate based on Wanhao D6
The default values on my Monoprice Ultimate are way different to what Cura has the Wanhao Duplicator 6 as. I'm guessing that Monoprice have changed these (if not, then maybe the Duplicator 6 file is wrong?). Without this profile, I had a 4hr print estimate for a piece that's only 55% through after 4hours. With this profile, it estimates 7:22 (which seems very accurate).

I got the default values from the printer when I connected Octoprint to it:

```
  21:20:56: Attempting to connect to printer
  21:20:56: Connection opened
< 21:20:57: start
> 21:20:57: N1 M110 *2
< 21:20:57: echo:Marlin 1.0.0
> 21:20:57: N2 M110 *1
< 21:20:57: echo: Last Updated: Jun 26 2016 12:14:19 | Author: Version DEV 3.01
> 21:20:57: N3 M115 *5
< 21:20:57: Compiled: Jun 26 2016
< 21:20:57: echo: Free Memory: 1961  PlannerBufferBytes: 1232
< 21:20:57: echo:Stored settings retrieved
< 21:20:57: echo:Steps per unit:
< 21:20:57: echo:  M92 X80.04 Y80.04 Z400.48 E94.30
< 21:20:57: echo:Maximum feedrates (mm/s):
< 21:20:57: echo:  M203 X300.00 Y300.00 Z5.00 E25.00
< 21:20:57: echo:Maximum Acceleration (mm/s2):
< 21:20:57: echo:  M201 X3000 Y3000 Z100 E500
< 21:20:57: echo:Acceleration: S=acceleration, T=retract acceleration
< 21:20:57: echo:  M204 S800.00 T800.00
< 21:20:57: echo:Advanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (ms), X=maximum XY jerk (mm/s),  Z=maximum Z jerk (mm/s),  E=maximum E jerk (mm/s)
< 21:20:57: echo:  M205 S0.00 T0.00 B20000 X10.00 Z0.40 E1.00
< 21:20:57: echo:Home offset (mm):
< 21:20:57: echo:  M206 X0.00 Y0.00 Z0.40
```
2018-12-16 19:57:43 +00:00
Ghostkeeper
c235f339ae
Increment API version to 6
All plug-ins now have to re-check whether they are still compatible with the current version of Cura.

Contributes to issue CURA-6019.
2018-12-14 17:29:02 +01:00
Jaime van Kessel
b8a4d8e80d Remove the cluster connection type
CURA-6011
2018-12-14 17:14:56 +01:00
Jaime van Kessel
226d052468 Move the machines from machinelist into their own model
CURA-6011
2018-12-14 17:10:58 +01:00
Ian Paschal
331cd730f1 Improve visual hint that side cards are not in focus
Contributes to CL-1151
2018-12-14 16:56:20 +01:00
Ian Paschal
e877b47e22 Disable printer cards which are not in focus
Contributes to CL-1151
2018-12-14 16:55:48 +01:00
Ian Paschal
2112681217 Merge remote-tracking branch 'origin/4.0' into CL-1151_add_monitor_carousel 2018-12-14 16:46:05 +01:00
ChrisTerBeke
08ab28a23a Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:41:52 +01:00
Jaime van Kessel
ef6f666c3e Remove duplicate alias definition
Yay. Merges.
2018-12-14 16:41:07 +01:00
ChrisTerBeke
0bbd77e0f0 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:34:52 +01:00
Ian Paschal
6747fe3550 Merge remote-tracking branch 'origin/4.0' into CL-1151_add_monitor_carousel 2018-12-14 16:31:47 +01:00
Ian Paschal
38ca23a22f
Merge pull request #4997 from Ultimaker/prevent_monitor_stage_overlap
Quick fix to prevent monitor stage from overlapping header
2018-12-14 16:29:39 +01:00
Ghostkeeper
3744509452
Merge branch '4.0' 2018-12-14 16:28:36 +01:00
Ghostkeeper
78a5f95c43
Merge branch 'CURA-5876_fixes' into 4.0 2018-12-14 16:28:04 +01:00
Ian Paschal
74af11d609 Anchor loader to stage menu vertical center 2018-12-14 16:20:08 +01:00
Daniel Schiavini
3194a6d0bb Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload 2018-12-14 16:17:36 +01:00
Aleksei S
9146a775a4 After resetting the custom settings the quality slider did not update selected value
CURA-6028
2018-12-14 16:17:05 +01:00
Ian Paschal
ffccbcea2f Anchor to bottom of header background 2018-12-14 16:13:49 +01:00
Ian Paschal
2789a0fdc4 Revert "Quick fix to prevent monitor stage from overlapping header"
This reverts commit 3766effa81dc111d70c0d7ff4563936ec92fc5c4.
2018-12-14 16:13:35 +01:00
ChrisTerBeke
2772b3bcbd Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:10:20 +01:00
Ian Paschal
3766effa81 Quick fix to prevent monitor stage from overlapping header 2018-12-14 16:04:31 +01:00
Daniel Schiavini
e815d5da8f STAR-322: Avoiding lambdas and direct callbacks to avoid gc 2018-12-14 16:02:28 +01:00
Ian Paschal
30168103b7 Update MonitorStage.qml 2018-12-14 15:47:36 +01:00
Ian Paschal
3bd5d141ab Add easing and make animation less snappy and awesome
Contributes to CL-1151
2018-12-14 15:39:17 +01:00
Ian Paschal
2f6a274c0e Small style improvements
Contributes to CL-1151
2018-12-14 15:27:55 +01:00
Lipu Fei
ae695b77e6 Add native rendering for QML Label
CURA-6013
2018-12-14 15:23:59 +01:00
Ian Paschal
b2ea597543 Fix button color
Contributes to CL-1151
2018-12-14 15:10:34 +01:00
Ian Paschal
5d0da580b9 Fix border colors 2018-12-14 15:04:22 +01:00
Ghostkeeper
2e835bf48d
Merge branch '4.0' 2018-12-14 15:02:30 +01:00
Ghostkeeper
3a74511d23
Remove padding from views selector
This padding made it break the height of the item for some reason. I guess that is a Qt bug.
In any case, the padding shouldn't be there either since the lining is on the inside of the child buttons so the padding only causes a gap to appear on the left and right sides, which looks weird.

Contributes to issue CURA-6029.
2018-12-14 15:02:14 +01:00
Ian Paschal
7fc5742b7f Add monitor carousel
Contributes to CL-1151
2018-12-14 15:01:40 +01:00
Daniel Schiavini
2f08854097 STAR-322: Using QNetworkReply.finished signal instead of QNetworkAccessManager.finished 2018-12-14 14:50:15 +01:00
Jaime van Kessel
b70a4ae0a2 Merge branch 'CURA-6015_fix_osx_crash' of github.com:Ultimaker/Cura into 4.0 2018-12-14 13:35:37 +01:00
Ghostkeeper
64e436f814
Merge branch '4.0' 2018-12-14 13:27:54 +01:00
Ghostkeeper
475b008310
Reduce minimum window size slightly
This way it just fits on the screen of a 13 inch MacBook Air.
2018-12-14 13:27:36 +01:00
Jaime van Kessel
c4a0f19d56 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-14 13:23:43 +01:00
Jaime van Kessel
d379f94775 Make the dark theme a bit more readable 2018-12-14 13:23:28 +01:00
Ghostkeeper
a010823a4e
Fix warning when active stage is not yet instantiated
Edit: Originally this was more or less the same fix as what Diego just did at the same time, which caused a merge conflict, but I think my solution is more elegant than the ternary operator that was originally there so I'm keeping mine.
2018-12-14 13:22:32 +01:00
Ghostkeeper
8a4a1c9d49
Don't let print info take space if invisible
This way there is a little bit more space for the text 'No time estimation available', which was previously abbreviated to 'No time estimation availa...'.
2018-12-14 13:21:00 +01:00
Lipu Fei
a02bccf74d Fix NozzleModel to work with new ListModel data update
CURA-6015

ListModels should not modify items directly. All ListModels should use
setItems() and the insertions/removals/modifications will be done in
setItems() itself.
2018-12-14 13:00:06 +01:00
Daniel Schiavini
4dc8edb996 STAR-322: Fixing the multipart upload 2018-12-14 12:48:40 +01:00
ChrisTerBeke
53eae3ee92 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 12:04:31 +01:00
Jaime van Kessel
c3aca8907c Fix extruder number not being visible in dark theme 2018-12-14 12:02:52 +01:00
Jaime van Kessel
6a3ac99551 Ensure that all icons use the same color from theme.
Also added some fixes for the dark theme
2018-12-14 11:59:22 +01:00
Lipu Fei
cd3a9e02d6 Merge remote-tracking branch 'origin/4.0' into CURA-6015_fix_osx_crash 2018-12-14 11:45:51 +01:00
Lipu Fei
a18203b286 Fix typing
CURA-6011
2018-12-14 11:37:32 +01:00
Jaime van Kessel
15cd2a9269 Changed textColor of recommended infill slider text to be themed.
This is required to make the dark theme work correctly
2018-12-14 11:36:40 +01:00
Lipu Fei
4252b95603 Make ConnectionType Enum type accessible to QML
CURA-6011
2018-12-14 11:28:21 +01:00
Lipu Fei
a1ad7851d9 Merge remote-tracking branch 'origin/4.0' into CURA-6011_connection_types 2018-12-14 11:11:40 +01:00
Jaime van Kessel
5e4e52e6fc Fix blue square being shown in selector if no icon is set
CURA-5876
2018-12-14 11:09:48 +01:00