3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
20120 commits 313 branches 275 tags 718 MiB
Commit graph

20120 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
2565be01f3
Add variants as they get added to the registry 
Contributes to issue CURA-6600.
 2019-08-06 08:58:34 +02:00
Ghostkeeper
e84a75094a
Add a MachineNode once a definition for it gets loaded 
This means that we've added this machine. We need to pre-load all of the containers for that printer then.

Contributes to issue CURA-6600.
 2019-08-05 17:49:21 +02:00
Ghostkeeper
9fda7bd0b9
Rework container tree structure 
This sets up a few new classes, subclasses of ContainerNode.

This is intended to simplify the current structure in the QualityManager.

Contributes to issue CURA-6600.
 2019-08-05 17:39:19 +02:00
Ghostkeeper
037f1967c8
Remove override for version number in CuraContainerStack 
Otherwise plug-ins can't register ContainerStacks any more.

As discussed in the CCB.
 2019-07-10 14:57:26 +02:00
Lipu Fei
9c3d65a6c7
Merge pull request #5993 from Ultimaker/feature_intent_model_per_category 
Create an intent model per intent category
 2019-07-09 13:12:02 +02:00
Lipu Fei
4e0b9d7b78 Fix typing 
CURA-6597
 2019-07-09 13:02:01 +02:00
Lipu Fei
8863516aa4 Rename function name and fix tests 
CURA-6597
 2019-07-09 12:53:44 +02:00
Lipu Fei
f086c1eb11 Minor cleanup changes 
CURA-6597
 2019-07-09 11:57:46 +02:00
Lipu Fei
659a276f65 Rename signal 
CURA-6597
 2019-07-09 11:29:27 +02:00
Lipu Fei
ec82d8f58d Fix merge conflicts 
CURA-6597
 2019-07-09 11:01:51 +02:00
Ghostkeeper
e2fd90506a
Include intent profiles from the default intents 
If we have the default intent category, list all quality types available.

Contributes to issue CURA-6597.
 2019-07-09 10:56:21 +02:00
Ghostkeeper
86750c0446
Don't continue after returning empty list 
Oops. Shouldn't have pushed...

Contributes to issue CURA-6597.
 2019-07-09 10:54:47 +02:00
Ghostkeeper
07c5c4d9f0
Return empty model if there is no printer added yet 
Contributes to issue CURA-6597.
 2019-07-09 10:26:49 +02:00
Ghostkeeper
28f1e670f5
Give special values to the intents 
This way we can see if the correct profile actually got loaded.

Contributes to issue CURA-6597.
 2019-07-05 14:20:36 +02:00
Ghostkeeper
3729e90b24
Fix getting original intent category 
It's now a property so it doesn't need the brackets.

Contributes to issue CURA-6597.
 2019-07-05 13:06:27 +02:00
Ghostkeeper
8cea9c5b87
Register IntentManager in QML 
This way we can change the intent from the interface.

Contributes to issue CURA-6597.
 2019-07-05 13:03:20 +02:00
Ghostkeeper
9aeea22c73
Disable intent category headers 
Makes 'em look like headers.

Contributes to issue CURA-6597.
 2019-07-05 12:05:44 +02:00
Ghostkeeper
32c5118ae4
Add intents per category to the intent menu 
They are in the wrong order currently. The section headers all appear at the end and they are not greyed out. This must be fixed. The order might prove difficult... We'll see, but I want this locked in now because it works.

Contributes to issue CURA-6597.
 2019-07-05 11:45:01 +02:00
Ghostkeeper
45cb34c3e4
Refresh list of intents upon changing category 
The category is changed after constructing by the QML code in order to set its property.
This is now updating twice: Once for the default category and once for the final one set by QML. This is a bit inefficient. But make it work before optimising it!

Contributes to issue CURA-6597.
 2019-07-05 11:19:16 +02:00
Ghostkeeper
6e373e02c0
Update through self.setItems rather than super().update 
Because super().update doesn't exist in this case. Stupid.

Contributes to issue CURA-6597.
 2019-07-04 12:36:14 +02:00
Ghostkeeper
0047874f03
Get translation from list of keys rather than items 
Because the category is not in a list of tuples. It's just the key of the dict.

Contributes to issue CURA-6597.
 2019-07-04 12:35:11 +02:00
Ghostkeeper
a6e3828eaa
Efficiency: Don't update model if adding different container types 
In fact we might want to delay updating until after the program has started up.

Contributes to issue CURA-6597.
 2019-07-04 12:33:50 +02:00
Ghostkeeper
cf68157508
Fix updating upon containers or configuration changing 
Copy-paste mistake...

Contributes to issue CURA-6597.
 2019-07-04 12:29:02 +02:00
Ghostkeeper
bd2237dc45
Update intent categories upon adding containers or changing configuration 
Also upon start-up.

Contributes to issue CURA-6597.
 2019-07-04 11:31:59 +02:00
