57 Commits

Author SHA1 Message Date
Jack Ha
54698ada7f CURA-4807 fix not choosing 'not supported' if there are valid options after changing variant; partly undoing 4abbd4b9887fc3e3d98ebf06481d2b21a9e9be0e 2018-01-16 15:36:57 +01:00
Lipu Fei
9a5b215814 Do not show not supported when there are supported profiles
CURA-4796
2018-01-15 15:16:43 +01:00
Lipu Fei
4abbd4b988 Show custom qualities based on not supported
CURA-4796
2018-01-15 14:29:51 +01:00
Jack Ha
19b56404c6 Fix empty quality slider on start.
It seemed that:
- MachineManager was not connected to all the correct signals
- After connecting to the correct signal, ProfilesModel was not yet updated when looping over it in SidebarSimple

Because ProfilesModel's constructor already requests the MachineManager, we cannot do connect itemsChanged the way around as well.

CURA-4707
2017-12-13 13:33:05 +01:00
Ghostkeeper
097cc72d89
Document why we're only returning full profiles
It's a limitation of the quality manager that would require major refactoring there to fix.

Contributes to issue CURA-4243.
2017-12-11 09:44:56 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server
Contributes to issue CURA-4243.
2017-11-29 13:06:08 +01:00
Ghostkeeper
eb3981b4e0
Let _fetchInstanceContainers return containers split by loaded or not
It must now return two dictionaries: One for the profiles that have been completely loaded and one for the profiles that are only metadata. We could probably improve on these a little bit, since all of these (except the material model) will now load all available quality profiles. I'll see if it is necessary to optimise that.

Contributes to issue CURA-4243.
2017-11-28 14:26:14 +01:00
Chris ter Beke
9806ec7374 Resolve merge conflicts with master - CURA-4482 2017-10-31 09:22:03 +01:00
Diego Prado Gesto
b9c318d432 CURA-4451 Minor changes 2017-10-26 16:53:31 +02:00
ChrisTerBeke
59580c0ade Remove commented out code - CURA-4482 2017-10-26 11:52:58 +02:00
ChrisTerBeke
152f6f8405 More profiles model refactoring - CURA-4482 2017-10-26 11:51:24 +02:00
ChrisTerBeke
de34464e47 Update ProfilesModel to always use extruder stacks + some refactoring - CURA-4482 2017-10-26 11:38:21 +02:00
ChrisTerBeke
8826f86b54 Remove debug logging - CURA-4451 2017-10-26 09:58:01 +02:00
ChrisTerBeke
0377edaa0f resolve conflicts 2017-10-26 09:26:18 +02:00
Chris ter Beke
b95ba24530 Remove some changes, debugging - CURA-4451
WIP - CURA-4451

correctly show not supported when any of the extruders has a not supported profile - CURA-4451

Clean up and add comments - CURA-4451
2017-10-26 09:23:27 +02:00
ChrisTerBeke
88ffe0d358 correctly show not supported when any of the extruders has a not supported profile - CURA-4451 2017-10-25 15:57:53 +02:00
ChrisTerBeke
9b62b48509 WIP - CURA-4451 2017-10-25 13:27:35 +02:00
ChrisTerBeke
7bf854aa0f Remove some changes, debugging - CURA-4451 2017-10-25 09:52:14 +02:00
ChrisTerBeke
9083fe1bf0 Add not supported instance container type and qt role - CURA-4451 2017-10-24 11:53:56 +02:00
ChrisTerBeke
b50f027c83 Add not supported role to profiles model 2017-10-24 10:25:53 +02:00
ChrisTerBeke
d018e0b2bb First steps towards salvation - CURA-4451 2017-10-23 17:34:31 +02:00
ChrisTerBeke
560be2931a Create empty not supported container dynamically when no qualities are found - CURA-4451 2017-10-23 15:41:45 +02:00
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible
This ensures that we only load those containers that we actually need the data of.

