172 Commits

Author SHA1 Message Date
Lipu Fei
0cd392fbd2 Create new SettingInstance when moving extruder DC settings
CURA-4708
2017-12-22 14:08:22 +01:00
Lipu Fei
3fb3b5826f Make sure user containers have unique IDs
CURA-4708
2017-12-22 12:26:30 +01:00
Lipu Fei
3f9f00673a Fix addExtruderStackForSingleExtrusionMachine()
CURA-4708

- Create definition_changes container for the newly created
  ExtruderStacks.
- Move extruder-specific definition_changes settings from the machine's
  container to the extruder's container
2017-12-22 12:26:29 +01:00
Lipu Fei
588335c6db Make sure only single-extrusion machines will be fixed
CURA-4713
2017-12-20 13:42:58 +01:00
Ghostkeeper
05e232b498
Move LegacyProfileReader-specific logic into the plug-in itself
This had the documentation that it should edit the profiles returned by LegacyProfileReader. Instead, just return correct profiles from the reader...

Contributes to issue CURA-4715.
2017-12-19 17:16:32 +01:00
Ghostkeeper
c6a2b1b9c9
Ignore any additional stacks in imported profile
When you import a multi-extrusion file into a single-extrusion printer, don't crash but simply ignore the additional stacks.

Contributes to issue CURA-4715.
2017-12-19 17:08:51 +01:00
Ghostkeeper
c5e33e45a4
Fix setting definition if importing profile without printer-specific profiles
Fixes a crash.
2017-12-19 13:24:20 +01:00
Lipu Fei
248fe37ed9 setDefinition() takes the ID instead of the container
CURA-4713
2017-12-15 14:54:26 +01:00
Lipu Fei
f26872ec1f Apply fix for single extrusion machines when a new global stack is added
CURA-4713

Now the machines are not all loaded in the beginning, so the old way of
adding extruder stacks for old single-extrusion machines don't work.
With this fix, it now happens whenever a global stack is added to the
registry.
2017-12-15 14:51:48 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
Diego Prado Gesto
7e4ed8a257 CURA-4646 Fix save containers also for the extruders 2017-11-30 17:37:16 +01:00
ChrisTerBeke
3abf067d25 Fix loading .curaproject files with stack setups from earlier versions - CURA-4646 2017-11-30 15:24:51 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server
Contributes to issue CURA-4243.
2017-11-29 13:06:08 +01:00
Ghostkeeper
8707396ad7
Remove isReadOnly functionality
Everyone should now ask it from the container registry.

Contributes to issue CURA-4243.
2017-11-28 17:30:00 +01:00
ChrisTerBeke
26b9fc3163 Only create extruder stack for single extrusion machine when not yet existing - CURA-4482 2017-11-27 16:55:01 +01:00
ChrisTerBeke
9e6704a162 Fix extruder stack machine definition link for per extruder settings resolvement - CURA-4627 2017-11-27 15:14:32 +01:00
Lipu Fei
49cac860a8 Fix project loading
CURA-4617
2017-11-27 14:17:13 +01:00
Lipu Fei
1866c4ee66 Split user settings for single extrusion machines
CURA-4617
2017-11-27 12:56:53 +01:00
Ghostkeeper
ebe766a7c8
Set definition by their ID
The new function for setting the definition just adds the ID to the metadata.

Contributes to issue CURA-4243.
2017-11-24 16:45:09 +01:00
Lipu Fei
c7667b56e2 Multiple fixes for stacks
CURA-4617
2017-11-24 09:45:59 +01:00
Lipu Fei
17f09ec21e Fix variant/material/quality handling in stacks
CURA-4613
2017-11-23 12:46:33 +01:00
Ghostkeeper
105d7a5615
Return newly added single extruder
The workspace reader needs to use it to get the correct material.

Contributes to issue CURA-4604.
2017-11-22 17:12:53 +01:00
ChrisTerBeke
6c3eaca0fd fix loading user changes container for single extruder machine 2017-11-22 16:22:23 +01:00
ChrisTerBeke
532cfd8404 Fix showing correct quality changes in dropdown list after upgrading - CURA-4482 2017-11-22 10:48:21 +01:00
ChrisTerBeke
657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements
Container stack improvements
2017-11-20 17:42:26 +01:00
Lipu Fei
69cd00d1c7 Do not take into account the active materials when importing a quality profile
CURA-4451

When importing a quality profile, it should not fail/succeed based on
which materials are activated at the moment. The imported quality
profile will be available when the user switches to a compatible
settings.
2017-10-30 13:13:54 +01:00
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible
This ensures that we only load those containers that we actually need the data of.

Contributes to issue CURA-4243.
2017-10-20 15:09:45 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Ghostkeeper
382fcdb4fe
Better title for export succeeded message 2017-09-21 12:54:04 +02:00
alekseisasin
204019702d Added Title for messages
CURA-4203
2017-09-13 13:58:08 +02:00
Ghostkeeper
3316f3aa13
Add warning contexts to not translate XML tags
This went wrong a few times with previous translations. Let's hope that this prevents it from happening again.

