GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 05:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,254 Commits 287 Branches 260 Tags
Commit Graph

282 Commits

Author SHA1 Message Date
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
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 16ea437255f059d7de2e9d76a4aba4e0d2cb74ab.

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
Remco Burema
00b02f95f9 Nix 3mf-read signal-postphoning, which prevented connects. 
This fix was originally made to fix CURA-5056, but it turns out it now gives warnings and possibly messes up 3mf reading instead of fixing it, since it prevents the connection of new listeners to those signals.
After removal, the original file this was reported against still loads instead of the crash it was reported to give in the ticket (reproduction rate supposedly 100%) so the removal probably doesn't mess things up.

part of CURA-6600
 2019-09-11 17:34:44 +02:00
Ghostkeeper
2b96543cd3
Store intent category in metadata of quality_changes as well 
This is necessary in order to restore it properly.

Contributes to issue CURA_6600.
 2019-09-11 16:58:11 +02:00
Ghostkeeper
ef8b9e98d1
Remove calls to quality manager's private functions 
It should never have been called that way.

Contributes to issue CURA-6600.
 2019-09-10 14:47:36 +02:00
Diego Prado Gesto
b18565d9cf Merge branch 'master' into feature_intent_container_tree 2019-09-10 11:08:21 +02:00
Jaime van Kessel
5463f7600b
Add processEvent calls so progress bar moves while loading 
CURA-6572
 2019-09-09 09:08:52 +02:00
Remco Burema
16ea437255 Make 3MF-reader aware of setting-version for introduction Intent. 2019-09-04 14:52:54 +02:00
Ghostkeeper
f89f47f8d5
Get quality definition from ContainerTree rather than QualityManager 
Contributes to issue CURA-6600.
 2019-08-28 14:31:07 +02:00
Ghostkeeper
b2cee850c9
Use container tree to find current available quality groups 
Contributes to issue CURA-6600.
 2019-08-28 08:58:03 +02:00
Remco Burema
d5a8b2640f Fix 'getQualityChangesGroups' now gives a list issues. 
part of CURA-6600
 2019-08-27 15:46:47 +02:00
Jaime van Kessel
d1a8ce54a1 Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent_container_tree 2019-08-27 14:18:41 +02:00
Jaime van Kessel
bf66388939 Make functions that should have been static, static. 2019-08-27 11:41:21 +02:00
Jaime van Kessel
43d1157aa1 Fix typing error 
CURA-6388
 2019-08-27 11:38:25 +02:00
Lipu Fei
946ec1d32e Apply missing metadata fields from project files 
CURA-6388
 2019-08-26 15:40:34 +02:00
Remco Burema
7fb9642e45 Replace deprecated .getContainer() calls with .container 
part of CURA-6600
 2019-08-15 13:40:08 +02:00
Ghostkeeper
6a8e1557c3
Merge branch 'feature_intent' into feature_intent_container_tree 
Conflicts:
	.gitlab-ci.yml
	cura/Machines/MaterialManager.py
	cura/Machines/VariantManager.py
	cura/Settings/ContainerManager.py
	cura/Settings/MachineManager.py
	tests/TestMachineManager.py
 2019-08-13 14:59:05 +02:00
Ghostkeeper
2bf4ac8522
No longer trigger rebuilding node tree from quality manager 
Also remove part of that from the material manager while we're at it.

Contributes to issue CURA-6600.
 2019-08-12 17:29:05 +02:00