3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
34169 commits 302 branches 270 tags 769 MiB
Commit graph

348 commits

Author SHA1 Message Date
Kostas Karmas
0feeccff85 Appease mypy complaints for AttributeErrors 
CURA-7646
 2020-08-10 15:30:55 +02:00
Kostas Karmas
f8a15ea29e Display only the relevant materials when opening a project 
Ignore the materials of the extruders that are not visible when opening a project file with a CFFF.

CURA-7646
 2020-08-10 15:00:08 +02:00
Kostas Karmas
61cc8c9a95 Remove reference to JIRA ticket in comments 
CURA-7646
 2020-08-10 14:58:59 +02:00
Kostas Karmas
b9d5f0dc15 Take the machine_extruder_count into consideration when opening project 
CURA-7646
 2020-08-10 14:56:37 +02:00
Ghostkeeper
1f09ea58cc
Merge branch '4.7' 2020-08-10 11:26:25 +02:00
Ghostkeeper
fc6ea28352
Don't crash if CuraStackBuilder failed to create a stack 
If it failed to create a global stack, the extruder_stack_dict variable would not be defined, and Cura crashes. It may fail to create a stack because of an indexerror in a malformed project file.

Fixes Sentry issue CURA-137.
 2020-08-10 11:25:55 +02:00
Jaime van Kessel
3cdf5a82a4
Use correct property to search container stack 
CURA-7609
 2020-08-06 15:26:32 +02:00
Jaime van Kessel
ebdab94b98
Merge branch 'CURA-7609_Pick_any_printer_when_opening_a_project_file_single_dropdown' of github.com:Ultimaker/Cura 2020-08-06 15:26:16 +02:00
Jaime van Kessel
c8771124ad
Change function name to better reflect what it does 
CURA-7609
 2020-08-05 14:56:39 +02:00
Kostas Karmas
4e20c7dddc Rework the open project dialog to contain only 1 dropdown 
With the caveat that the qtQuickControls had to be updated to 2.3, due to a qt bug in 1.x that did
not update the dropdown popup list according to the ListModel.
This leads to a different look in the dropdowns and in the buttons of the open project dialog,
compaired to the rest of the application.

CURA-7609
 2020-08-04 16:33:11 +02:00
Kostas Karmas
60cfb6a8be Change name of updatable_machines to updatable_machine_names 
Since it is a list of name strings and not a list of machines.

Response to feedback comment https://github.com/Ultimaker/Cura/pull/8142#discussion_r464307564

CURA-7609
 2020-08-03 17:28:44 +02:00
Kostas Karmas
949837f041 Fix crashing when opening project files without materials 2020-08-03 16:20:44 +02:00
Kostas Karmas
a6d779e722 Sort materials based on extruder position in the open project dialog 
From eCCB
 2020-08-03 16:20:29 +02:00
Kostas Karmas
9793c2cfde Fix crashing when opening project files without materials 2020-08-03 14:54:44 +02:00
Kostas Karmas
9f6b4f0255 Sort materials based on extruder position in the open project dialog 
From eCCB
 2020-08-03 14:34:45 +02:00
Kostas Karmas
37febc9f60 Remove comment 
CURA-7609
 2020-08-03 09:24:40 +02:00
Kostas Karmas
52ea3e8fcc Change variable names (available -> updatable) 
CURA-7609
 2020-07-29 17:19:24 +02:00
Kostas Karmas
98cc87d1cf Allow picking any printer of the same type when opening project file 
A ComboBox was added under the "Update existing" combobox which will display all the available
printers that are of the same type with the printer in the project file. With this feature, the
user will be able to select any same-type preexisting printer in Cura to be updated, instead of
always create a new one when the project file's printer is not in Cura.

CURA-7609
 2020-07-29 13:02:34 +02:00
Kostas Karmas
daa66a89f3 Ignore machine network metadata when reading a project file 
CURA-7608
 2020-07-28 11:18:04 +02:00
Kostas Karmas
4f97089e47 Fix losing global quality changes when reading a 3MF with a CFFF 
By using "pass" when the IndexError occured while reading the quality changes, empty quality
changes containers were added to the registry. These empty quality changes were then used as
"global" quality_changes, since the container registry was simply picking the first quality
changes instance container that had an empty extruder stack. Therefore, the correct global
quality changes (that actually had the global settings that were changed, like the support)
was just ignored in the whole process.

CURA-7549
 2020-07-07 10:43:02 +02:00
Kostas Karmas
572ded8c95 Fix crash while reading 3mf if extruder list is empty 
CURA-7527
 2020-06-25 14:52:07 +02:00
Ghostkeeper
85bfb02228
Show an error if trying to open a project file with unknown machine 
Previously it would crash.

Fixes Sentry issue CURA-Y1.
 2020-06-18 14:31:47 +02:00
