2061 Commits

Author SHA1 Message Date
Jack Ha
f9a5dc885c Solved merge conflicts #1479 CURA-3321 2017-03-01 14:47:54 +01:00
Jack Ha
8a8b97d371 CuraEngineBackend now properly postpones onSceneChanged instead of ignoring some. CURA-3413 2017-03-01 11:45:50 +01:00
Jack Ha
34d283db53 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-01 10:55:38 +01:00
Jack Ha
0eec48b9e3 Fix reslice when deleting nodes, fix moving groups. CURA-3412 2017-03-01 10:53:53 +01:00
Ghostkeeper
9ea7681ba0
Fix selecting heated bed for UMO
This was broken by the type hinting refactors.

Contributes to issue CURA-3405.
2017-03-01 09:47:30 +01:00
Jack Ha
f22299c80d Added option for show_travels in compatibility mode top layers. CURA-3321 2017-02-28 14:43:46 +01:00
Jack Ha
ba6a8eb869 Legend is now in the switching layer type area, removed legend upper right. CURA-3321 2017-02-28 13:34:58 +01:00
Jack Ha
27f013fd81 Cleanup layout, finalizing 2017-02-28 11:52:51 +01:00
Jack Ha
8b7aee1664 Adjusted menu, added View Mode: Layers. CURA-3321 2017-02-27 14:16:56 +01:00
Jack Ha
fa1b332733 Moved layer view menu to left, next to sliders. CURA-3321 2017-02-27 14:06:17 +01:00
Jack Ha
8237421bcf Undo testing QVector3D. CURA-3334 2017-02-27 13:33:55 +01:00
Jack Ha
d300aad781 Merge branch 'master' of github.com:Ultimaker/Cura 2017-02-27 11:20:29 +01:00
Jack Ha
ccac9277a9 Undo old testcode, added testcode for CURA-3334 2017-02-27 11:20:22 +01:00
Simon Edwards
4ab6b74930 Fixed a bunch of error which were reported by PyCharm's code analysis. 2017-02-26 21:05:09 +01:00
Ghostkeeper
7bb486a34b
Don't process status updates of pre-heating while request is going on
There was the problem that you'd click on pre-heat, so locally it would display the time-out. Then a package came in with the out-dated print status saying that the printer is not pre-heating, so the pre-heat was cancelled on Cura's side. Then the next status update came in saying that the pre-heat is now busy, so the pre-heat is resumed on Cura's side. So the button was flicking back and forth once after pressing. This commit makes Cura ignore any status updates that come while the put-request is still going on, because they may be outdated. It'll appear nicer to the user, mostly.

Contributes to issue CURA-3360.
2017-02-24 17:44:37 +01:00
Ghostkeeper
39920c95f3
Interpret cancelling pre-heat properly
If someone on a different computer cancels the pre-heat, this is now correctly updated locally.

Contributes to issue CURA-3360.
2017-02-24 17:14:54 +01:00
Ghostkeeper
d60014fa30
Sync remaining pre-heat time with printer
If multiple instances of Cura are running or Cura is restarted, it now properly syncs the remaining pre-heat time with the printer, so that all instances display the proper time.
There's still a bug in here that pressing cancel has no effect the first time since the remaining pre-heat time is updated immediately from the printer before the command to cancel got through remotely. I'll see what I can do to amend that. Also, cancelling is not yet synced.

Contributes to issue CURA-3360.
2017-02-24 14:53:00 +01:00
Jack Ha
36476a14bb Solved merge conflicts 2017-02-23 14:40:49 +01:00
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
fieldOfView
7a336bbe67 Change separator for extruder_opacities to |
Comma as a separator might cause confusion/(user-)errors with localised floating point numbers.
2017-02-21 22:37:32 +01:00
fieldOfView
aef34d4688 Fix i18n context 2017-02-21 22:28:47 +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
fieldOfView
73253d3807 Fix loading opacities from preferences 2017-02-20 13:31:59 +01:00
fieldOfView
26fe46ce1f Translate layerview mode types 2017-02-20 12:32:49 +01:00
fieldOfView
f8a3c3b0ba Factor out repeated extruder visibility checkboxes 2017-02-20 12:27:37 +01:00
fieldOfView
61e0cd4ff5 Move legacy options to layerview options 2017-02-20 11:09:34 +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