Commit graph

4300 commits

Author SHA1 Message Date
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
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
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
Ian Paschal
8da7773600 Remove unused code
Contributes to CURA-5162, CURA-5378
2018-08-23 16:04:51 +02:00
Jaime van Kessel
8c2cd510d8 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-23 12:45:41 +02:00
Ian Paschal
6225fff1f8 Re-added material detail view
Contributes to CURA-5378
2018-08-22 15:58:58 +02:00
alekseisasin
ff38ee2bed
Merge pull request #4245 from Ultimaker/CURA-5649_hide_gcodegz_in_save_dialog
CURA-5649 Do not show gcode.gz as an option in save file dialog
2018-08-22 14:12:08 +02:00
Ian Paschal
cb713eea6a Improve models
Contributes to CURA-5162, CURA-5378
2018-08-22 12:33:29 +02:00
Ian Paschal
08b325ee04 Correctly load material favorites from preferences
Contributes to CURA-5378, CURA-5162
2018-08-22 12:31:48 +02:00
Jaime van Kessel
6a08b63f21 Ensure that extruder configurations are correctly sorted
CL-894
2018-08-21 13:32:22 +02:00
Ian Paschal
6d1fd8281c Add favorites funcitonality to MaterialManager.py
Contributes to CURA-5378
2018-08-20 17:17:14 +02:00
Ian Paschal
68bccd8bf7 Improve the Favorites, Base, and Brand materials models (WIP)
Contribuetes to CURA-5378
2018-08-20 17:16:54 +02:00
paukstelis
fc9c1045c9 Basic cleanup 2018-08-20 07:40:28 -04:00
Lipu Fei
1468ac1d59 Check if dict has key before accessing in BuildVolume 2018-08-20 13:20:52 +02:00
Lipu Fei
edc4e2824d
Merge pull request #4237 from Ultimaker/fix_unit_tests
Fix unit tests
2018-08-20 10:32:38 +02:00
paukstelis
b66558f97a Initial commit for passing mesh names to CuraEngine 2018-08-19 22:52:17 -04:00
Ghostkeeper
9f190590b1
Only change camera range if camera range is valid
This was a debugging test to see if this fixed an issue. It turned out to not be the issue in question, but this is still a defensive coding thing that would be good to have.
2018-08-17 10:56:46 +02:00
Ghostkeeper
284f90f3ff
Fix camera position before adding a printer
Don't use the diagonal size then, because that returns 0.
2018-08-17 10:56:46 +02:00
Jaime van Kessel
eb7d42a7f8 Added delete button to cluster queue
CL-894
2018-08-17 10:49:44 +02:00
Jaime van Kessel
db1d90ed9b Added delete function
This is needed at a later stage to delete print jobs from queue by the cluster

CL-894
2018-08-17 10:38:46 +02:00
Jaime van Kessel
c968e54750 Moved duplicated code to own function
CL-894
2018-08-17 10:38:23 +02:00
Jaime van Kessel
d4aaa73928 Codestyle fixes
CL-894
2018-08-17 10:34:14 +02:00
Lipu Fei
013032279d Better handling of no quality group in CuraStackBuilder 2018-08-17 10:00:28 +02:00