Jack Ha
4bf823cc68
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-23 14:24:18 +01:00
Jack Ha
9bd973ab7b
Build volume now takes z hop height into account. CURA-2729
2017-02-23 14:23:51 +01:00
Jaime van Kessel
3039315408
Merge branch 'master' of github.com:Ultimaker/Cura
2017-02-22 17:07:06 +01:00
Jaime van Kessel
ab28cb4615
Fix import changes
...
These broke the importing & exporting of profiles
2017-02-22 17:06:28 +01:00
Jack Ha
b568ad701b
Fixed convex hull for triangles. CURA-3314
2017-02-22 16:30:57 +01:00
Jack Ha
3ca9ae145e
Undo logging and splitting up QVector3D. CURA-3334
2017-02-22 14:35:51 +01:00
Jack Ha
0eb5e59c9f
Split CameraAnimation.setStart to debug more. CURA-3334
2017-02-22 13:23:25 +01:00
Jack Ha
e97d75b7c8
Added logging for camera animation. Help debugging CURA-3334
2017-02-22 11:33:55 +01:00
Jack Ha
c785256ac4
Possible fix for CURA-3334
2017-02-22 10:38:07 +01:00
Jack Ha
bb955ca5ab
Tickle the backend if per object settings are changed. CURA-3273
2017-02-21 16:12:25 +01:00
Jack Ha
580010b673
Undo only abbreviation as job name. CURA-3226
2017-02-21 15:15:50 +01:00
Jack Ha
d0721b1feb
Solved merge conflict
2017-02-21 14:55:06 +01:00
Jack Ha
b257632b14
Better file name for saving file (project) without suggested name. CURA-3226
2017-02-21 14:53:28 +01:00
Jaime van Kessel
9ceda261b7
Setting an empty printjob name no longer causes a single prefix to be added.
...
CURA-3387
2017-02-21 14:01:30 +01:00
Jaime van Kessel
033c08d3ff
CreateJob name no longer adds the same abbreviation multiple times
...
Contributes to CURA-3387
2017-02-21 13:30:44 +01:00
Jack Ha
057dc2fd7d
Solved merge conflicts. CURA-3214
2017-02-21 11:01:20 +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
Jaime van Kessel
8e05ba46a6
Merge branch 'fix_slot_property_confusion' of https://github.com/fieldOfView/Cura
2017-02-17 15:26:40 +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
Ghostkeeper
83b290b8d3
Use full import path for parent class
...
Something seems off with the build for some reason. I'm trying to fix it this way.
2017-02-17 12:42:11 +01:00
Ghostkeeper
cec3eebace
Replace list-to-set cast with normal set literal
...
Don't know who did this but he did wrong, yo.
2017-02-17 10:16:11 +01:00
Jack Ha
bb030c724b
Fixed layerview extruder choice checkboxes. CURA-3273
2017-02-16 15:56:37 +01:00
Jack Ha
74ce600978
Comments and removed logs. CURA-3214
2017-02-16 15:23:31 +01:00
Ghostkeeper
abf092512a
Don't show temperature if print core is removed in UM3
...
The empty string as hotend ID is interpreted as there being no hotend, since this is what the UM3 returns in that case.
Contributes to issue CURA-3161.
2017-02-16 13:23:20 +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
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
e6e5d7862e
Removed testfunctions. CURA-3214
2017-02-16 10:57:31 +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
Jack Ha
59a8c21c73
Turn slice automatically off now correctly visualizes Prepare button. CURA-3214
2017-02-16 09:55:49 +01:00
Jack Ha
ca84fdd767
Merge branch 'master' into feature_auto_slice
2017-02-15 12:42:09 +01:00
Jack Ha
78de5412a2
Merge branch 'master' into layer_view3_cleanup
2017-02-15 10:57:24 +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
Mark Burton
0237a5a386
Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles
...
# Conflicts:
# cura/CuraApplication.py
2017-02-15 08:20:45 +00:00
Simon Edwards
cb400f0257
Fix for a recent merge problem.
2017-02-14 13:36:03 +01:00
Simon Edwards
92cee4a9d7
Merge branch 'master' into python_type_hinting
2017-02-13 16:31:31 +01:00
Jack Ha
e5cdc318f7
Added preference. CURA-3214
2017-02-13 14:29:34 +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
Simon Edwards
2020ff5622
Removed the debug which we no longer need.
...
CURA-3335 Single instance Cura and model reloading
2017-02-13 13:27:10 +01:00
Jack Ha
106cb6ded9
Fixed compatibility mode. CURA-3273
2017-02-13 12:47:04 +01:00
Simon Edwards
234130eb7a
Added a static "app version" method.
...
CURA-3335 Single instance Cura and model reloading
2017-02-13 11:58:14 +01:00
Ghostkeeper
34dccfd6a6
Fix updating extruder names on machine switch
...
The extruder name is asked from the extruder manager, so that the signal from extruder manager properly updates it once the new name is available.
Contributes to issue CURA-3161.
2017-02-13 11:57:01 +01:00
Jaime van Kessel
94439eddd4
Merge branch 'switching_performance_fixes' of github.com:Ultimaker/Cura
2017-02-13 11:07:36 +01:00
Simon Edwards
88395ebb6a
Reliability fix and more debug for testing purposes.
...
CURA-3335 Single instance Cura and model reloading
2017-02-12 20:37:48 +01:00
Ghostkeeper
0c9b9a3033
Add fallback name property in PrinterOutputDevice
...
It'll call this property, which gives an empty string, if the device doesn't implement giving a name.
Contributes to issue CURA-3161.
2017-02-09 17:34:51 +01:00
Ghostkeeper
e37d8b949e
Add fallback in PrinterOutputDevice for getting address
...
The fallback gives a warning that it's not implemented.
Contributes to issue CURA-3161.
2017-02-09 10:31:35 +01:00
Ghostkeeper
c5655d4d8c
Document preheatBedTimeout
...
Must've slipped through the cracks.
Contributes to issue CURA-3161.
2017-02-09 09:32:14 +01:00
Ghostkeeper
d7b0336c24
Fix colour of unknown material
...
The other colour was just used for debugging.
Contributes to issue CURA-3161.
2017-02-08 12:42:40 +01:00
Jack Ha
47ab49795f
Added comments, changed small layout and id thing. CURA-3273
2017-02-08 11:48:00 +01:00
