Commit graph

2372 commits

Author SHA1 Message Date
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
Jaime van Kessel
5a49457bfe Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-27 14:13:34 +02:00
Jaime van Kessel
829d341f7f When import multi extrusion profile, they now all get the same name
CURA-2462
2016-09-27 14:13:06 +02:00
Simon Edwards
4bb6ddaf28 Correctly update the quality profiles in the extruders when changing quality changes, taking the different materials into account.
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
2016-09-27 14:11:19 +02:00
Jaime van Kessel
960a390350 Ensure that the correct properties get set for writing profiles to g-code
CURA-2462
2016-09-27 14:05:56 +02:00
Jaime van Kessel
9e47a87375 If no quality container can be found, use empty instead
CURA-2462
2016-09-27 13:26:44 +02:00
fieldOfView
3d7680a983 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-26 10:58:57 +02:00
fieldOfView
3d61b7fb75 Prevent signal storm when changing a property
Contributes to CURA-2429
2016-09-26 10:58:15 +02:00
Jack Ha
4547cfe504 Introduced resolveOrValue which fixes resolvement with dependencies for the most part. CURA-2232 2016-09-26 10:37:44 +02:00
Aldo Hoeben
281f9e18a3 Merge pull request #994 from Ultimaker/optimise_machine_switch
Speed up switching between multiextrusion machines
2016-09-23 12:01:17 +02:00
Jaime van Kessel
0b6c196659 Moved getAllExtruderValues to extruder manager
CURA-2407
2016-09-22 16:36:27 +02:00
fieldOfView
847d6429d0 Speed up switching between multiextrusion machines
ExtruderManager.addMachineExtruders is supposed to create a cache, but this cache was always rebuilt because of an indentation error.
2016-09-22 13:49:18 +02:00
Simon Edwards
983e963dd3 Fix for deleting quality changes profiles.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-22 11:59:03 +02:00
fieldOfView
fef1cfb5e8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-22 11:23:06 +02:00
fieldOfView
170a689b59 Select the correct preferred variant for multiextrusion printers
CURA-2424
2016-09-22 11:22:54 +02:00
Simon Edwards
8cbe410e34 Fix for creating profiles via the Create button.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-22 11:07:25 +02:00
Simon Edwards
46dd4f6093 Fix for duplicating quality changes profiles on the UM2.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-21 16:51:30 +02:00
Jaime van Kessel
51dee95c8f Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-21 16:37:39 +02:00
Jaime van Kessel
92389365b6 If a machine inherits qualities, it tries to select the correct variant ID's as well
CURA-2424
2016-09-21 16:36:45 +02:00
Simon Edwards
90dedc354c * Make sure that quality changes are machine dependent but material independent.
* Correctly handle machines which derived (subclasses) from other machines.
* Some refactoring and a lot more comments.

Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-21 15:26:20 +02:00
Jaime van Kessel
eb1d5e13d0 Only disconnect old stack if we found a new one
CURA-2361
2016-09-21 11:25:57 +02:00
Jaime van Kessel
0cfa8c0205 Fixed check for has_variant_materials
CURA-2271
2016-09-20 15:11:20 +02:00
Jack Ha
2b4377b509 Fixed update resolvements by moving signal emits. CURA-2232 2016-09-20 14:03:55 +02:00
Jaime van Kessel
789db04d03 Inheritance manager now also listens to global property changed
CURA-2361
2016-09-20 09:41:04 +02:00
Jaime van Kessel
aac395cb79 Settings that are not settable per extruder but used by settings who are are now also copied
CURA-2409
2016-09-19 13:01:31 +02:00