153 Commits

Author SHA1 Message Date
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
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
Jaime van Kessel
3d8336449f Fixed renaming of quality_changes
CURA-2479
2016-09-29 14:07:52 +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
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
Jack Ha
4547cfe504 Introduced resolveOrValue which fixes resolvement with dependencies for the most part. CURA-2232 2016-09-26 10:37:44 +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
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
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
d6e95d2734 Added error state for container state if serialization data is none
CURA-2359
2016-09-13 14:54:17 +02:00
Jaime van Kessel
570843bbb0 Filtering containers now also takes quality_definition into account
CURA-1780
2016-09-13 11:54:16 +02:00
Jaime van Kessel
44092f0b96 Printers with a quality_definition now also create quality changes using that definition
CURA-1780
2016-09-12 13:00:01 +02:00
Jaime van Kessel
9770037398 If setting is false, it will still return false (instead of empty string)
CURA-2271
2016-09-09 11:44:41 +02:00
Jaime van Kessel
e7335d9814 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 10:53:21 +02:00
Jaime van Kessel
d34f54a3c7 Right type is now returned if metadata entry is not found
CURA-2242
2016-09-09 10:29:16 +02:00
Jack Ha
2138a87582 Busy with CURA-2159 2016-09-08 17:37:49 +02:00
Jaime van Kessel
8a8b55800b Duplicating materialContainers should now duplicate all related material containers
CURA-2242
2016-09-08 14:15:00 +02:00
fieldOfView
a52bb1422b Suggest unique name when creating/duplicating profiles
CURA-2161
2016-09-06 17:46:11 +02:00
Jaime van Kessel
73b9a142d2 Auto generate name now works if base_name is empty string
CURA-2220
2016-09-02 11:42:14 +02:00
Simon Edwards
a2f478f2ad Fix for "Creating two profiles causes the names to become messed up"
CURA-2220
2016-09-01 13:49:29 +02:00
fieldOfView
f7f4aa7659 Activate another profile when the user cancel out of generating a new profile
CURA-2220
2016-08-30 16:26:21 +02:00
fieldOfView
b09e8bb1c9 Use active quality(-changes) name when creating a new profile
CURA-2220
2016-08-30 15:56:53 +02:00
Jack Ha
2ae998737f Added materialspage Display Name field and made it work. CURA-1969 2016-08-25 09:54:22 +02:00
Jaime van Kessel
17b34fb4e1 It's no longer possible to remove a material that is in use
CURA-2168
2016-08-24 14:48:20 +02:00
Jaime van Kessel
3012690abc Also added logging to indicate failure
CURA-2169
2016-08-24 13:38:59 +02:00
Jaime van Kessel
b1ae25fb92 Removing containers now returns false if it was unable to remove containers
CURA-2196
2016-08-24 13:34:40 +02:00
Jaime van Kessel
9c895d2f31 Added more logging to container duplication
CURA-2162
2016-08-24 13:03:51 +02:00
Jaime van Kessel
cbb50eeec6 Added more logging to renaming
CURA-2165
2016-08-24 11:51:47 +02:00
Ghostkeeper
0c0871656b
Cache container registry before for loop
Slight performance increase. We should pay more attention to this kind of thing.

Contributes to issue CURA-2006.
2016-08-18 17:26:51 +02:00
Arjen Hiemstra
a14a80be56 Document and simplify the quality/quality changes code in ContainerManager
Contributes to CURA-2006
2016-08-11 17:50:54 +02:00
Arjen Hiemstra
2c0f0e8559 Move new_id in ContainerManager::duplicate into a general block
Saves duplication

Contributes to CURA-2006
2016-08-10 11:57:57 +02:00
Arjen Hiemstra
29c0cc3850 Fix ContainerManager::renameQuality to set a proper unique id
Contributes to CURA-2006
2016-08-10 11:57:04 +02:00
Arjen Hiemstra
ba2c60bb0d Implement remove, rename, duplicate quality in containermanager
Contributes to CURA-2006
2016-08-10 11:03:33 +02:00
Arjen Hiemstra
b894e3888c Introduce a quality_type metadata entry that can be used to distinguish qualities
Since we want the profile to be selected based on material and we have
profiles like "ABS Normal" and "PLA Normal" we need some way to make
sure we select the same.

Contributes to CURA-2006
2016-08-10 10:55:25 +02:00
Arjen Hiemstra
bc8c55f8fb Properly return True in updateQualityChanges
Since it is declared as returning bool

Contributes to CURA-2006
2016-08-04 18:05:45 +02:00
Arjen Hiemstra
7b9c982c62 Properly fix machinemanager access
Contributes to CURA-2006
2016-08-04 18:04:32 +02:00
Arjen Hiemstra
324d1415d7 Fix updating active quality
Contributes to CURA-2006
2016-08-04 17:55:16 +02:00
Arjen Hiemstra
354a467d8e Fix circular import bullcrap
Contributes to CURA-2006
2016-08-04 17:51:43 +02:00
Arjen Hiemstra
2ee2bc7348 Properly implement ContainerManager::createQualityChanges
Contributes to CURA-2006
2016-08-04 17:37:15 +02:00
Arjen Hiemstra
ec383b46b9 Emit blurSettings for ContainerManager::merge/clear user containers
Contributes to CURA-2006
2016-08-04 17:33:35 +02:00
Arjen Hiemstra
9ef709962f Start implementing a createQualityChanges method in ContainerManager
It will be used to create the quality change containers from the
existing user containers.

Contributes to CURA-2006
2016-08-04 02:12:32 +02:00
Arjen Hiemstra
0934ae70a8 Introduce clearUserContainers and updateQualityChanges methods in ContainerManager
They are moved from MachineManager which is really getting too large and
complicated.

Contributes to CURA-2006
2016-08-04 02:11:35 +02:00
Arjen Hiemstra
95c3aa8251 Split ContainerManager::mergeContainer into a checking bit and a function that does the actual work
Contributes to CURA-2006
2016-08-04 02:10:28 +02:00
Arjen Hiemstra
570a67556a Fix exporting and importing materials on OSX
OSX's file dialog is stupid and does not understand extensions with
a . in them. So instead just use everything after the last .

Fixes CURA-1987
2016-07-28 18:08:17 +02:00
Arjen Hiemstra
a7585a4b9a Ignore default container types when creating name filters for containers
Contributes to CURA-342
2016-07-11 16:41:57 +02:00
Arjen Hiemstra
8e63016ef3 Add logging to explain why ContainerManager's methods do not complete successfully
Contributes to CURA-341
2016-07-07 12:07:16 +02:00
Arjen Hiemstra
1f6e99f641 Add methods to get name filters, import and export containers to ContainerManager
We should start replacing the other ways of import/export with this
since this uses the containerregistry provided contaienr types instead
of needing a different plugin type.

Contributes to CURA-341
2016-07-07 01:39:38 +02:00
Arjen Hiemstra
6e153414a4 Do not try to write to read-only containers
Contributes to CURA-341
2016-07-07 01:37:54 +02:00
Arjen Hiemstra
ce065d110d Finish implementation of ContainerManager
Contributes to CURA-341
2016-07-05 16:45:23 +02:00