GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-29 08:03:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,983 Commits 295 Branches 268 Tags
Commit Graph

20983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
3f3aac7ce5
Merge pull request #6289 from Ultimaker/feature_intent_interface 
Feature intent interface
 2019-09-09 16:53:37 +02:00
Ghostkeeper
5debdd4cf6
Fix getting extruder list everywhere 
Didn't test this beyond my own automated test, it seems.

Contributes to issue CURA-6600.
 2019-09-09 16:47:29 +02:00
Lipu Fei
dba3b77f61 Fix tests 
CURA-6598
 2019-09-09 16:45:39 +02:00
Lipu Fei
04e2ecde93 Init intent to empty_intent_container for new machine stacks 
CURA-6598
 2019-09-09 16:12:37 +02:00
Ghostkeeper
178887d8e5
Add test for getting metadata from machine node 
Contributes to issue CURA-6600.
 2019-09-06 17:40:31 +02:00
Ghostkeeper
5106d3b7c1
Test if we actually return the result of the call to getQuality[Changes]Groups 
Contributes to issue CURA-6600.
 2019-09-06 17:26:38 +02:00
Ghostkeeper
7f192ce36f
Add test for getting current quality changes groups 
Similar to getting the current quality groups.

Contributes to issue CURA-6600.
 2019-09-06 17:25:07 +02:00
Ghostkeeper
ea5530c507
Add test for getting quality changes groups without global stack 
Shouldn't crash. Instead it should give no quality changes groups.

Contributes to issue CURA-6600.
 2019-09-06 17:21:56 +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
d618f2df71
Add test for getCurrentQualityGroups 
The test succeeded but in writing it I discovered a bug. I'll fix that soon.

Contributes to issue CURA-6600.
 2019-09-06 17:06:32 +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
Lipu Fei
13011e375b Fix quality layer label alignment 
CURA-6598
 2019-09-05 09:01:00 +02:00
Jaime van Kessel
423b4ad869
Fix binding loop 
CURA-6598
 2019-09-04 17:16:07 +02:00
Jaime van Kessel
994e0e53cc
Switch the anchors to paddings 
Otherwise the bottomb button would extend from the popup.

CURA-6598
 2019-09-04 16:54:35 +02:00
Jaime van Kessel
7f3b55a286
Remove unknown reference 
CURA-6598
 2019-09-04 16:48:06 +02:00
Jaime van Kessel
53aaaab891
Add a topMargin for the qualities menu 
CURA-6598
 2019-09-04 16:43:59 +02:00
Jaime van Kessel
2dbfbecd12
Ensure that show/hide behavior of the qualities intent menu is correct 
It would previously blink if you pressed the button, as a click outside would hide it
due to close policy, but a mouse release would show it again (as it's hidden and that's what the
on clicked of the button did)

CURA-6598
 2019-09-04 16:37:10 +02:00
Remco Burema
16ea437255 Make 3MF-reader aware of setting-version for introduction Intent. 2019-09-04 14:52:54 +02:00
Jaime van Kessel
c2225c9afc
Merge branch 'feature_intent_interface' of github.com:Ultimaker/Cura into feature_intent_interface 2019-09-03 11:27:38 +02:00
Jaime van Kessel
ac0c7fd4d6
Remove unused properties 
CURA-6598
 2019-09-03 11:27:11 +02:00
Lipu Fei
39d52556f4 Fix text alignments by using rounding 
CURA-6598
 2019-09-03 11:17:20 +02:00
Lipu Fei
52f3f9b773 Update QML import versions and add headings 
CURA-6598
 2019-09-03 11:17:20 +02:00
Jaime van Kessel
7dc84f14a8
Merge branch 'feature_intent_interface' of github.com:Ultimaker/Cura into feature_intent_interface 2019-09-03 11:14:19 +02:00
Jaime van Kessel
f77ad22fe3
Fix hardcoded entries in radioCheckbar 
CURA-6598
 2019-09-03 11:13:47 +02:00
Lipu Fei
0926c223b2 Add missing renderType: Text.NativeRendering 
CURA-6598
 2019-09-03 10:53:53 +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
Ghostkeeper
10f37c98ff
Add test for getCurrentQualityGroups if there is no current printer 
Contributes to issue CURA-6600.
 2019-09-02 13:35:17 +02:00
Jaime van Kessel
001c2ec753 Fix test 2019-08-29 17:09:31 +02:00
Jaime van Kessel
5bcda50995 Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_interface 2019-08-29 17:07:57 +02:00
Jaime van Kessel
d9e94f5019 Fix tests 2019-08-29 17:07:36 +02:00
Jaime van Kessel
784ab6e903 Add missing isDirty function 
CURA-6600
 2019-08-29 16:36:11 +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
c80cd9679f Fix RadioCheckbars layout getting out of wack sometimes 
CURA-6598
 2019-08-29 15:15:35 +02:00
Jaime van Kessel
68d3cf8412 Fix binding loop in LabelBar 
CURA-6598
 2019-08-29 14:12:17 +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