Jaime van Kessel
c0cdddd098
Cura no longer crashes when NaN is recieved for printtime from engine
...
CURA-3516
2017-03-14 09:59:55 +01:00
Tim Kuipers
8698b3e662
Merge remote-tracking branch 'origin/2.5' into feature_mold
2017-03-13 17:35:37 +01:00
Tim Kuipers
914aa89711
feat: model to mold (CURA-3512)
2017-03-13 17:19:29 +01:00
Jack Ha
32d5fbe557
Fixed choosing a quality that is compatible with multiple extruders as fallback. CURA-3510
2017-03-13 17:17:56 +01:00
Lipu Fei
55727f20e5
CURA-3507 Make quality lookup more robust
2017-03-13 09:45:23 +01:00
Lipu Fei
2ac4a7aca9
CURA-3482 _onMaterialMetaDataChanged() should take argument(s)
2017-03-09 14:17:25 +01:00
Jack Ha
9d6dd1580b
WIP Added first arranger functions. CURA-3239
2017-03-09 10:21:25 +01:00
Lipu Fei
8b8fb8db95
Coding style fixes
2017-03-08 15:09:02 +01:00
Lipu Fei
5724ee71d0
CURA-3221 Group items into categories for the profile change summary
2017-03-08 15:08:45 +01:00
jack
2a6ae17514
Merge pull request #1504 from LipuFei/bugfix_CURA-3470-crash-qvariantlist-set
...
CURA-3470 Return list instead of set for QVariantList
2017-03-08 09:29:28 +01:00
Lipu Fei
a3dce9f6d1
CURA-3471 importProfiles() takes QVariantList
2017-03-07 20:17:29 +01:00
Lipu Fei
ba79f44783
CURA-3470 Return list instead of set for QVariantList
2017-03-07 16:42:56 +01:00
Ghostkeeper
b25a6423df
Don't offset hull if offset is 0
...
This might speed things up a bit.
2017-03-07 12:47:13 +01:00
Ghostkeeper
0abf455084
Don't always offset with 0.5mm
...
This is no longer needed, since before this happens we would already get an error with calculating the 3D model. Perhaps we should introduce a minkowski offset there but performing Minkowski on a 3D model is fairly expensive.
2017-03-07 12:43:20 +01:00
Jack Ha
42d939b34e
Solved merge conflict. CURA-3321
2017-03-07 10:34:53 +01:00
Jack Ha
3468bae732
Add result type.
2017-03-07 10:31:11 +01:00
Arjen Hiemstra
8a77dd66fc
Properly handle CMake options that are enabled but not "ON"
...
Contributes to CURA-2787
2017-03-06 17:26:02 +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
Jaime van Kessel
419396cc16
Merge branch 'feature_CURA-3397_profile_override_dialog_options' of https://github.com/LipuFei/Cura
2017-03-03 14:43:42 +01:00
Lipu Fei
67b57129ed
CURA-3397 Add options for profile override dialog
2017-03-03 13:23:32 +01:00
Jaime van Kessel
4514f53ea4
Formulas are no longer shown in discard changes dialog
...
CURA-3221
2017-03-03 10:22:06 +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
87336c4c01
Fixed exception for clean start
2017-03-02 17:11:33 +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
fee73c352c
Merge pull request #1481 from Ultimaker/feature_override_profile
...
Feature override profile
2017-03-01 13:52:05 +01:00
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