Contributes to issue CURA-4113.
2017-08-14 14:06:20 +02:00
Ghostkeeper
7ab6a551c1
Clarify that XML material tags don't get translated
Some of the translators got this wrong last time. Let's see how good they read this next time...

Contributes to issue CURA-4113.
2017-08-14 13:54:11 +02:00
Lipu Fei
4bac499c22 Use QualityManager._getFilteredContainersForStack() to get qualities
CURA-4151

The quality searching code in _configureProfile() for importing quality
profiles doesn't take into account base materials. Use the function in
QualityManager to solve this problem.
2017-08-10 12:14:43 +02:00
Arjen Hiemstra
b839cb74f4 Do not only check if activeMaterialId is None, also check for empty
Fixes CURA-4065
2017-07-20 12:01:21 +02:00
Ghostkeeper
81e07b1530
Use stack properties instead of .findContainer(type = ...)
Recently we changed the empty containers such that there is only one empty container instance and it doesn't have the proper type any more. Instead we have properties on the stack that allows us to find the container with the proper type. It's faster and easier to use.
We've had a few bugs about this so I decided to update all of them to remove those for the future, except the ones in plugins/MachineSettingsAction/MachineSettingsAction.py because we have a pending pull request that fixes those. Fixing them would give merge conflicts for fieldOfView.

It doesn't really belong to CURA-4024 but I'm sticking it under that nomer anyway to get it reviewed.
2017-07-10 10:35:03 +02:00
Lipu Fei
585bc78892 Only set material for imported quality profile if there is an active material
CURA-3881

CuraContainerRegistry._activeMaterialId() can return an empty string
if there is no active material, and in this case, importing a custom
quality file will fail.
2017-05-29 15:52:29 +02:00
Arjen Hiemstra
9bda7dbaae Error out when trying to import a profile witha quality_type we dont have
Rather than successfully importing the profile and then not showing
anything, we now display an error. Not the perfect solution but the
easiest for now.

Contributes to #1873
2017-05-24 15:43:49 +02:00
Lipu Fei
40d70b5f39 Fix version upgrade for project loading
CURA-3756
2017-05-16 14:38:27 +02:00
Ghostkeeper
ccda155882
Add setting_version every time we create InstanceContainer
Except when we fill the instancecontainer via deserialising. Because then we want to retain the original version number.

Contributes to issue CURA-3427.
2017-05-15 10:39:53 +02:00
Ghostkeeper
5bc613c3e0
Don't use string for default version
No need to go via string and cast that to int, just return int directly.

Contributes to issue CURA-3427.
2017-05-12 14:44:46 +02:00
Ghostkeeper
0f5814e52f
Add setting_version and check against it
This breaks all profiles since they have the wrong setting version, of course. Have to change that in every instance container now...

Contributes to issue CURA-3427.
2017-05-12 12:58:15 +02:00
Lipu Fei
91b22edb06 Fix missing imports in CuraContainerRegistry
CURA-3497
2017-05-04 16:19:18 +02:00
Arjen Hiemstra
230740ed64 Fixup extruders that were converted from ContainerStack on load
We need to make sure the extruder stacks get the proper next stack set,
even when converting them from ContainerStack. Since the conversion can
make no guarantees about the loading order, we need to add an extra step
to post-process the extruders.

Contributes to CURA-3497
2017-05-04 15:44:16 +02:00
Arjen Hiemstra
ab1044de7b Some more documentation 2017-04-19 14:41:32 +02:00
Arjen Hiemstra
37b4326e99 Mark addContainer as override 2017-03-21 17:43:14 +01:00
Arjen Hiemstra
f32f8b60df Explictly import Extruder/Global stack
For some reason, things were not being imported properly. This fixes
that.
2017-03-21 17:42:57 +01:00
Arjen Hiemstra
b9f01b30c8 Convert generic "ContainerStack" to an Extruder or Global stack
Dependendant on the "type" metadata key, we create either an
ExtruderStack or a GlobalStack instance to replace the ContainerStack
instance. This should allow for transparent upgrades to the new classes.

Contributes to CURA-3497
2017-03-20 17:28:01 +01:00
Jaime van Kessel
ac708d54b6 Importing invalid filetypes now gives proper error messages
CURA-2883
2016-11-18 16:46:54 +01:00
Jaime van Kessel
b4339bda0e Fixed logger isuse with importing profile
CURA-2785
2016-10-25 16:26:52 +02:00
Ghostkeeper
3e3e6e6b1b
Fix call to _configureProfile
The footprint of the function changed, but the call wasn't updated, apparently. I pulled new_name up from one of the if-statements since they need to be computed for both branches now (and they are the same).

Contributes to issue CURA-2785.
2016-10-24 17:39:36 +02:00