Commit graph

4475 commits

Author SHA1 Message Date
Ghostkeeper
c962b519b1
Clarify PRIME_CLEARANCE global better 2018-09-13 16:56:14 +02:00
Jaime van Kessel
757c8754b1 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-13 16:23:55 +02:00
Aleksei S
f0e8746a22 Code style, duplicate material
CURA-5673
2018-09-13 13:23:10 +02:00
Aleksei S
5db008f763 New duplicated favorite material will be added to favorite category
CURA-5673
2018-09-13 12:56:51 +02:00
Diego Prado Gesto
7e1a833e9c Merge branch '3.5' into CURA-5682_material_manager_leftovers 2018-09-12 17:12:40 +02:00
Lipu Fei
b27e5a1f77 Fix getActiveExtruderStacks()
CURA-5719

The dict values can be a random list. We need to fetch the first N
extruders starting from position 0.
2018-09-12 14:00:36 +02:00
Diego Prado Gesto
6d2492e5cb Remove spurious signal, it does the same as materialsUpdated.
Contributes to CURA-5682.
2018-09-12 12:59:13 +02:00
Diego Prado Gesto
a909c8f029 Don't emit signal if the favorite list didn't change.
Contributes to CURA-5682.
2018-09-11 22:05:39 +02:00
Jaime van Kessel
c84a2213a7 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-11 11:01:55 +02:00
Diego Prado Gesto
351fe5c5bc Fix style. 2018-09-10 17:25:06 +02:00
Jaime van Kessel
729d78e14a Updated another set of typing 2018-09-10 16:08:31 +02:00
Jaime van Kessel
e7d9f0ce45 Added typing for various setting classes 2018-09-10 15:24:11 +02:00
Lipu Fei
d8421105d4 Fix quality lookup
CURA-5694

For a machine, if it has extruder-specific qualities, when we look up
extruder qualities, we should NOT fall back to use the global qualities.
2018-09-10 14:39:10 +02:00
Lipu Fei
d01ec7872d Fix quality lookup
CURA-5694

For a machine, if it has extruder-specific qualities, when we look up
extruder qualities, we should NOT fall back to use the global qualities.
2018-09-10 14:23:46 +02:00
Jaime van Kessel
67bc45e37d Added 3MF writer as required plugin 2018-09-10 09:40:53 +02:00
Jaime van Kessel
5c6c299b27 Cleanup extruder manager
Few more unused functions removed & simplified.
It also fixes a few more typing issues that I encountered.
2018-09-07 17:06:18 +02:00
Jaime van Kessel
e6d0a9cc6a Add missing typing 2018-09-07 16:33:44 +02:00
Jaime van Kessel
a8fc6aabcc Switch incorrect usage of getMachineExtruders to getActiveExtruderStacks 2018-09-07 16:27:56 +02:00
Jaime van Kessel
638f9fb941 Remove unused functions 2018-09-07 16:02:54 +02:00
Jaime van Kessel
20ec8828ed Fix incorrect type hinting
The type hinting indicated that the property was a dict, but it could also be None.
In cases where it was None, it would cause an exception, which was also fixed (since
unpacking None will break)
2018-09-07 15:32:07 +02:00
Ian Paschal
4cc1b6ce02 Add typings and fix code style 2018-09-06 16:57:45 +02:00
Jaime van Kessel
53d083e232 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-09-06 10:50:51 +02:00
Lipu Fei
9aea0e5109 Fix quality lookup logic for extruders
CURA-5694

 - Add convenience functions into GlobalStack
 - Use "has_variants" and "has_materials" instead of
 "has_variant_materials"
 - Remove "has_variant_materials"
 - For extruder qualities, skip global qualities if the machine has
   variants or materials
2018-09-06 08:12:55 +02:00
Ian Paschal
9e56d6d29f Improved expansion behavior
Contributes to CURA-5682

- Active material is now expanded by default when opening the manager

- Expanded and collapsed sections are saved to preferences

- Sections are now highlighted when collapsed and having a selected material inside

- Bug with losing focus between fields is not yet fixed
2018-09-05 17:16:06 +02:00
Jaime van Kessel
132366fa61 Revert "Add enabled state to printer, so that it can be displayed."
This reverts commit dd778f0450.
2018-09-04 13:42:24 +02:00
Jaime van Kessel
dd778f0450 Add enabled state to printer, so that it can be displayed.
This ensures that if a printer is set to "Not available", that the interface can correctly show it

