Commit graph

21759 commits

Author SHA1 Message Date
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
b87a0a7e82
Merge branch 'CURA-6590_continue_fix_diameter_reset' 2019-07-09 09:11:31 +02:00
ChrisTerBeke
9ad89017d0 Add text about cloud connection when no printer can be reached on monitor 2019-07-09 09:09:08 +02:00
ChrisTerBeke
b6a00b9f7f Hide 'move to top' opion from actions 2019-07-09 08:26:44 +02:00
Ghostkeeper
6941af0022
Merge branch 'CURA-6590_continue_fix_diameter_reset' 2019-07-08 15:05:20 +02:00
Lipu Fei
3d410cceb9 Fix change material diameter binding
CURA-6590
2019-07-08 13:40:08 +02:00
Lipu Fei
b36d040ba9 Use rejected instead of visibility hack
CURA-6590
2019-07-08 13:01:42 +02:00
Lipu Fei
1f542d1bc8 Merge remote-tracking branch 'origin/master' into CURA-6590_continue_fix_diameter_reset 2019-07-08 12:49:58 +02:00
Ghostkeeper
21241c1914
Mark DeltaBot as a custom printer
Because that's what it is.
2019-07-08 10:27:06 +02:00
Ghostkeeper
c0297ceee5
Spelling correction
Noticed this when I was developing the settings guide.
2019-07-05 23:05:16 +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
Remco Burema
52d4875a68
Merge pull request #5967 from Ultimaker/CURA-6625-Remove-Max-Z-Speed-Overide
Remove the max-z-speed-override
2019-07-04 16:17:41 +02:00
Lipu Fei
178f73ec62 Fix CURA_CLOUD_ACCOUNT_API_ROOT config 2019-07-04 15:58:27 +02:00
Remco Burema
a495d71a14 Fill in manufacturers previously set to unknown/'not applicable'. 2019-07-04 14:39:28 +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
DragonJe
b55d0b3230
Create nwa3d_a31_e.inst.cfg 2019-07-03 17:41:27 -05:00
DragonJe
6428e9185c
Create nwa3d_a31_best.inst.cfg 2019-07-03 17:40:38 -05:00
DragonJe
62fa11f182
Create nwa3d_a31_fast.inst.cfg 2019-07-03 17:39:34 -05:00
DragonJe
225a34ae30
Create nwa3d_a31_normal.inst.cfg 2019-07-03 17:38:50 -05:00
DragonJe
abc980e3d6
Create nwa3d_a31_06.inst.cfg 2019-07-03 17:37:38 -05:00
DragonJe
87193da472
Create nwa3d_a31_04.inst.cfg 2019-07-03 17:37:12 -05:00
DragonJe
348b7cd9d8
Create nwa3d_a31_extruder_0.def.json 2019-07-03 17:35:39 -05:00
DragonJe
56b39d0b33
Create nwa3d_a31.def.json 2019-07-03 17:34:12 -05: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
Remco Burema
fea8262656 Listen to 'material-changed' since it doesn't update immediately.
part of CURA-6590
2019-07-03 16:14:08 +02:00
Jaime van Kessel
7d446722a9 Remove the max-z-speed-override
CURA-6625
2019-07-03 16:13:21 +02:00
Jaime van Kessel
d43415191b Merge branch 'CURA-6635_add_printer_by_manufacturer' of github.com:Ultimaker/Cura 2019-07-03 14:29:26 +02:00