Jack Ha
1ad39a3332
Merge branch 'master' of github.com:Ultimaker/Cura
2016-10-04 11:13:47 +02:00
Jack Ha
7c18d320c4
SettingView: Only removeUnusedValue when no resolve. Contributes to CURA-2232
2016-10-04 11:13:33 +02:00
Jaime van Kessel
2e9fa7ece1
Merge branch 'master' of github.com:Ultimaker/Cura
2016-10-04 11:04:06 +02:00
Ghostkeeper
3b6d8f40aa
Also hide support interface line width if support is disabled
...
Also, the extruderValue call is superfluous since the setting is already limited to this extruder.
2016-10-04 11:00:29 +02:00
Jaime van Kessel
7ef14b08a4
Merge branch 'feature_resolvement_functions' of github.com:Ultimaker/Cura
2016-10-04 10:53:40 +02:00
Jaime van Kessel
faf98e40f8
Inherit button now correctly removes values if needed for multi extrusion machines
...
CURA-2374
2016-10-04 10:46:13 +02:00
Jaime van Kessel
72bd268e2d
Export now exports correct extruder profiles as well
...
CURA-2496
2016-10-04 10:37:48 +02:00
fieldOfView
556431b984
Fix error when no machine is selected
2016-10-03 22:40:28 +02:00
fieldOfView
f55c35df6e
Load extruder profiles into the correct extruder
...
CURA-2478
2016-10-03 22:40:05 +02:00
fieldOfView
144dcb5a65
Slightly more defensive programming in case of extruder mismatch
2016-10-03 22:18:38 +02:00
fieldOfView
046d0b5956
Rename extruder quality changes files when renaming a custom profile
...
CURA-2484
2016-10-03 22:17:56 +02:00
fieldOfView
e1d70ed4b6
Fix selecting quality_changes profiles for extruders
...
Now that containers in a quality_changes set don't share a common name, the quality_changes containers for extruders have a metadata entry "global_profile" pointing to the global quality_changes container id.
Contributes to CURA-2478 and CURA-2484
2016-10-03 21:58:34 +02:00
Tim Kuipers
6240baaaca
JSON fix: better warning formulas (CURA-905)
2016-10-03 17:56:03 +02:00
Tim Kuipers
9b342a9a3e
JSON fix: removed circular dependency (CURA-905)
2016-10-03 17:35:28 +02:00
Tim Kuipers
2513c64d7d
JSON fix: more feasible warnings (CURA-905)
2016-10-03 17:29:25 +02:00
fieldOfView
e7da471199
Fix showing profile values for extruders
...
The profiles page would show the setting values in the quality profile, ignoring the quality_changes profile, because it could not find the appropriate quality_changes profile for the extruders
CURA-2478
2016-10-03 17:04:46 +02:00
Jaime van Kessel
0e74b8eb08
setActiveMaterial now uses id instead of entire container to set quality
...
CURA-2494
2016-10-03 15:58:05 +02:00
Jaime van Kessel
527a503eac
Added more logging to indicate changing of certain containers actually succeeded
2016-10-03 15:54:18 +02:00
Jaime van Kessel
18ba42122d
Merge branch 'master' of github.com:Ultimaker/Cura
2016-10-03 15:44:20 +02:00
Jaime van Kessel
7d9d751121
ProfilesModel is now updated when active variant or material is changed
...
Contributes to CURA-2494
2016-10-03 15:43:42 +02:00
fieldOfView
2f57d0fb6e
Import profiles for the current machine
...
Takes into consideration printers that use quality-profiles from other printers, while gracefully handling mismatches in the number of extruders
Fixes CURA-2500, contributes to CURA-2478
2016-10-03 15:29:25 +02:00
Simon Edwards
5d1b77c551
Rename ProfilesPageModel.py to QualityAndUserProfilesModel.py. Step 2 of 2.
...
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-10-03 15:19:32 +02:00
Simon Edwards
a0f345285d
Rename ProfilesPageModel.py to QualityAndUserProfilesModel.py. Step 1 of 2.
...
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-10-03 15:19:32 +02:00
Jaime van Kessel
513c05b78c
Extruders model now listens to global container changed, instead of definition changed.
...
This solves issue where switching between machines with the same definition did not cause extruder materials to be updated
CURA-2493
2016-10-03 15:03:25 +02:00
Tim Kuipers
4e4171fc53
JSON fix: resolveOrValue for support_type (CURA-2410)
2016-10-03 14:52:33 +02:00
Tim Kuipers
4c46985c75
JSON fix: resolveOrValue for retraction_combing (CURA-2410)
2016-10-03 14:51:28 +02:00
Tim Kuipers
91bed05d63
JSON fix: resolveOrValue for prime_tower_size (CURA-2410)
2016-10-03 14:50:20 +02:00
Tim Kuipers
dee434b958
JSON fix: resolveOrValue for ooze_shield_enalbed (CURA-2410)
2016-10-03 14:49:01 +02:00
Tim Kuipers
c7fbaa9fb8
JSON fix: resolveOrValue for layer_height_0 (CURA-2410)
2016-10-03 14:46:36 +02:00
Tim Kuipers
8696d2ff34
JSON fix: resolveOrValue for jerk_enabled (CURA-2410)
2016-10-03 14:44:14 +02:00
Tim Kuipers
6564ada60d
JSON bugfix: prusa i3 had wrong adhesion setting (CURA-2410)
2016-10-03 14:42:14 +02:00
Tim Kuipers
16a07a3c3e
JSON fix: RigidBot had weird outdated enabled formulas for skirt settings (CURA-2410)
2016-10-03 14:41:09 +02:00
Tim Kuipers
8363f40a2f
JSON fix: resolveOrValue for acceleration_enabled (CURA-2410)
2016-10-03 14:35:31 +02:00
Tim Kuipers
b722a6260c
JSON fix: new resolve functions (CURA-2410)
2016-10-03 14:34:49 +02:00
fieldOfView
8a6d125478
Add strings to clarify the manual printer UI
...
Also adds resuming/pausing states strings and a "Print Again" to use elsewhere.
2016-10-03 12:29:50 +02:00
Simon Edwards
3e6cbd58f1
Added some more method docs.
...
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
2016-10-03 12:05:59 +02:00
fieldOfView
aba01810a5
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-10-03 11:52:43 +02:00
fieldOfView
3c30275201
Import profiles as quality_changes profiles
...
CURA-2478
2016-10-03 11:52:28 +02:00
Jack Ha
4cc5b6d9eb
Added activeStackChanged to BuildVolume, it is semantically more correct. Contributes to CURA-2232
2016-10-03 10:27:31 +02:00
fieldOfView
e6570884fc
Hide dialog when accepting/rejecting
...
Under some circumstances, UM.Dialog would not hide the dialog, so we do it ourselves.
CURA-2384
2016-10-01 13:16:14 +02:00
fieldOfView
8e5dbb78a4
Don't connect to a printer if we don't have its properties yet
...
CURA-2483
2016-10-01 13:07:55 +02:00
fieldOfView
4f9eeb6be6
Hide printer details until printer has divulged them
...
CURA-2483
2016-10-01 13:06:38 +02:00
Tim Kuipers
d4d8ab6fad
JSON: refine dual settings warning formulas (CURA-905)
2016-09-30 18:13:18 +02:00
Tim Kuipers
dbb472436d
JSON: refine raft settings warning formulas (CURA-905)
2016-09-30 18:03:52 +02:00
Tim Kuipers
61d9ee9241
JSON: refine skirt/brim settings warning formulas (CURA-905)
2016-09-30 17:56:56 +02:00
Tim Kuipers
2e24cddbc7
JSON: refine support settings warning formulas (CURA-905)
2016-09-30 17:46:09 +02:00
Tim Kuipers
e12e8e3d2e
JSON: refine material settings warning formulas (CURA-905)
2016-09-30 17:20:00 +02:00
Tim Kuipers
bab01b9ca2
JSON: refine infill settings warning formulas (CURA-905)
2016-09-30 16:55:28 +02:00
Tim Kuipers
163b8a4256
JSON: refine shell settings warning formulas (CURA-905)
2016-09-30 16:50:39 +02:00
Tim Kuipers
4ad36e94c5
JSON: refine line width warning formulas (CURA-905)
2016-09-30 16:45:40 +02:00