Commit graph

6608 commits

Author SHA1 Message Date
Jaime van Kessel
cb526f0f31
Merge branch 'CURA-6706_intents_on_quality_mgr_page' of github.com:Ultimaker/Cura into feature_intent 2019-10-07 16:14:24 +02:00
Lipu Fei
121315cbf2
Merge pull request #6456 from Ultimaker/CURA-6824
Consider user preference when opening project files from cli.
2019-10-07 13:46:44 +02:00
Lipu Fei
757b02ec42 Simply and fix quality name generation
CURA-6846
2019-10-07 13:30:33 +02:00
Lipu Fei
e4fa89ea4b Simplify quality display name (label name) generation
CURA-6706
2019-10-07 13:28:12 +02:00
Lipu Fei
d99386cf2e Fix recommended mode
CURA-6706
2019-10-07 12:58:41 +02:00
Lipu Fei
2033f24a17 Use catalog to translate intent category name
CURA-6706
2019-10-07 12:41:52 +02:00
Nino van Hooff
11d0462c7a Fix recent files python function calls 2019-10-07 10:44:30 +02:00
Lipu Fei
c42feae11c Make intents work on quality management page
CURA-6706
2019-10-07 09:22:47 +02:00
Lipu Fei
1981a7c65b
Merge pull request #6479 from Ultimaker/CURA-6840_intent_profile_visibility
Cura 6840 intent profile visibility
2019-10-07 08:18:28 +02:00
Lipu Fei
1967dd8404 Fix code style
CURA-6840
2019-10-07 08:12:54 +02:00
Ghostkeeper
54c1980f78
Fix preferring correct diameter over correct preference
If the diameter doesn't match up, then the print fails. If the preference is not held up, then it chooses some random material and the user will understand what it chose.

Done during Turbo Testing and Tooling because a test was failing.
2019-10-04 17:35:38 +02:00
Jaime van Kessel
b3b28bc330
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-04 15:46:41 +02:00
Ghostkeeper
05801bb623
Directly ask metadata from node instead of container
We only need the metadata, so far. Found with a test that got broken because I wasn't mocking out the entire container.

Done during Turbo Testing and Tooling.
2019-10-04 15:35:33 +02:00
Ghostkeeper
faa32ed33e
Remove another workaround in construction of QualityGroup
Like the previous commit.

Done during Turbo Testing and Tooling.
2019-10-04 15:35:32 +02:00
Ghostkeeper
6c0772cd4a
Provide activeQualityGroupName instead of QualityGroup(QObject)
We don't need to inherit from QObject if we expose the name elsewhere. This prevents having workarounds for C++ vs QML ownership, and also allows us to test this while mocking out CuraApplication.

Done during Turbo Testing and Tooling.
2019-10-04 15:35:32 +02:00
Ghostkeeper
6f2f15c74f
Use pre-cached quality type from node rather than re-requesting it
Minor performance increase.

Done during Turbo Testing and Tooling.
2019-10-04 15:35:32 +02:00
Ghostkeeper
0a6842703c
Update documentation
This class no longer applies to quality changes. Quality changes groups don't exist any more.

Done during Turbo Testing and Tooling.
2019-10-04 15:35:24 +02:00
Lipu Fei
4579b06f6d Fix typing 2019-10-04 15:10:42 +02:00
Lipu Fei
3c4d29a814 Merge remote-tracking branch 'origin/feature_intent' into CURA-6840_intent_profile_visibility 2019-10-04 15:00:21 +02:00
Lipu Fei
c528000268 Add activeQualityDisplayName to remove code duplication
CURA-6846
2019-10-04 14:26:20 +02:00
Nino van Hooff
8d223c01d4 Add type annotation for layer_heights_added
CURA-6840
2019-10-04 14:07:57 +02:00
Jaime van Kessel
85ed22de4c
Add some profiling decorators to the ContainerTree 2019-10-04 13:29:22 +02:00
Nino van Hooff
88e0a57374 Fix typing and deduplicate fetch_layer_height
CURA-6840
2019-10-04 13:25:58 +02:00
Nino van Hooff
68f334e141 Fix: Consider all active extruder intent profiles for display.
Remove the notion of a singular 'active' extruder from the code.
Visibility of intent profiles should consider all enabled extruders.
This fix makes sure that it doesn't matter in what order materials are
loaded, the available intent profiles will be the same.

