Commit graph

6967 commits

Author SHA1 Message Date
Lipu Fei
d154c98476
Merge pull request #6288 from Ultimaker/feature_bottom_face
Align Face To Build-Plate
2019-09-03 16:14:48 +02:00
Remco Burema
d9b10e7180 Merge branch 'feature_bottom_face' of https://github.com/Ultimaker/Cura into feature_bottom_face 2019-09-03 16:04:38 +02:00
Remco Burema
70332978fd Less cryptic max face-id.
part of CURA-6745
2019-09-03 15:48:31 +02:00
Lipu Fei
efbcdcc8ac Add None check in bottomFaceSelection()
CURA-6745
2019-09-03 15:47:29 +02:00
Lipu Fei
44db4216bc Rename to getEndFaceSelectionId()
CURA-6745
2019-09-03 15:44:43 +02:00
Ghostkeeper
2f917c2841
Change definition ID upon reading profile
Implements CURA-6713.
2019-09-03 15:38:41 +02:00
Remco Burema
503a24f7a1 Make magic value into funtion (max face-id).
part of CURA-6745
2019-09-03 15:08:41 +02:00
Ghostkeeper
c41af1b9a0
Remove user-visible XML tags
These XML tags are outside of the i18n call and are therefore not removed by gettext. They should not be present there.
2019-09-03 14:00:09 +02:00
Ghostkeeper
f8472d6414
Fix changing name of profiles in quality changes group
Because quality changes don't have nodes any more.

Contributes to issue CURA-6600.
2019-09-02 18:00:04 +02:00
Ghostkeeper
7216a1dbd7
Refer through to correct function of QualityManagementModel
Contributes to issue CURA-6600.
2019-09-02 17:52:30 +02:00
Ghostkeeper
4043afd09f
Refer _createQualityChanges through to QualityManagementModel
That's where the function was moved.
This function is still being called from various places, even though it's protected. Should change that...

Contributes to issue CURA-6600.
2019-09-02 17:47:31 +02:00
Ghostkeeper
a1e6ba615c
Don't use isinstance to check for extruder stack vs. global
Just use the metadata available.

Contributes to issue CURA-6600.
2019-09-02 17:44:28 +02:00
Ghostkeeper
297b430712
Fix getting container registry
It's not in the fields of this class.

Contributes to issue CURA-6600.
2019-09-02 17:42:17 +02:00
Ghostkeeper
b5d32a9b70
Move createQualityChanges function to QualityManagementModel
This function is specific to the management page (for the most part; some things seem to call the _createQualityChanges private function nonetheless).

Contributes to issue CURA-6600.
2019-09-02 17:07:18 +02:00
Ghostkeeper
b05de3e6d8
Remove unused import
Contributes to issue CURA-6600.
2019-09-02 16:48:01 +02:00
Ghostkeeper
1c81174baf
Fix crashing upon creating QualityManagementModel and MaterialManagementModel
The C++ object should be kept alive in QML.

Contributes to issue CURA-6600.
2019-09-02 16:47:35 +02:00
Remco Burema
b97015a354 Added 'align selected face with buildplate' feature.
Alt-click to select a face. See the (identically named) 'feature_bottom_face' branch in Uranium for more indepth information.
2019-09-02 00:17:14 +02:00
Jaime van Kessel
3fa2fefdef Merge branch 'CURA-6643_f5_to_reload_gcode' of github.com:Ultimaker/Cura 2019-08-30 11:39:41 +02:00
Jaime van Kessel
3b321cd9e1 Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_interface 2019-08-29 16:33:12 +02:00
Jaime van Kessel
f7d61e1e24 Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent_container_tree 2019-08-29 16:31:44 +02:00
Jaime van Kessel
317052e636 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-08-29 16:31:13 +02:00
Jaime van Kessel
b00b8c8c58 Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_interface 2019-08-29 16:28:26 +02:00
Jaime van Kessel
d548404dfd Fix typing issues 2019-08-29 16:23:10 +02:00
Jaime van Kessel
04997fca7f Add property for active intent category
CURA-6598
2019-08-29 15:52:02 +02:00
Jaime van Kessel
de1065f0a3 Prevent crash if extruder is not yet set
CURA-6598
2019-08-29 14:04:05 +02:00
Jaime van Kessel
ba0c16d968 Update intents model to use container tree
CURA-6598
2019-08-29 13:53:23 +02:00
Jaime van Kessel
a8b818fbdc Ensure that right intents are added to the tree
CURA-6598
2019-08-29 13:52:01 +02:00
Jaime van Kessel
f4dc93fc39 Prevent crash in model if no extruder is set
CURA-6598
2019-08-29 11:57:03 +02:00
Jaime van Kessel
5401a4db15 Ensure that each intent gets it's own bar in recommended
CURA-6598
2019-08-29 11:53:19 +02:00
Jaime van Kessel
24d6d5b102 Update intent models to also house nested qualities
CURA-6598
2019-08-29 11:45:19 +02:00
Jaime van Kessel
845c2d41ad Merge branch 'master' of github.com:Ultimaker/Cura 2019-08-29 11:26:14 +02:00
Jaime van Kessel
0cfaac3940 Set the BuildVolume node to disabled
This prevents accidental modification of the node
2019-08-29 11:23:01 +02:00
Ghostkeeper
2676c7fa2f
Fix getting container metadata when switching to quality changes profile
Contributes to issue CURA-6600.
2019-08-29 09:03:04 +02:00
Ghostkeeper
9614cef135
Move duplicateQualityChanges to QualityManagementModel
This is specific to the quality management page, so moving it here prevents QualityManager from becoming a big ball of spaghetti again.

