1771 Commits

Author SHA1 Message Date
Jaime van Kessel
e32c67ccd3 Merge branch 'master' of github.com:Ultimaker/Cura 2017-02-22 09:43:45 +01:00
Jaime van Kessel
beea9caf04 Clarified unable to print over USB message for ulti-gcode 2017-02-22 09:43:24 +01:00
Jack Ha
bb955ca5ab Tickle the backend if per object settings are changed. CURA-3273 2017-02-21 16:12:25 +01:00
Jaime van Kessel
ee1fbefe86 Machine type is also added when adding manual printer
Fixes CURA-3356
2017-02-21 14:38:04 +01:00
Jack Ha
057dc2fd7d Solved merge conflicts. CURA-3214 2017-02-21 11:01:20 +01:00
Jack Ha
5a76c92dda Small improvements: rename, log message, QObject parent, return value. CURA-3214 2017-02-21 10:52:56 +01:00
Jack Ha
2f7644c34e Travel moves are now flat planes, on top of the 'tubes'. CURA-3273 2017-02-21 10:00:29 +01:00
Jack Ha
24d04558f0 Merged LayerView show_adhesion and show_support into show_helpers. CURA-3273 2017-02-20 15:56:29 +01:00
Jack Ha
e82bb29e1d Revert translation of listmodel text. CURA-3273 2017-02-20 09:57:25 +01:00
Jack Ha
fd2525768d Capitalized labels, made them translatable. CURA-3273 2017-02-20 09:55:07 +01:00
Jack Ha
cd54552498 Merge branch 'master' of github.com:Ultimaker/Cura 2017-02-20 09:45:51 +01:00
Jack Ha
b229d38a88 LayerView checkboxes are not remembered; added switching Legend on for compatibility mode. CURA-3273 2017-02-20 09:45:37 +01:00
fieldOfView
04ab33b913 Fix legend in compatibility mode 2017-02-17 14:07:19 +01:00
fieldOfView
9229027001 Refactor properties that start with 'get' to avoid confusion between slots & properties
Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.
2017-02-17 13:35:01 +01:00
Jack Ha
74ce600978 Comments and removed logs. CURA-3214 2017-02-16 15:23:31 +01:00
Jack Ha
600a5d85e4 Added comments, changed text of NotStarted. CURA-3214 2017-02-16 15:07:26 +01:00
Jack Ha
18318348b6 Fixed last bugs in manual slicing. CURA-3214 2017-02-16 14:44:45 +01:00
Ghostkeeper
d2fa6dbae2
Notify to update remaining time when it drastically changes
When the time passes normally it doesn't trigger this signal but just go on counting, but when the pre-heat starts or cancels it updates via this signal. This is handy for the future, when we want to update the remaining time from the printer information. However for now it is also nice because we can make the pre-heat timer dependent on this signal so we know when to have it running. This fixes the problem that the pre-heat seems to have been cancelled in the GUI when you switch away the tab, because the timer running is now dependent on the property rather than always false.

Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
3cc11ecae5
Log when pre-heating or cancelling pre-heat
To help debugging and because it's a user interaction.

Contributes to issue CURA-3161.
2017-02-16 12:58:39 +01:00
Ghostkeeper
75a50b73c2
Move pre-heat timer into PrinterOutputDevice
If it's held inside the device that has two advantages: It's being held per-device, so switching connection doesn't stop the timer. And also, the logic is no longer in the GUI.

