GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,320 Commits 294 Branches 267 Tags
Commit Graph

516 Commits

Author SHA1 Message Date
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
Kostas Karmas
bd54ef8d5a Update the SDK version to 7.3.0 for 4.7 
CURA-7641
 2020-08-07 11:12:27 +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
e5d3271698 Fix mypy complaining that Application has no createQmlComponent 
Using CuraApplication instead fixes the problem

CURA-7609
 2020-08-03 17:43:14 +02:00
Kostas Karmas
9ad046654a Add typing in WorkspaceDialog.py 
In response to feedback comment https://github.com/Ultimaker/Cura/pull/8142#discussion_r464309170

CURA-7609
 2020-08-03 17:31:21 +02:00
Kostas Karmas
6c59616e39 Process feedback comments 
Comments https://github.com/Ultimaker/Cura/pull/8142#discussion_r464309980 and https://github.com/Ultimaker/Cura/pull/8142#discussion_r464310281

CURA-7609
 2020-08-03 17:30:21 +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
ce72bb1a0b Fix creating new machine being reverted to overridde in some cases 
CURA-7609
 2020-08-03 15:47:01 +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
db857c8c20 Add extra spacing between categories in the open project dialog 
CURA-7609
 2020-08-03 09:21:16 +02:00
Kostas Karmas
ff4e4ccf55 Change text in the combobox 
Since it was anyway truncated

CURA-7609
 2020-08-03 09:07:20 +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
Jaime van Kessel
38256f7a98
Add cast so that mypy doesn't choke 2020-07-08 11:05:46 +02:00
Jaime van Kessel
91690524c0
Ensure that the 3mf reader doesn't make groups of one 2020-07-08 10:39:33 +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
Nino van Hooff
7302e8ba7f Update missed sdk versions from 7.1 to 7.2.0 for Cura 4.6 
CURA-7383
 2020-04-21 11:46:12 +02:00
Jaime van Kessel
d49cca3b8b
Add warning for when libsavitar is not up to date 2020-04-15 12:25:00 +02:00
Nino van Hooff
e43768ebde Revert "Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects"" 
This reverts commit 4f55c8d8
 2020-04-08 11:06:31 +02:00
Nino van Hooff
4f55c8d832 Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects" 
This reverts commit 3e46489b6ba3ae0baab347b26ceb036c1a47007d, reversing
changes made to f5669a5a277042266f9b92314948a5cfb75f58ea.
 2020-04-03 15:31:08 +02:00
Kostas Karmas
8eb48672e1 Use the node id as identifier 
Now that libSavitar allows us to read the object id from the 3mf file,
this id will be propagated as an id inside CuraSceneNodes and it will
be used as an identifier to find the object that has to be refreshed.

CURA-7333
 2020-04-03 11:05:38 +02:00
Ghostkeeper
afea4a76e7
Merge branch 'feature_object_name' of https://github.com/fieldOfView/Cura into fieldOfView-feature_object_name 2020-03-26 17:39:25 +01:00
fieldOfView
7f6a39d7d0 Fix loading comments in gcode snippets from 3mf projects 
Fixes #7304
 2020-03-20 09:26:31 +01:00
fieldOfView
469c205384 Fix typo 2020-03-20 07:42:01 +01:00
fieldOfView
65346d9200 Store/retreive SceneNode in/from <object> attribute 2020-03-20 07:28:48 +01:00
fieldOfView
ecfe9c708e Fix watching for changes in 3mf files 2020-03-05 20:13:14 +01:00
Ghostkeeper
6f707f3149
Bump SDK version number of Cura 4.5 to 7.1 
We've added new things to our API. This allows plug-in developers to use them.

Contributes to issue CURA-7205.
 2020-02-10 10:45:07 +01:00
Jaime van Kessel
87fb0d7df3
Fix incorrect read location for plugin metadata 
CURA-6627
 2020-01-23 09:28:28 +01:00