Jaime van Kessel
5a77595807
Fix workspace reader not taking upgrade into account 
CURA-7517
 2020-06-17 11:15:55 +02:00
Ghostkeeper
336bd2bd16
Use extruderList rather than deprecated extruders property 
Done during Turbo Testing and Tooling.
 2020-06-05 15:17:35 +02:00
Ghostkeeper
da61096efe
Remove uses of deprecated extruders property 
It's been replaced by extruderList now.

Done during Turbo Testing and Tooling.
 2020-05-29 17:38:34 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
 2020-05-28 17:31:24 +02:00
Ghostkeeper
715e5a890e
Don't crash when the file is deleted while in pre-read phase 
The pre-read takes a while since it shows a dialogue. The user has all the time to delete the file or rename it in the meanwhile.

Fixes Sentry issue CURA-SG.
 2020-05-25 17:20:39 +02:00
Ghostkeeper
696d2ffa1d
Use extruderList rather than deprecated extruders 
I looked into changing that position into an integer and perhaps the dictionary into a list, but this dictionary is passed around throughout all of the functions so that would be quite a refactor.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 16:11:27 +02:00
Nino van Hooff
176919eee0 Merge branch 'master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	plugins/CuraEngineBackend/CuraEngineBackend.py
#	plugins/CuraEngineBackend/StartSliceJob.py
 2020-05-08 15:31:23 +02:00
Nino van Hooff
8f3827d5ae Convert doxygen to rst for 3MFReader/Writer and AMFReader 2020-05-08 15:14:39 +02:00
Kostas Karmas
61e2cc1193 Fix missing type for result 2020-04-29 15:33:28 +02:00
Ghostkeeper
abffb6c26c
Don't crash when reading corrupt 3MF files 
Otherwise it would crash with a BadZipFile error. We should be robust against that. This will trigger a generic message that we couldn't read that file to the user, and put more information in the log.

Fixes Sentry issue CURA-NH.
 2020-04-29 14:07:04 +02:00
fieldOfView
7f6a39d7d0 Fix loading comments in gcode snippets from 3mf projects 
Fixes #7304
 2020-03-20 09:26:31 +01:00
Jaime van Kessel
87fb0d7df3
Fix incorrect read location for plugin metadata 
CURA-6627
 2020-01-23 09:28:28 +01:00
Jaime van Kessel
52ce106399
Change _loadMetadata to be static 
CURA-6627
 2020-01-20 15:37:57 +01:00
Jaime van Kessel
bee641da5a
Remove local import of json 
CURA-7005
 2020-01-20 15:30:23 +01:00
Jaime van Kessel
712cebcdd2
Let 3mf workspace reader read from files per plugin 
CURA-6627
 2020-01-16 11:43:07 +01:00
Jaime van Kessel
b6d1429eb7
Ensure that 3mf workspace reader loads aditional metadata 
CURA-6627
 2020-01-14 15:27:30 +01:00
Jaime van Kessel
523b4e96a8
Ensure that post processing scripts are correctly reloaded on project loading 
Previously it would not re load post processing plugins if it was updating an existing machine

Fixes #6881
 2020-01-07 10:45:57 +01:00
Lipu Fei
dcaa10e409 Handle error due to missing quality_changes in 3MF loading 
CURA-7078
 2019-12-24 10:59:09 +01:00
Ghostkeeper
f02d4f5e43
Fix spelling 
Help, I'm forced to do this by the Apostrophe Protection Society!
 2019-12-23 14:01:06 +01:00
Remco Burema
8412288cb2 Ignore leftover buildplate/'global' variants. 
part of CURA-6802
 2019-09-24 16:39:45 +02:00
Remco Burema
78effbb191 Upgrade globals as well. 
part of CURA-6802
 2019-09-24 15:57:30 +02:00
Lipu Fei
8d77726089 Add intent logic for project loading 
CURA-6800
 2019-09-23 13:05:36 +02:00
Remco Burema
cb7d99d2dc Revert "Make 3MF-reader aware of setting-version for introduction Intent." 
This reverts commit 16ea437255.

Should have been (and is now) done in the version upgrade instead.
 2019-09-20 11:56:08 +02:00
Ghostkeeper
3479a3df76
Fix _applyVariants using variant manager 
The variant manager doesn't get properly filled any more.

Contributes to issue CURA-6776.
 2019-09-20 09:57:36 +02:00
Ghostkeeper
12043df367
Don't use material manager to find or remove materials 
That remove function in the material manager was very weird...

Contributes to issue CURA-6776.
 2019-09-20 09:57:36 +02:00
Remco Burema
ef0f5988a2 Fix 3MF-workspace-reading: Variants where not loaded properly. 
part of CURA-6600
 2019-09-13 12:59:54 +02:00
Remco Burema
533e0f762f Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree 2019-09-11 17:34:49 +02:00