Simon Edwards
e4f60ccc34
Merge pull request #1027 from Ultimaker/profiles_revert_global_profile
...
Revert "global_profile" reference changes while refixing import
2016-10-06 11:05:05 +02:00
Simon Edwards
963fac7806
Filter the list of quality changes taking into account the quality(-type) profile they depend on.
...
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
2016-10-05 09:32:18 +02:00
fieldOfView
6d0da0d754
Revert "global_profile" reference changes while refixing import
...
CURA-2518 and CURA-2478
2016-10-04 17:21:33 +02:00
Jack Ha
e66548099a
Fixed signal routing when switching between different machines. CURA-2232
2016-10-04 15:25:22 +02:00
fieldOfView
85d1fa8a39
Fix error on profiles page when there is no active machine
2016-10-04 14:51:04 +02:00
fieldOfView
77370d8599
Fix error duplicating profiles
...
CURA-2478
2016-10-04 14:49:56 +02:00
fieldOfView
7b42f52be9
Properly use classmethod to make sure ContainerManager is a singleton
...
CURA-2478
2016-10-04 14:28:39 +02:00
fieldOfView
d47f3c482f
Static methods cannot call class methods
2016-10-04 14:14:55 +02:00
fieldOfView
ff12f999be
Fixed error when duplicating protected profiles
...
CURA-2478
2016-10-04 14:05:55 +02:00
fieldOfView
fc310f2732
Fix duplicating profiles
...
CURA-2478
2016-10-04 13:21:17 +02:00
fieldOfView
10dc8f98b8
Highlight quality_changes values in manage profiles tabs...
...
and strike out values that are overridden by a user value
CURA-2514
2016-10-04 13:14:04 +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
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
fieldOfView
3c30275201
Import profiles as quality_changes profiles
...
CURA-2478
2016-10-03 11:52:28 +02:00
Ghostkeeper
257aff7c00
Fix license reference
...
This file belongs to Cura.
Contributes to issue CURA-2248.
2016-09-30 11:43:33 +02:00
Simon Edwards
8c8cd86a08
Quality changes didn't have the right extruder ID set in some situations.
...
CURA-2414 Quality changes profiles are created incorrectly
2016-09-29 20:54:09 +02:00
Simon Edwards
cd45ef496b
Handle materials which don't have any quality profiles of their own. Moved the quality_type computation code into the QualityManager.
...
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
2016-09-29 16:39:30 +02:00
fieldOfView
3982dc2046
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-09-29 16:05:32 +02:00
fieldOfView
4fbd82cb6d
Create name that conflicts with neither quality or quality changes
...
The same method is used when creating/duplicating profiles
CURA-2478
2016-09-29 16:05:20 +02:00
Jaime van Kessel
cd265c1136
Merge branch 'master' of github.com:Ultimaker/Cura
2016-09-29 14:45:16 +02:00
Jaime van Kessel
d4bb0d4a0b
Only use profile reader if extension matches with filename
...
CURA-2462
2016-09-29 14:44:34 +02:00
Jack Ha
8934555bd6
Merge branch 'master' of github.com:Ultimaker/Cura
2016-09-29 14:09:54 +02:00
Jack Ha
03c66e6e62
use resolveOrValue for adhesion_type. contributes to CURA-2232
2016-09-29 14:09:19 +02:00
Jaime van Kessel
3d8336449f
Fixed renaming of quality_changes
...
CURA-2479
2016-09-29 14:07:52 +02:00
Jaime van Kessel
6b323dff01
Merge branch 'master' of github.com:Ultimaker/Cura
2016-09-29 13:56:40 +02:00
Jaime van Kessel
02232f7ca6
Added loging if we could not find profile to rename
...
CURA-2479
2016-09-29 13:56:14 +02:00
fieldOfView
040f49e474
Fix cases where there is no "normal" quality
...
CURA-2494
2016-09-29 13:48:23 +02:00
Simon Edwards
2742a4ef65
Show the correct list of qualities and quality change profiles.
...
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
2016-09-29 12:34:46 +02:00
Simon Edwards
4a85ee85c1
Update the model when something changes in the global stack.
...
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
2016-09-29 12:27:04 +02:00
Simon Edwards
062611a92a
Handle the startup situation where there is no global stack. Fixed a bug where the wrong stack was used instead of the first extruder.
...
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
2016-09-28 15:56:10 +02:00
Simon Edwards
a7c58c33f7
Fixed up the profiles menu to handle multiple extruders better.
...
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
2016-09-28 15:15:18 +02:00
fieldOfView
299d05fa71
Prepend extruder id to extruder quality profiles
...
extruder quality profiles are not shown to the user, so the prepended extruder id is never visible. This way imported profiles behave the same way as normally created profiles.
CURA-2478
2016-09-28 14:23:29 +02:00
Jaime van Kessel
bf1cfe9e7e
Importing profile now works again if profile name already existed
...
CURA-2478
2016-09-28 12:02:33 +02:00
Simon Edwards
fe41098f1f
Duplicate and Remove profile were recently broken in the cross fire. Fixed again.
...
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
2016-09-28 10:57:26 +02:00
Simon Edwards
bfa92b6b40
Correctly update the selected quality and quality changes after changing material.
...
Contributes to CURA-2451 Changing material does not update quality profile to correct profile
2016-09-27 17:09:04 +02:00
Jaime van Kessel
4d2a69a932
Merge branch 'master' of github.com:Ultimaker/Cura
2016-09-27 15:24:55 +02:00
Jaime van Kessel
c93f5dc8ac
QualitySettingsModel now uses right metadata entry for filtering
...
CURA-2452
2016-09-27 15:24:27 +02:00
Simon Edwards
c902fef372
Removed a dead line.
...
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
2016-09-27 14:16:25 +02:00