Contributes to issue CURA-6600.
2019-08-29 09:02:18 +02:00
Ghostkeeper
b046ff6683
Fix updating quality management page profile list
When a custom profile gets added, deleted or renamed we need to update our model.

Contributes to issue CURA-6600.
2019-08-28 16:54:41 +02:00
Ghostkeeper
a7e5830762
Fix case if containers are None
This happens when the number of containers was resized.

Contributes to issue CURA-6600.
2019-08-28 16:50:14 +02:00
Ghostkeeper
2647b7e994
Fix latent querying for node_for_global on quality changes
There are no quality changes nodes any more so this all has to happen through metadata.

Contributes to issue CURA-6600.
2019-08-28 16:44:10 +02:00
Ghostkeeper
5d8fff69e4
Fix referencing nodes for quality changes
Contributes to issue CURA-6600.
2019-08-28 16:32:20 +02:00
Ghostkeeper
5fadc7019d
Move renameQualityChangesGroup to QualityManagementModel
Contributes to issue CURA-6600.
2019-08-28 16:31:50 +02:00
Ghostkeeper
be49956de9
Refer to quality management model to remove quality changes
This function is deprecated now.

Contributes to issue CURA-6600.
2019-08-28 15:29:03 +02:00
Ghostkeeper
b3fd310d37
Move removeQualityChangesGroup to QualityManagementModel
This is an operation specific to the quality management page, so it should be located there.

Contributes to issue CURA-6600.
2019-08-28 15:21:33 +02:00
Ghostkeeper
b9370f864e
Get quality definition from container tree
Contributes to issue CURA-6600.
2019-08-28 14:34:00 +02:00
Ghostkeeper
35907e5228
Use Pythonic way of creating list of N elements
Contributes to issue CURA-6600.
2019-08-28 14:17:17 +02:00
Ghostkeeper
619adcb5b3
Fix handling quality_changes_group by metadata
We only need to access the metadata so this is fine.

Contributes to issue CURA-6600.
2019-08-28 14:07:49 +02:00
Ghostkeeper
7c90b5dd30
Use shortcut to get current quality changes groups
Contributes to issue CURA-6600.
2019-08-28 13:56:37 +02:00
Ghostkeeper
ae77f9124c
Use container tree to determine quality_definition of profile and printer
To see if they match.

Contributes to issue CURA-6600.
2019-08-28 13:55:11 +02:00
Ghostkeeper
24fd67c360
Also try looking for material-specific profiles, not just by type
Type is only a fallback after the exact ID match.
This way we can also have profiles specific to Ultimaker PLA Red and such in the future.

Contributes to issue CURA-6600.
2019-08-28 13:53:21 +02:00
Ghostkeeper
a05f077df8
Use fdmprinter for machines that don't have printer-specific qualities
This encodes the behaviour of QualityManager.getMachineDefinitionIDForQualitySearch.

Contributes to issue CURA-6600.
2019-08-28 13:35:49 +02:00
Ghostkeeper
61e13087cd
Fix testing for available quality types
Contributes to issue CURA-6600.
2019-08-28 13:26:18 +02:00
Ghostkeeper
6dd0333626
Use container tree instead of getMachineDefinitionIdForQualitySearch
It's in the metadata there, so use it.

Contributes to issue CURA-6600.
2019-08-28 13:21:23 +02:00