CL-896
2018-09-04 13:27:17 +02:00
Lipu Fei
ab572e9de2 SettingFunction evaluation needs a stack to provide values
Note that this is still not correct. When the value gets evaluated, we
need to evaluate it with that container in the stack(s), but this case,
the stack may have other containers, so the evaluation can give
incorrect values because its context is simply not correct. This change
only prevents it from breaking because it's missing a provider.
2018-09-03 14:03:46 +02:00
Ghostkeeper
6df029971d
Don't crash if layer height is a formula
We obtain the layer height here but that might be a formula so we should evaluate that formula here.

Fixes #4005.
2018-09-03 11:02:24 +02:00
Jaime van Kessel
2e5b11af9d Fixed codestyle issue
Switching between codestyles is hard :(
2018-09-03 10:05:20 +02:00
Jaime van Kessel
fb1033ad99 Add the compatible machine families property to printerOutputModel
This is used by the cluster to indicate by which families of printers the job can be displayed

CL-894
2018-09-03 10:03:11 +02:00
fieldOfView
4a5451576d Update copyright 2018-09-02 18:07:30 +02:00
fieldOfView
43b4ca3044 Fix code-style 2018-09-02 18:02:33 +02:00
fieldOfView
9739dbd5f6 Fix missing import 2018-09-02 17:18:04 +02:00
Jaime van Kessel
49aeb60e7d Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-30 10:35:20 +02:00
paukstelis
53a0abd230 Convert name check to defaultdict 2018-08-29 17:43:22 -04:00
Lipu Fei
e0aea18177 Reset machines that use a removed quality changes
CURA-5675

When a custom quality gets removed, Cura should reset all machines which
use this custom quality to default.
2018-08-29 11:42:45 +02:00
Lipu Fei
40c4e9c5df Fix KeyError color_code in BaseMaterialsModel 2018-08-28 09:56:00 +02:00
Ian Paschal
d097b06479
Merge pull request #4284 from Ultimaker/CURA-5668_fix_quality_fallback
CURA-5668 Fix quality lookup fallback mechanism
2018-08-27 11:58:18 +02:00
Lipu Fei
9d1b115f2a
Merge pull request #4244 from Ultimaker/feature_favorite_materials
Feature favorite materials
2018-08-27 11:12:08 +02:00
Lipu Fei
33f495442a Remove unneeded code
CURA-5162
2018-08-27 10:44:41 +02:00
Ghostkeeper
eac70dc06d
Change default print job name to 'Untitled'
This is more common for documents that don't yet have a title in many applications.
2018-08-27 09:41:19 +02:00
fieldOfView
77f99ecf20 Moved FirmwareUpdater to cura.PrinterOutput 2018-08-24 15:48:11 +02:00
Lipu Fei
8daf02063d Fix quality lookup fallback mechanism
CURA-5668

The last fallback is the global qualities, either machine-specific or
generic, but not using both. Because if a machine defines its own global
qualities, it is intended to override the existing ones, so do not
fallback again in this case.
2018-08-24 15:35:03 +02:00
Ghostkeeper
aa03fabc57
Remove trailing whitespace 2018-08-24 15:24:00 +02:00
paukstelis
e36f78dd35 Clean up whitespace 2018-08-24 07:27:34 -04:00
Ian Paschal
2304aeaceb Expanded states preserved when updating models
Did this so that models can be updated more often fixing bugs where when a material is set as "not favorite" in the favorites section, its updated accordingly in its "normal" section.

It's also the ground work for saving material section expansion to preferences.

Contributes to CURA-5378
2018-08-24 12:10:32 +02:00
Jaime van Kessel
fc83520ad9 Added camera view back to cluster screen
CL-893
2018-08-23 20:34:20 +02:00
Ian Paschal
f6b43bd9ab Merge branch 'master' into feature_favorite_materials
Contributes to CURA-5162, CURA-5378
2018-08-23 17:24:39 +02:00
Ian Paschal
6be9b5e27f Consolidate models some more
Contributes to CURA-5162, CURA-5378
2018-08-23 16:58:23 +02:00
Ian Paschal
56a5f59964 Cleaner code
I was hoping to completely nix the generic materials model (since it's basically just a brand "Generic", but then in the QML it has to be have the same in terms of sub-menus or fold-outs and that looked stupid (Generic -> ABS -> ABS)). So we keep that one for now. It is cleaner though.

Contributes to CURA-5162, CURA-5378
2018-08-23 16:39:40 +02:00