3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
21242 commits 307 branches 272 tags 787 MiB
Commit graph

21242 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
5f4051ab5c
Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter 
There was a function to round it for us already.

Contributes to issue CURA-6600.
 2019-09-17 16:41:32 +02:00
Ghostkeeper
37d54071f0
Don't use material manager any more to sync with printers 
Or to change material from a base file ID.

Contributes to issue CURA-6600.
 2019-09-17 16:35:39 +02:00
Ghostkeeper
5f2e2d5320
Use correct material diameter, rather than always 3 
This function shouldn't be called any more anyway, though.

Contributes to issue CURA-6600.
 2019-09-17 15:58:10 +02:00
Ghostkeeper
614c2970ea
Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter 
So we don't need to round it again.
Also convert both to float to be robust against the ambiguous serialisation of floats getting in the way (e.g. '3' vs. '3.0'). Python does that sometimes.

Contributes to issue CURA-6600.
 2019-09-17 15:50:38 +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
5617784b48
Implement version upgrade for UM2 with Olsson 
Contributes to issue CURA-6775.
 2019-09-16 15:38:01 +02:00
Ghostkeeper
8d21f75c40
Merge branch 'feature_intent_container_tree' into feature_intent_upgrade 2019-09-16 15:20:41 +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
bda7a6ce0a
Shorten name of UM2E with Olsson 
This is necessary because on some file systems (e.g. encryptfs) the length of these file names is limited and that would crash Cura.

Contributes to issue CURA-6775.
 2019-09-16 15:15:17 +02:00
Ghostkeeper
3b5716a64a
Add definition for Ultimaker 2 Extended with Olsson Block 
Only the name is now too long by default. I have to shorten it.

Contributes to issue CURA-6775.
 2019-09-16 15:07:04 +02:00
Ghostkeeper
c6a57a0ab7
Give Ultimaker 2 with Olsson the quality definition of the Ultimaker 2 
This way, the user's profiles should remain intact after the upgrade.

Contributes to issue CURA-6775.
 2019-09-16 15:00:05 +02:00
Ghostkeeper
3c9d191a6e
Add separate definition for Ultimaker 2 with Olsson block 
This is necessary because our ContainerTree class can only create one tree per definition. This tree is not created separately for every added printer and as such the tree can't be different for every added printer.
However the Ultimaker 2 Olsson block upgrade allows selecting extra variants for the UM2. This changes the available variants in the container tree, so this would be impossible.

By making it a separate definition, it now gets a separate tree. However this does mean that we need to do a version upgrade for this as well.

Contributes to issue CURA-6775.
 2019-09-16 14:57:45 +02:00
Lipu Fei
e1a52f841f Correct typing 2019-09-16 10:48:39 +02:00
Lipu Fei
4dea8fba76
Merge pull request #6349 from Ultimaker/CURA-6775_fix_crash_empty_containers 
Fix crash when adding printers with empty profile layers
 2019-09-16 09:15:10 +02:00
Ghostkeeper
2cca95384d
Don't look for quality group for empty material 
Just don't add it to the list of available intents then.

Contributes to issue CURA-6775.
 2019-09-13 16:09:02 +02:00
Ghostkeeper
7942db5147
Give empty material the required material properties 
It needs a GUID, base file and material type to show up in the material nodes in the container tree.

Contributes to issue CURA-6775.
 2019-09-13 16:07:33 +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
Jaime van Kessel
55a8d03d42
Fix typing error 2019-09-13 13:16:48 +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
Lipu Fei
5631e94a48 Fix creality variant versions 2019-09-13 10:53:10 +02:00
Lipu Fei
bbde75491d Fix version number in upgrade from 4.1 to 4.2 2019-09-13 10:52:41 +02:00
Lipu Fei
fa8213c601 Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade 2019-09-13 10:31:11 +02:00
Jaime van Kessel
febe953226
Don't assert if there are already 7 containers in stack 
CURA-6599

Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2019-09-13 09:29:49 +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
Diego Prado Gesto
d9af8bd6b0 Merge branch '4.3' 2019-09-13 09:00:34 +02:00
Ghostkeeper
f4a2f3efa6
Emit activeStackChanged as documented when containers in the active stack change 
This fixes updating the intent models when you switch nozzles. Among other things, probably.

Contributes to issue CURA-6600.
 2019-09-12 17:27:30 +02:00
Ghostkeeper
603f18ebc9
No need to sort quality groups by type alphabetically 
Like, it would put 'draft' first and 'verydraft' last. Just makes no sense. They have unique layer heights already.

Contributes to issue CURA-6600.
 2019-09-12 16:44:40 +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
7d49fd7fa2
Don't import type that's only used for type checking 
Contributes to issue CURA-6600.
 2019-09-12 16:15:03 +02:00
Ghostkeeper
b8ab04df4a
Correct type of logged item 2019-09-12 15:58:09 +02:00
Ghostkeeper
f1299589c9
Remove debug prints 
Contributes to issue CURA-6600.
 2019-09-12 15:49:27 +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
Ghostkeeper
92d2686fed
Pick quality changes group from quality changes groups, not quality groups 
Oops.

Probably went wrong when I copied over this code from some other place.

Contributes to issue CURA-6600.
 2019-09-12 15:19:06 +02:00
Ghostkeeper
2d0a122c2d
Display list of custom quality profiles 
If you activate any of them from here though, it'll crash.

Contributes to issue CURA-6598.
 2019-09-12 15:13:02 +02:00
Ghostkeeper
9a5d45282a
Set intent category of quality changes group correctly 
If any profile has a different intent than default, the entire group becomes that intent. There can only be one intent that's different from default per group.

Contributes to issue CURA-6600.
 2019-09-12 14:54:24 +02:00
Jaime van Kessel
a6a106b526
Merge branch 'feature/creality-machines' of https://github.com/trouch/Cura 2019-09-12 14:09:46 +02:00
HUNIBEST
67aa37b13d Add Cubicon plus A15 and A30 
Add Cubicon devices profile
- Style Plus-A15
- Dual Pro-A30

CURA-6771
 2019-09-12 14:05:13 +02:00
Remco Burema
f4395cc647 Correct comment. 2019-09-12 14:04:30 +02:00
Ghostkeeper
ba0ebf044a
Merge branch '4.3' 2019-09-12 13:54:55 +02:00
Nino van Hooff
0cd664975e Remove face selection for a PreviewPass 
Fixes issue where the selected face for the lay-flat feature showed
up in the model thumbail of print jobs.

CURA-6754
 2019-09-12 13:42:19 +02:00
Ghostkeeper
1b9e710f72
Fix exporting with new quality changes groups 
Those groups are starting to become a bit cumbersome...

Contributes to issue CURA-6600.
 2019-09-12 13:40:47 +02:00
Ghostkeeper
4f936f5c23
Fix getting active quality changes group from machine manager 
I have the feeling that we have multiple implementations of this but it's hard to find...

Contributes to issue CURA-6600.
 2019-09-12 13:28:59 +02:00
Ghostkeeper
cb146b586d
Emit ContainerRegistry's containerMetaDataChanged when name changes 
If we properly call the setName() function on the container it'll emit the signal that the metadata changes.

This fixes the updating of the profiles list when you rename a container.

Contributes to issue CURA-6600.
 2019-09-12 13:22:57 +02:00
ChrisTerBeke
558698add7 Merge branch '4.3' 2019-09-12 12:04: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