3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 09:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21201 commits 302 branches 270 tags 770 MiB
Commit graph

6588 commits

Author SHA1 Message Date
Ghostkeeper
05de920c21
Once more with feeling 
Sorry, I didn't see the other review comment until after I pushed the previous commit.

Contributes to issue CURA-6600.
 2019-09-18 14:28:22 +02:00
Ghostkeeper
a3e9316f48
Rename all_root_materials to all_base_files 
This naming is more consistent with the naming of the metadata entry and most of the other code.

Contributes to issue CURA-6600.
 2019-09-18 14:27:04 +02:00
Ghostkeeper
eaf649023a
Fix setting default material after g-code flavour changes has_materials 
Don't use the material manager here any more.

Contributes to issue CURA-6600.
 2019-09-17 09:23:33 +02:00
Ghostkeeper
977beb8dbb
Re-build container tree if has_materials changes during runtime 
A bit of a hack and it'll be very slow. But it should work. Right now this crashes though because it still calls the Material Manager.

Contributes to issue CURA-6600.
 2019-09-17 08:55:29 +02:00
Ghostkeeper
9b341cf604
Remove UM2 upgrade selection machine action 
Instead of choosing the Olsson block with this wizard, choose it by choosing the correct definition to start with.

Contributes to issue CURA-6775.
 2019-09-16 15:19:47 +02:00
Ghostkeeper
cc27392ab0
Don't use material groups to update metadata 
The material groups are not filled any more in the material manager so this fails.
This might make updating metadata of material profiles slightly slower, but when testing this I noticed no difference.

The function becomes a lot simpler though. And it works again.

Contributes to issue CURA-6600.
 2019-09-13 14:42:27 +02:00
Ghostkeeper
bb0c9c80dc
Don't use material groups to find just the root container 
Just look it up in the container registry. If you know the ID, this look-up is just a dictionary look-up as well.

Contributes to issue CURA-6600.
 2019-09-13 14:42:27 +02:00
Ghostkeeper
882e60bf95
Fix typing of application 
Because CuraApplication has the getMachineManager() function and such, not UM.Application.

Discovered during work on CURA-6600.
 2019-09-13 14:42:26 +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
Diego Prado Gesto
bca68c6db0 Merge branch 'feature_intent' into feature_intent_container_tree 2019-09-13 09:02:51 +02:00
Diego Prado Gesto
d38e60ce06 Merge branch 'master' into feature_intent 2019-09-13 09:02:30 +02:00
Ghostkeeper
9c47fc8e70
Use container tree to get quality definition of printer 
Contributes to issue CURA-6600.
 2019-09-12 16:15:40 +02:00
Ghostkeeper
b8ab04df4a
Correct type of logged item 2019-09-12 15:58:09 +02:00
Ghostkeeper
3a3aeb92a9
Log errors rather than printing them 
This way we can debug them if a user sends us the logs.
 2019-09-12 15:45:10 +02:00
Ghostkeeper
2d2bf9e279
Use logger for errors instead of printing them to stdout 
This way they will show up in users' logs.
 2019-09-12 15:25:01 +02:00
Chris ter Beke
08e088e607
Merge pull request #6340 from Ultimaker/CS-59_new_printers_found_popup 
CS-59: Message when new cloud printers were added to your account
 2019-09-12 11:59:44 +02:00
ChrisTerBeke
07672fd569 Show message when new cloud printers were added to your account but not in Cura yet 2019-09-12 11:04:05 +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
Jaime van Kessel
5e4f673ec2
Merge branch '4.3' of github.com:Ultimaker/Cura 2019-09-11 16:10:12 +02:00
Ghostkeeper
f6089ed627
Don't use material manager to get list of materials to send 
The material manager is no longer populated so it wouldn't send any materials any more.

This is probably faster anyway since it doesn't need to go back to the container registry for every file.

Contributes to issue CURA-6600.
 2019-09-11 15:43:35 +02:00
