Jaime van Kessel
c06ffe6cae
Moved auth state changed check to first thing set auth checks
...
This should contribute to the windows authentication issues.
Most windows devices seemed to get all the auth state messages twice.
2017-03-07 11:55:29 +01:00
Jaime van Kessel
6dcd3b44b6
Removed uneeded debug code
...
The method is always put, so no need to log it.
2017-03-07 11:44:40 +01:00
Jaime van Kessel
85d979cf50
Removed unneeded check from network printing.
...
We used to not have a printer_state so this check was needed.
2017-03-07 11:41:18 +01:00
Jaime van Kessel
059b31b25a
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-07 11:01:59 +01:00
Jaime van Kessel
414337dead
Fixed 3mf writing
...
The type hinting changes also changed the way we handle certain imports, which caused saving to fail.
CURA-3215
2017-03-07 11:01:03 +01:00
Jack Ha
efbc624ea8
More defensive setExtruderOpacity, removed unnecessary part. CURA-3321
2017-03-07 10:40:59 +01:00
Jack Ha
c10dc2f07c
Set old permissions back. CURA-3321
2017-03-07 10:36:30 +01:00
Jack Ha
42d939b34e
Solved merge conflict. CURA-3321
2017-03-07 10:34:53 +01:00
Ghostkeeper
d1fada78e6
Merge branch '3mf_speedup'
2017-03-06 17:03:42 +01:00
Jaime van Kessel
04c2186b74
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-06 16:17:30 +01:00
Jaime van Kessel
356d4f9288
Heated bed timeout time now hides correctly if time ran out
...
CURA-3360
2017-03-06 14:41:33 +01:00
Tim Kuipers
87c8ff0e08
Merge branch 'mb-infill-line-angles' of https://github.com/smartavionics/Cura into smartavionics-mb-infill-line-angles
2017-03-06 14:31:57 +01:00
Jack Ha
b2e06bed37
Fix 'inverting slider' when switching between Layer view and a different view. CURA-3321
2017-03-06 14:03:42 +01:00
Jack Ha
1f61017946
Fix updateLegend function. CURA-3321
2017-03-06 13:20:14 +01:00
Jack Ha
1c40c94c44
Fix compatibility options. CURA-3321
2017-03-06 11:55:39 +01:00
Jaime van Kessel
433d45cdae
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-02 17:11:44 +01:00
Jaime van Kessel
bae7af1ea0
Dots in the ID no longer confuse workspace reader
...
CURA-3450
2017-03-02 17:06:10 +01:00
Jack Ha
e89b1afa2c
Initial layer view color mode -> legend. CURA-3321
2017-03-02 16:55:54 +01:00
Jack Ha
bedb41b6d3
SliceInfo now only sends sliceable model hashes (layer data was also sent)
2017-03-02 16:44:40 +01:00
Jack Ha
1029fb4ddd
Not to trigger reslice happy anymore, only retrigger if necessary. Also using isSliceable instead of property check when inspecting root node. CURA-3413 CURA-3412
2017-03-02 16:38:31 +01:00
U-ULTIMAKER\j.ha
c54d5ce707
Fixed compatibility mode active extruder. CURA-3321
2017-03-02 13:15:29 +01:00
Jack Ha
bdd07bd160
Removed commented out stuff. CURA-3321
2017-03-01 14:54:12 +01:00
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