Contributes to issue CURA-4243.
2017-10-20 15:09:45 +02:00
Diego Prado Gesto
80ae45ac13 Add some comments to better understand the code - CURA-4404 2017-10-05 15:45:14 +02:00
Lipu Fei
d89f027458 Fix extruder stacks list handling in profile models
CURA-4404
2017-10-05 14:11:16 +02:00
Jaime van Kessel
437da52f65 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
Diego Prado Gesto
afb83fac88 Update the active extruder index when the global container changes. This
fixes a problem when Cura starts with a single extruder printer but the
user then choose a multiextruder printer - CURA-4386
Also added a quality definition in UM3E extruder with the ids of the UM3
extruders, so that the profiles for UM3 are also valid for UM3E and viceversa - CURA-4389
All are related issues with profiles and multiextruder printers
2017-09-28 18:02:39 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Diego Prado Gesto
568535e3e2 Adapting the code in case a multiextruder printer will use only one extruder - CURA-4359 2017-09-26 17:49:53 +02:00
Diego Prado Gesto
2ae1700a15 Solved the issue with the slider that was no showing in gray the unavailable profiles - CURA-4327 2017-09-25 14:43:29 +02:00
Diego Prado Gesto
c22928f5d1 Change behavior when there is no suitable item - CURA-4327 2017-09-25 08:43:57 +02:00
Diego Prado Gesto
cf94c8d37d Working on fixing several issues with profiles - CURA-4327 2017-09-22 14:47:20 +02:00
Diego Prado Gesto
4d113a746c Merge changes 2017-09-22 11:29:29 +02:00
Diego Prado Gesto
37da9f654b Reverted changes done that makes sliders fail - CURA-4327 2017-09-22 11:20:57 +02:00
ChrisTerBeke
ab8bcc4ae3 small code fixes 2017-09-22 09:51:59 +02:00
ChrisTerBeke
ecafa24888 code cleanup 2017-09-21 17:35:12 +02:00
Diego Prado Gesto
ebd180bfdc Custom profiles are now shown in the preference panel - CURA-4327 2017-09-20 08:50:58 +02:00
Lipu Fei
84ad9c6ad1 Add "available" flag for quality profiles
CURA-4182

Add "available" flag for quality profile model so the slider can use it
to show available and unavailable profiles.
2017-09-13 16:40:59 +02:00
Lipu Fei
e414621250 Fix code style 2017-08-09 09:27:42 +02:00
Lipu Fei
ab3d8349b6 Also skip empty containers when getting layer height for a quality profile
CURA-4133

On some machines such as UM2, there is no material. Getting the layer
height in this case will result back to the global stack itself, which
is the layer height of the current setting. This is a problem for
"Normal" (or "Fine") quality because it uses the machine's default layer
height.
2017-08-09 09:24:04 +02:00
Ghostkeeper
81e07b1530
Use stack properties instead of .findContainer(type = ...)
Recently we changed the empty containers such that there is only one empty container instance and it doesn't have the proper type any more. Instead we have properties on the stack that allows us to find the container with the proper type. It's faster and easier to use.
We've had a few bugs about this so I decided to update all of them to remove those for the future, except the ones in plugins/MachineSettingsAction/MachineSettingsAction.py because we have a pending pull request that fixes those. Fixing them would give merge conflicts for fieldOfView.

It doesn't really belong to CURA-4024 but I'm sticking it under that nomer anyway to get it reviewed.
2017-07-10 10:35:03 +02:00
Jaime van Kessel
437c78711d Added typing to all singletons
This greatly helps with pycharms ability to do auto code completion
2017-04-13 16:32:17 +02:00
Simon Edwards
4fecf55b3b Use double quotes instead of singles. 2017-01-17 20:56:50 +01:00
Simon Edwards
5884509af1 More type checking fixes after the merge.
CURA-2917
2016-11-22 11:51:18 +01:00
Jaime van Kessel
1aa71d6171 Profiles model is now a singleton, to prevent the agressive garbage collecting to break stuff
CURA-2826
2016-10-27 14:26:43 +02:00
Ghostkeeper
e6c68bcdc9
Add fallback if no unit is known for layer_height
If there is no unit known, it is interpreted as there being no unit. There is currently mm, but if we changed that it is probably on purpose so we write no unit.

Contributes to issue CURA-2723.
2016-10-25 11:28:41 +02:00
Jaime van Kessel
844b9729f4 Fixed critical errors when first adding UM3 2016-10-25 11:16:54 +02:00
Ghostkeeper
58dba9bcb3
Dynamically get unit of layer height
If the unit of layer height would become something else than mm eventually, it'll still be correct here.

Contributes to issue CURA-2737.
2016-10-21 14:03:28 +02:00
Ghostkeeper
c92ccee1e4
Add layer height role to profiles model
This layer height computation is rather complex, but because the items are now computed in a separate function, we can safely overwrite that and the update is made only once in the UI.

Contributes to issue CURA-2737.
2016-10-21 13:59:23 +02:00
Simon Edwards
f7fe59c707 A small fix for the case when Cura is starting up and there is no printer.
CURA-2271 Warn for unsupported material/printcore combinations
2016-10-13 11:10:40 +02:00