CURA-6840
2019-10-04 11:21:25 +02:00
Jaime van Kessel
e197fe99fa
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-04 10:33:57 +02:00
Jaime van Kessel
c86f28cc9e
Ignore disabled extruders when checking for intent warning
CURA-6601
2019-10-04 10:33:13 +02:00
Lipu Fei
61a1b61756 Remove unnecessary activeQualityName property
CURA-6846
2019-10-04 10:27:39 +02:00
Lipu Fei
0d554c4938 Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-04 10:19:36 +02:00
Ghostkeeper
38ae0e75f2
Fallback to fdmprinter if not has_machine_quality
Contributes to issue CURA-6847.
2019-10-03 16:25:09 +02:00
Lipu Fei
bd84c4d98d Show quality and intent a custom profile is based on
CURA-6846
2019-10-03 14:18:51 +02:00
Lipu Fei
027768f151 Use machine def id as quality_definition fallback
CURA-6847
2019-10-03 12:56:22 +02:00
Jaime van Kessel
2059042e60
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-03 09:52:23 +02:00
Jaime van Kessel
1def289bb9
Fix crash when importing profile that has different quality_definition
CURA-6847
2019-10-03 09:51:45 +02:00
Lipu Fei
a93fd982dd Fix renaming custom profile
CURA-6842
2019-10-02 23:59:48 +02:00
Jaime van Kessel
b78f34db12
Merge pull request #6434 from Ultimaker/CURA-6785_one_at_a_time_ordering
Cura 6785 one at a time ordering
2019-10-02 17:37:41 +02:00
Jaime van Kessel
5ec6b2fdf7
Fix typing
CURA-6785
2019-10-02 15:48:10 +02:00
Remco Burema
784396424c Get old diameter from old material instead of new candidate.
part of CURA-6821
2019-10-02 15:46:01 +02:00
Nino van Hooff
55fe4ee986 Update documentation and typing
CURA-6824
2019-10-02 13:30:59 +02:00
Nino van Hooff
1b1029a3e0 Use 2 leading spaces for doxygen documentation
CURA-6785
2019-10-02 13:13:32 +02:00
Nino van Hooff
9512030060 Check for adhesion area collisions in one-at-a-time ordering
CURA-6785
2019-10-02 13:09:37 +02:00
Jaime van Kessel
f5f91c9c3a
Ensure that profiles are cleaned up if one of the set is incorrect 2019-10-02 13:06:27 +02:00
Ghostkeeper
649ca99fe0
Only match on printer-specific materials, not variant-specific too
If a submaterial doesn't exist for the current variant node but it does exist for a different variant node, then it would not be found in the variant-specific materials and then would be looked up in the printer-specific materials. It then depends on the order in which findInstanceContainersMetadata returns things for whether the actual printer-specific material is selected or a different variant-specific material is selected. No longer now, because the variant name is specified to be absent so it may not match on variant-specific profiles any more.
Maybe this even gives us a small performance gain when combining these dictionaries, since there are now like 80% fewer profiles in that query.

Contributes to issue CURA-6831.
2019-10-02 08:55:13 +02:00
Ghostkeeper
0b610ccd58
Fix getting correct metadata entry for variant name
Turns out that the material profiles deserialise the variant to the 'variant_name' metadata entry, not just 'variant'. This caused it to find no variant-specific material profiles at all anywhere. It would always fall back to the machine-specific names.

Contributes to issue CURA-6831.
2019-10-02 08:55:12 +02:00
Ghostkeeper
c8be172343
Add debugging functionality to visualise the container tree
Could be useful for later, don't you think?

Contributes to issue CURA-6831.
2019-10-02 08:55:12 +02:00
Ghostkeeper
b245be6970
Remove has_machine_materials metadata
It's not behaving as expected here. For instance, Ultimaker 3 wasn't specifying has_machine_materials and thus only the base materials would get loaded, but clearly the Ultimaker 3 has materials specialised for it.
Whether or not a printer has materials specialised for it is now determined by whether the specialisations exist in the material files. So we don't need the metadata entry any more. It seemed to have not been in use anyway, except by one printer which specified that has_machine_materials is true. I've now made it behave as if it's always true.

Contributes to issue CURA-6831.
2019-10-02 08:55:04 +02:00
Lipu Fei
179fa325fc
Merge pull request #6458 from Ultimaker/CURA-6817_intent_fix_sync_config
Fix synchronise configurations (intent branch).
2019-10-02 08:53:53 +02:00
Lipu Fei
89c35cd03c Simplify code
CURA-6817
2019-10-02 08:53:00 +02:00
Lipu Fei
be33a9aa7e Fix updating current root material IDs
CURA-6821
2019-10-02 08:41:05 +02:00
Remco Burema
a1d90c17da Fix synchronize configurations (intent branch).
- Approximate diameter needed to be a string.
 - GUID-tag is mostly in capitals.
 - Workaround for an overload of 'get' not being called (default parameter didn't work somehow?).
part of CURA-6817
2019-10-01 16:46:11 +02:00
Lipu Fei
296f8af59c Always clear ListModel so layer height selector will align properly
CURA-6836
2019-10-01 16:15:36 +02:00