Commit graph

6967 commits

Author SHA1 Message Date
Jaime van Kessel
6cf1fa4121 Removed uneeded global container changed signal hook
CURA-3221
2017-03-01 13:27:25 +01:00
Jaime van Kessel
1ba8ee2051 Fixed issue that in some cases not all changed settings for all extruders were shown
CURA-3221
2017-03-01 11:35:06 +01:00
Jaime van Kessel
9b63f1237a Instead of the setting function we now show the calculated value for settingoverride dialog
CURA-3221
2017-03-01 09:48:26 +01:00
Simon Edwards
807542cc1f Fixed a merge problem.
CURA-3431 Not possible to export a profile
2017-02-28 14:38:28 +01:00
Jaime van Kessel
4d32bbda99 Values are now converted to string.
For some reason this causes a different rounding to occur. I don't know why, but it does solve the problem

CURA-3221
2017-02-28 13:42:35 +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
Jaime van Kessel
85b58c9296 Pressing the discard button now actually discards the changes
CURA-3221
2017-02-28 12:35:08 +01:00
Jaime van Kessel
2462699982 Switching profiles now shows a new dialog with all the changes.
CURA-3221
2017-02-28 10:25:42 +01:00
Jack Ha
8237421bcf Undo testing QVector3D. CURA-3334 2017-02-27 13:33:55 +01:00
Jack Ha
fbc7e0f7c4 Take retraction_hop_enabled into account for extra z clearance. CURA-2729 2017-02-27 13:13:34 +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
18368f3ad4 Type hints and fixes for ContainerManager. 2017-02-26 21:07:08 +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
Jack Ha
f885f3e1dd Testing CameraAnimation change CURA-3334 2017-02-23 16:49:28 +01:00
Jack Ha
b0c8a4df7a Removed debug log. CURA-2729 2017-02-23 14:41:18 +01:00
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