Ghostkeeper
d2daa15a13
Make testing intent profiles dependent on material, printer and variant 
This way we can test with them (as long as you've selected ultimaker 3, AA0.4 and PLA).

Contributes to issue CURA-6597.
 2019-07-04 11:10:54 +02:00
Ghostkeeper
fd32abd53c
Add property for currently selected intent 
This is necessary for the interface to highlight the correct bullet or the correct menu item.

Contributes to issue CURA-6597.
 2019-07-04 11:10:06 +02:00
Ghostkeeper
926df1111b
Iterate over all extruder stacks rather than just the used ones 
Otherwise it usually only iterates over the one that the model is printing with or something. We want to iterate over all extruders that are not deactivated.

Contributes to issue CURA-6597.
 2019-07-04 11:06:47 +02:00
Ghostkeeper
6ba70f3425
Rewrite IntentModel to return quality types rather than actual profiles 
We don't want the profiles, because that'd be specific to one extruder. We want the quality types and intent categories as tuples again.

Contributes to issue CURA-6597.
 2019-07-04 11:04:44 +02:00
Ghostkeeper
49a6161ee8
Register IntentCategoryModel to be used in QML 
We want to be able to repeat on this model.

Contributes to issue CURA-6597.
 2019-07-04 11:02:49 +02:00
Ghostkeeper
1dd69fe441
Only return intents from intentMetadatas 
Otherwise we also get quality profiles for the same printer...

Contributes to issue CURA-6597.
 2019-07-04 09:44:21 +02:00
Ghostkeeper
c2b20e5cc6
Only return intents from intentMetadatas 
Otherwise we also get quality profiles for the same printer...

Contributes to issue CURA-6597.
 2019-07-04 09:43:25 +02:00
Ghostkeeper
7518b7feb0
Get intents for every active extruder, not every used extruder 
We want the intents for basically any extruder, not just the one that would get used by a slice using the current settings for extruder_nr.

Contributes to issue CURA-6597.
 2019-07-04 09:39:09 +02:00
Ghostkeeper
8699a407de
Filter on 'material' metadata instead of material_id 
This is consistent with how the material is stored in other profiles, such as quality profiles.

Contributes to issue CURA-6597.
 2019-07-04 09:38:33 +02:00
Ghostkeeper
168c9db648
Code style: Space around binary operators 
Contributes to issue CURA-6597.
 2019-07-04 09:28:23 +02:00
Ghostkeeper
3cce33be6f
Get intents for every active extruder, not every used extruder 
We want the intents for basically any extruder, not just the one that would get used by a slice using the current settings for extruder_nr.

Contributes to issue CURA-6597.
 2019-07-04 09:14:06 +02:00
Ghostkeeper
951b91e3d8
Filter on 'material' metadata instead of material_id 
This is consistent with how the material is stored in other profiles, such as quality profiles.

Contributes to issue CURA-6597.
 2019-07-04 09:09:22 +02:00
Ghostkeeper
c75b83be21
Resolve circular imports 
Can't import CuraApplication because we create instances of IntentManager from the IntentsModel which is created in CuraApplication.

Contributes to issue CURA-6597.
 2019-07-04 09:08:15 +02:00
Ghostkeeper
36971f0058
Give smooth an intent and increment setting_version 
Smooth needs an intent because otherwise it gets the default intent. None of the default intents are allowed to have files.

Contributes to issue CURA-6597.
 2019-07-03 16:52:33 +02:00
Ghostkeeper
3f29bce263
List intents per category 
This is the naive one. We want to list the default intents multiple times, once for every quality level.

Contributes to issue CURA-6597.
 2019-07-03 16:51:47 +02:00
Lipu Fei
5620ee811f
Merge pull request #5959 from Ultimaker/feature_intent_per_quality 
Feature intent per quality
 2019-07-03 14:11:20 +02:00
Lipu Fei
3a9e97156e Merge commit 'b463b0c35b' into feature_intent_per_quality 2019-07-03 10:54:21 +02:00
Lipu Fei
35e1426231
Merge branch 'feature_intent' into feature_intent_per_quality 2019-07-03 10:52:08 +02:00
Remco Burema
af467d4e16 Merge branch 'feature_intent_per_quality' of https://github.com/Ultimaker/Cura into feature_intent_per_quality 2019-07-02 14:44:56 +02:00
Remco Burema
270cf28ea1 Fix comments code review IntentManager. 
part of CURA-6091
 2019-07-02 14:43:56 +02:00
Lipu Fei
b463b0c35b Fix CuraVerison.py configuration 2019-07-02 14:19:56 +02:00
Jaime van Kessel
be1fd2e003 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent_per_quality 2019-07-02 13:52:46 +02:00
Jaime van Kessel
0cb83d2c92 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-07-02 13:51:52 +02:00
Lipu Fei
43baca1545 Hardcode Cura SDK version with each release 2019-07-02 13:33:18 +02:00
Remco Burema
50cbf71f68 Fixed test 'selectIntent' for IntentManager-tests. 
part of CURA-6091
 2019-07-02 13:15:18 +02:00
Ghostkeeper
a4093aa6fd
Merge branch 'type_fix_build_volume' 2019-07-02 10:37:22 +02:00