GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,175 Commits 290 Branches 260 Tags
Commit Graph

198 Commits

Author SHA1 Message Date
Lipu Fei
f1363fab73 Move newline format 
CURA-4863
 2018-01-29 16:33:52 +01:00
Lipu Fei
924f3972fd Create quality_changes for extruder stack if missing in profile importing 
CURA-4868
 2018-01-29 14:50:08 +01:00
Lipu Fei
34e6816f83 Fix container ID modification in profile importing 
CURA-4868
 2018-01-29 14:50:07 +01:00
Lipu Fei
7dfc1a4aa7 Add encoding='utf-8' for text file reading 
CURA-4875

When encoding is not provided, the behaviour is system dependent and it
can break on OS X.
 2018-01-29 12:29:20 +01:00
Diego Prado Gesto
e38cf957bb CURA-4839 Avoid creating unique names for the extruder instance 
containers if the strategy is upgrade existing
 2018-01-24 16:04:11 +01:00
Lipu Fei
1c605a5108 Fix different strategies for machine and quality in project loading 
CURA-4839
 2018-01-23 10:58:43 +01:00
Lipu Fei
b92ebadfd0 Fix quality_changes for single-extrusion machines 
CURA-4839

- Add newly created quality_changes container to ContainerRegistry
- If an extruder is created by CuraContainerRegistry, in project
  loading, do not try to override extruder's quality changes.
 2018-01-19 15:05:05 +01:00
Lipu Fei
e7a19bcce5 Fix has_machine_quality value parsing 
CURA-4837
 2018-01-19 14:34:25 +01:00
Lipu Fei
79e79dd84c Only import profiles that match with the active machine 
CURA-4837
 2018-01-19 14:08:52 +01:00
ChrisTerBeke
ce709bf24a Remove debug print - CURA-4829 2018-01-19 10:48:45 +01:00
Diego Prado Gesto
a6acf4a4af CURA-4829 Do not save the quality changes profile in the GCode if the 
containers are empty.
Change the message when trying to import a GCode as a profile, but not profile was stored.
 2018-01-19 10:34:04 +01:00
Diego Prado Gesto
26371c9c3a CURA-4815 When creating the unique name for a machine, don't look at the 
definition instance container for the id, just look at the container
stack ids.
 2018-01-17 10:57:11 +01:00
Diego Prado Gesto
78b42afbcb CURA-4776 Add unique id to the profiles so user can import the same 
profile several times with different names.It also fixes the issue for
importing profiles from GCode.
 2018-01-10 16:40:58 +01:00
Aleksei S
92e48795c9 Merge branch 'master' of github.com:Ultimaker/cura 2018-01-10 11:20:31 +01:00
Aleksei S
95361bbeb2 Refactoring: profile from Gcode 
CURA-4776
 2018-01-10 11:19:19 +01:00
Lipu Fei
91cccedf75 Fix upgrading quality changes for single extrusion machines 2018-01-10 08:54:46 +01:00
Aleksei S
3852b0d1c3 Merge branch 'master' of github.com:Ultimaker/cura 2018-01-09 13:39:32 +01:00
Aleksei S
d633a4c112 Fix: cura does not profile form G-code 
CURA-4776
 2018-01-09 13:38:41 +01:00
Lipu Fei
78b9a14007 Fix all possible quality changes containers for single extrusion 
In the current fix, the quality changes that are applicable to the
machine may not have been fixed yet because they are not active at that
moment. This commit makes sure that for a single extrusion machine which
has just been updated to have an ExtruderStack, all the quality changes
containers that are applicable to this machine will be updated as well.
 2018-01-09 13:30:01 +01:00
Lipu Fei
c91eb30de9 Skip loaded instance containers 
When trying to apply the fix for single extrusion machines by creating a
new ExtruderStack, skip the quality changes container that has already
been loaded.
 2018-01-09 13:30:01 +01:00
Lipu Fei
8e5167be76 Use the same machine def for extruder quality changes containers 2018-01-09 13:30:00 +01:00
Lipu Fei
59d7cc663a Fix creating ExtruderStack for single-extrusion machine at runtime 
Move per-extruder settings from the machine's quality changes container
to the extruder's quality changes container.
 2018-01-09 13:30:00 +01:00
Lipu Fei
70d5d4415f
Merge branch 'master' into CURA-4708_fix_definition_changes_extruder_stacks 2018-01-02 10:41:44 +01:00
Ghostkeeper
2e197f0f34
Move all per-extruder settings 
Also move things that we didn't think of previously, such as extruder offsets. You can't enter them as a user in the interface if it was single-extrusion, but you could've edited the files.

Contributes to issue CURA-4708.
 2018-01-02 08:36:46 +01:00
Ghostkeeper
a87465186e
Fix off-by-one bug when importing profiles with extruder stacks 
Since machine_extruders contains only the extruder stacks (not the global stack) but profile_index counts through all stacks including the global stack, we need to increase the length of machine_extruders by 1 when comparing.
I also swapped the comparison around since I think it's more logical this way around.

Contributes to issue CURA-4738.
 2018-01-02 08:19:31 +01:00
Lipu Fei
0c28c61e05 Create new SettingInstances when moving user changes settings 
CURA-4708
 2017-12-22 14:09:13 +01:00
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