Commit graph

18863 commits

Author SHA1 Message Date
Diego Prado Gesto
ab83af3a03 Fix code-style 2018-12-17 12:20:30 +01:00
Daniel Schiavini
87c1392173 STAR-322: Fixing tests 2018-12-17 12:05:25 +01:00
Daniel Schiavini
9eb743bcb8 STAR-322: Making mypy happy 2018-12-17 12:01:10 +01:00
Simon Edwards
81c0d7efc0
Merge pull request #5006 from Ultimaker/fix_um3_info_component_warnings
Fix UM3InfoComponents warnings
2018-12-17 11:59:25 +01:00
Ian Paschal
6178f9ddf6 Improve code style and line lengths 2018-12-17 11:49:09 +01:00
Daniel Schiavini
9f4b7bd703 STAR-322: Improving logging and cluster connection 2018-12-17 11:28:16 +01:00
Diego Prado Gesto
e62a570210 Merge branch '4.0' into CURA-6005_cura_drive_plugin 2018-12-17 11:25:19 +01:00
Diego Prado Gesto
ed4d339dee Change the margin in the view orientation buttons to aling the pixels correctly 2018-12-17 11:00:49 +01:00
Jaime van Kessel
938287095f Use connection type instead of um_network_key to see if a printer has a network connection
CURA-6011
2018-12-17 10:47:14 +01:00
Diego Prado Gesto
ddf3c13b2a Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-17 10:43:53 +01:00
Diego Prado Gesto
cbd8e72bd5 Add fixed width to the preview button
Doing that, the elide will work. Also increase the size of the panel a bit so it will fit better in other languages. Adding also the tooltip in case the text is too long in other languages.
2018-12-17 10:42:52 +01:00
Ian Paschal
ff1a0e30f6 Code style & comments 2018-12-17 10:42:41 +01:00
Daniel Schiavini
9086105204 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload 2018-12-17 10:38:29 +01:00
Ghostkeeper
8d6a281070
Increment SDK version in bundled packages file
And increment the version number of every package.

Contributes to issue CURA-6019.
2018-12-17 09:58:38 +01:00
Ian Paschal
77deabf6d4 Code style 2018-12-17 09:43:24 +01:00
ChrisTerBeke
d900648f99 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-17 09:28:22 +01:00
Diego Prado Gesto
328f326153 Use a specific color for the icons 2018-12-17 09:15:47 +01:00
Diego Prado Gesto
36ccef4209 Remove duplicate iconColor property in the IconWithText component
Probably it was a mistake in a merge conflict
2018-12-17 09:08:32 +01:00
Lipu Fei
4ab123eb87 Merge remote-tracking branch 'origin/CURA-6028_stage_button_fixes' into 4.0 2018-12-17 08:48:31 +01:00
Lipu Fei
efb832702b
Merge pull request #4976 from Ultimaker/CURA-6013-rate-packages
Cura 6013 rate packages
2018-12-17 08:32:18 +01:00
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 3766effa81.
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