Contributes to issue CURA-3161.
2017-02-16 12:58:32 +01:00
Jack Ha
464bf73f85 Made backend available in qml, calling forceSlice and stopSlicing directly. CURA-3214 2017-02-16 10:56:01 +01:00
Simon Edwards
2f89a1cff4 Small fix for a regression in the ThreeMFWriter from the recent type hint merge. 2017-02-16 10:20:44 +01:00
Jack Ha
db984561e9 Almost done with manual and auto slicing. CURA-3214 2017-02-15 16:02:14 +01:00
Jaime van Kessel
b34bb26a1a Fixed broken getInstance caused by refactor 2017-02-15 13:51:53 +01:00
Jack Ha
94badb1b9f Fix auto slice after startup. CURA-3214 2017-02-15 13:51:24 +01:00
Jaime van Kessel
b187cf89a5 Fixed broken logging 2017-02-15 13:50:02 +01:00
Jack Ha
ca84fdd767 Merge branch 'master' into feature_auto_slice 2017-02-15 12:42:09 +01:00
Jack Ha
aab17608ff Fixed shader bugs, lines are now nice and smooth again. CURA-3273 2017-02-15 11:53:20 +01:00
Jack Ha
ce226ebbea Fix layerview checkboxes. CURA-3273 2017-02-15 11:35:49 +01:00
Jack Ha
78de5412a2 Merge branch 'master' into layer_view3_cleanup 2017-02-15 10:57:24 +01:00
Jack Ha
9e973732f5 Fixed remember coloring type in Layer View. CURA-3273 2017-02-15 10:50:21 +01:00
Jack Ha
4e65a7034f Added switch for using timer and no timer in CuraEngineBackend. Still have to fix TODO and finish. CURA-3214 2017-02-15 10:32:38 +01:00
Ghostkeeper
42982b7a86
Fix link to UM.Version.Version
The Version object is no longer exposed via UM.__init__, so we have to dig inside the UM.Version module to get it.

Contributes to issue CURA-2917.
2017-02-14 17:03:37 +01:00
Ghostkeeper
b488441d81
Fix link to ContainerRegistry
This one was forgotten because it is in a comment.

Contributes to issue CURA-2917.
2017-02-14 17:00:33 +01:00
Ghostkeeper
5055c534c5
Fix links to ContainerRegistry
ContainerRegistry is no longer exposed in UM.Settings.__init__, so we must dig the class up from inside the module.

Contributes to issue CURA-2917.
2017-02-14 16:57:21 +01:00
Simon Edwards
92cee4a9d7 Merge branch 'master' into python_type_hinting 2017-02-13 16:31:31 +01:00
Jaime van Kessel
e6c8a11017 Merge branch 'master' of github.com:Ultimaker/Cura 2017-02-13 14:16:59 +01:00
Jaime van Kessel
e8c5f81c79 Merge branch 'feature_preheat_bed' of github.com:Ultimaker/Cura 2017-02-13 14:16:50 +01:00
Jaime van Kessel
cc396d5357 Fixed target temp never updating 2017-02-13 14:16:22 +01:00
Ghostkeeper
a3af887d3f
Add support for WSH USB driver when not filtering USB-only
This support was included when filtering for USB only, but not the case when we are not filtering. I don't like this bit of code much since we should just define a list of paths to check and iterate over it, so that we can re-use the data and prevent syncing mistakes like this.
2017-02-13 13:46:30 +01:00
Jaime van Kessel
f62030dae5 setTargetBed temperature now directly sets target temp
This is instead of sending /bed/temperature a json which contains target & temp as keyvalue.
2017-02-13 13:30:51 +01:00
Jaime van Kessel
6deaf5bd65 Failure logging for network printing is now more explicit (also prints what the operation was) 2017-02-13 13:28:32 +01:00
Jaime van Kessel
8d7b813318 All good 20x http replies are now accepted 2017-02-13 13:26:36 +01:00
Jack Ha
488b952815 Fix 4.1 shader for line types. CURA-3273 2017-02-13 13:21:30 +01:00
Jaime van Kessel
ce5f435be9 Merge branch 'master' of github.com:Ultimaker/Cura 2017-02-13 11:07:25 +01:00
Jaime van Kessel
c18fb02f82 Removed unneeded (and somewhat expensive) checks
CURA-3311
2017-02-13 11:06:21 +01:00
Jack Ha
7000717f6e Fixed warning non-NOTIFYable properties, added signals for propertiesChanged. CURA-3273 2017-02-13 09:58:33 +01:00
Torsten Blindert
2fca555ea6 FEATURE: Support wsh usb driver 2017-02-11 16:34:49 +01:00
Jaime van Kessel
7838888d5c Merge branch '2.4' of github.com:Ultimaker/Cura 2017-02-10 16:43:08 +01:00
Jaime van Kessel
185f5fe1c4 Added a clarification to the changelog regarding the inital print temperature 2017-02-10 16:41:49 +01:00