Ian Paschal
72ba6153c2 Boyscout some stuff 
CS-158
 2019-09-11 14:50:54 +02:00
Ian Paschal
3b5cf115f1 Reduce progress bar length 
CS-158
 2019-09-11 14:50:42 +02:00
Ian Paschal
07a5213ea6 Reduce text size to 12pt from 14pt 
CS-158
 2019-09-11 14:50:15 +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
190984462b Merge branch '4.3' 2019-09-10 14:17:31 +02:00
Lipu Fei
cfeefe365d
Merge pull request #6328 from Ultimaker/fix_select_face 
CURA-6754 / CURA-6761 Fix Select Face
 2019-09-10 14:05:41 +02:00
Ghostkeeper
9b05624b8d
Merge branch '4.3' 2019-09-10 14:04:09 +02:00
Remco Burema
e5a690e605 Wrap up 'lay flat by face' feature for 4.3-BETA. 
Icon thanks to Yi-An Lai.
part of CURA-6754
 2019-09-10 12:37:59 +02:00
Lipu Fei
87285f6b86 Fix version upgrade 42 to 43 2019-09-10 12:22:16 +02:00
Diego Prado Gesto
b18565d9cf Merge branch 'master' into feature_intent_container_tree 2019-09-10 11:08:21 +02:00
Ghostkeeper
f561218346
Merge branch '4.3' 2019-09-09 17:37:12 +02:00
Ghostkeeper
5debdd4cf6
Fix getting extruder list everywhere 
Didn't test this beyond my own automated test, it seems.

Contributes to issue CURA-6600.
 2019-09-09 16:47:29 +02:00
Jaime van Kessel
8c893caf9f
Merge pull request #6315 from Ultimaker/CURA-6755_add_retract_continue_script 
Add retract-continue script
 2019-09-09 13:05:33 +02:00
ChrisTerBeke
669fb39f40 Catch type errors when trying to populate models from API response 2019-09-09 10:44:17 +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
Jaime van Kessel
7d3a2c60d4
Added some missing typing 2019-09-06 17:38:22 +02:00
Jaime van Kessel
5e41443bef
Merge branch 'master' of github.com:Ultimaker/Cura 2019-09-06 17:26:42 +02:00
Jaime van Kessel
6f92537305
Add unhappy test for serializing nonbase material 2019-09-06 17:26:28 +02:00
Jaime van Kessel
09025edffa
Convert some class functions to static 
Since they didn't access any class attributes, there is no need for them to be classMethods
 2019-09-06 17:22:40 +02:00
Ghostkeeper
8bcd9b339a
Use GlobalStack.extrudersList instead of GlobalStack.extruders to iterate 
Otherwise the iteration can happen in any arbitrary order (due to the dict) and this can cause the result to not match to the desired combination of configurations per extruder.

Contributes to issue CURA-6600.
 2019-09-06 17:20:03 +02:00
Jaime van Kessel
94b6f7864f
Add some tests for XMLMaterialProfile 2019-09-06 17:19:23 +02:00
Ghostkeeper
47fab6e16f
Merge branch '4.3' 2019-09-06 16:04:26 +02:00
Ian Paschal
f517beba76
Fix typo 
CS-171
 2019-09-06 16:04:03 +02:00
Ian Paschal
e0194d8721
Extend found_machine_type_identifiers to include R2 
CS-171
 2019-09-06 16:03:48 +02:00
Ghostkeeper
b24ea11cfc
Merge branch '4.3' 2019-09-06 16:02:21 +02:00
Ghostkeeper
82aa0492ea
Revert "CS-171 Add R2 support" 2019-09-06 14:00:04 +00:00
Jaime van Kessel
608ca3e92a
Convert some functions to static 2019-09-06 15:18:50 +02:00
Ghostkeeper
f5aa2921ff
Add space before comments 
Some pause commands on some printers (looking at you, Repetier) seem to require a space after it, which is not obvious to the user. So we'll put a space there for them.

Fixes #6295.
 2019-09-06 14:35:29 +02:00