3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 14:13:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
28475 commits 305 branches 272 tags 787 MiB
Commit graph

6981 commits

Author SHA1 Message Date
Ghostkeeper
eb401defdf
Add deprecated marker on extruders: Use extruderList 
Extruders is dangerous because it's a dict of which the values are randomly ordered. The keys are often cast to int so you can't use anything else than integer numbers. And then they are often cast back so if you're not properly counting from 0 you're also in trouble. So please, only use the list. Eventually we can switch the data structure around.
 2019-09-09 14:21:57 +02:00
Lipu Fei
ea8b7ebd02 Fix remove all nodes for loaded gcode 
Fixes the problem caused in UM commit 69057b48a1fc3df7c5c6f3e754a3beb285a94678
 2019-09-09 11:49:25 +02:00
Ghostkeeper
8bcd9b339a
Use GlobalStack.extrudersList instead of GlobalStack.extruders to iterate 
Otherwise the iteration can happen in any arbitrary order (due to the dict) and this can cause the result to not match to the desired combination of configurations per extruder.

Contributes to issue CURA-6600.
 2019-09-06 17:20:03 +02:00
Ghostkeeper
4bdc819f12
Fix nondetermistic result with dictionary values list 
Because global_stack.extruders.values can be returned in any order, the configurations matching with the lists doesn't always give a result.
It happened to work on my computer with the test, but there is no guarantee of that.

This is probably also going wrong in other places. I don't think we should use the .extruders property anywhere really!

Contributes to issue CURA-6600.
 2019-09-06 17:15:45 +02:00
Ghostkeeper
b24ea11cfc
Merge branch '4.3' 2019-09-06 16:02:21 +02:00
Ghostkeeper
82aa0492ea
Revert "CS-171 Add R2 support" 2019-09-06 14:00:04 +00:00
Jaime van Kessel
db604cdd16
Ensure that PerObjectContainer stack doesn't trigger a save 2019-09-06 11:16:12 +02:00
Ghostkeeper
71b94f6d5b
Create own quality changes profiles instead of asking quality manager 
It was a protected function call on a different class anyway, so that should never have gotten accepted.

Contributes to issue CURA-6600.
 2019-09-05 17:26:48 +02:00
Ghostkeeper
9a6f76c069
Add typing for get---ManagementModel 
Just to have my IDE find usages properly, really.

Contributes to issue CURA-6600.
 2019-09-05 16:32:34 +02:00
Jaime van Kessel
9d5ee286b4
Merge branch 'CURA-6537_ui_feedback_on_invalid_firmware' of github.com:Ultimaker/Cura 2019-09-05 16:10:30 +02:00
ChrisTerBeke
da4fcc8ee6 Revert "Revert "Remove network manager re-creation that was causing issues"" 
This reverts commit a04bcbb3e9.
 2019-09-05 14:08:18 +02:00
ChrisTerBeke
a04bcbb3e9 Revert "Remove network manager re-creation that was causing issues" 
This reverts commit 06d54f3970.
 2019-09-05 11:05:26 +02:00
ChrisTerBeke
06d54f3970 Remove network manager re-creation that was causing issues 2019-09-04 19:19:49 +02:00
Remco Burema
16ea437255 Make 3MF-reader aware of setting-version for introduction Intent. 2019-09-04 14:52:54 +02:00
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