 Mark
|
9a193ad5c5
Changing AGPLv3 to LGPLv3
|
7 years ago |
|
Jaime van Kessel
|
e5f3d45385
When project loading needs to create a new machine, also create a new definition changes
|
7 years ago |
|
Ghostkeeper
|
557173e799
Merge branch '2.7'
|
7 years ago |
|
Lipu Fei
|
3d44d3c4ca
Add logging and minor fix for project loading
|
7 years ago |
|
Lipu Fei
|
3805d2ff9e
Add comments for HACK in project loading
|
7 years ago |
|
Lipu Fei
|
d662770b22
Fix setting new material for stacks
|
7 years ago |
|
Lipu Fei
|
4ad62daf61
Generate new unique names for new machines from the project files
|
7 years ago |
|
alekseisasin
|
dc629f7c91
Solved incorrect printer name after loading a project from file
|
7 years ago |
|
Lipu Fei
|
da8b55cf62
Make sure stacks will have non-empty definitionChanges in project loading
|
7 years ago |
|
Lipu Fei
|
3ebaacfa11
Use the extruder count in the global stack in project loading
|
7 years ago |
|
Lipu Fei
|
026244fb53
Add comments for conflict detection
|
7 years ago |
|
Lipu Fei
|
9ff6ae010a
Use findInstanceContainers() for definition_changes
|
7 years ago |
|
Lipu Fei
|
66b26bafd4
Show quality name in project loading summary
|
7 years ago |
|
Lipu Fei
|
ccabbd8ca0
Mark definition changes container found instead of conflict
|
7 years ago |
|
Lipu Fei
|
65554b60e1
Mark definition_changes conflict if it is not found
|
7 years ago |
|
Lipu Fei
|
686ca803ee
Set correct machine name when creating a new machine from a project
|
7 years ago |
|
Lipu Fei
|
15a6b5626d
Remove useless code
|
7 years ago |
|
Lipu Fei
|
141cfe776e
Fix handling old stack without definition_changes and add doc
|
7 years ago |
|
Jaime van Kessel
|
326c4cc4a4
Removed code duplication
|
7 years ago |
|
Lipu Fei
|
22c1a118a8
Fix conflict detection when there is no definition_changes
|
7 years ago |
|
Lipu Fei
|
356b3cf0ca
Remove unnecessary code
|
7 years ago |
|
Lipu Fei
|
9288f408e5
Correctly detect old project files for conflicts
|
7 years ago |
|
Lipu Fei
|
7148c71877
Change extruder stacks for conflicts only if the global stack is found
|
7 years ago |
|
Lipu Fei
|
3474bb0738
Fix project conflict resolving for global stack and extruder stacks
|
7 years ago |
|
Lipu Fei
|
834fd055b6
Fix conflict resolve strategies in project loading
|
7 years ago |
|
Jaime van Kessel
|
99b236c8d4
Removed "fix" that caused project files to create new instances if there was no conflict.
|
7 years ago |
|
Lipu Fei
|
870d6fe76a
Use position number to get extruders for overriding in project loading
|
7 years ago |
|
Lipu Fei
|
cbdddd0b16
Ignore "quality" and "variant" containers in project loading
|
7 years ago |
|
Lipu Fei
|
18dd8dc6cc
Simplify ExtruderStack override code in project loading
|
7 years ago |
|
Lipu Fei
|
e1455a4551
Fix deserializing ExtruderStacks in project loading
|
7 years ago |
|
Lipu Fei
|
e2e208261e
Fix renaming quality_changes and definition containers in project loading
|
7 years ago |
|
Lipu Fei
|
a9ec3f2712
Add docs to project loading code
|
7 years ago |
|
Lipu Fei
|
8c2fe0951d
Refactor project loading
|
7 years ago |
|
Lipu Fei
|
ee831928ba
Fix overriding extruder stacks for project loading
|
7 years ago |
|
Lipu Fei
|
40d70b5f39
Fix version upgrade for project loading
|
7 years ago |
|
Ghostkeeper
|
ccda155882
Add setting_version every time we create InstanceContainer
|
7 years ago |
|
Lipu Fei
|
598751817a
Fix resolve strategy "new" for user instance container
|
7 years ago |
|
Lipu Fei
|
3996230ff9
Load GlobalStack before ExtruderStacks for project loading
|
7 years ago |
|
Lipu Fei
|
fe11819ce9
Handle "new" resolve strategy for definition&quality changes
|
7 years ago |
|
Lipu Fei
|
9ea0f48341
Check definition changes conflicts in preRead()
|
7 years ago |
|
Lipu Fei
|
8a94f94258
WIP: use .userChanges property to replace user containers in project loading
|
7 years ago |
|
Lipu Fei
|
3baec9b742
WIP: set dirty after overriding a user container with deserialize()
|
7 years ago |
|
Lipu Fei
|
bb0e711577
WIP: fix material container renaming in project loading
|
7 years ago |
|
Lipu Fei
|
f436da8674
WIP: fix project loading and container renaming
|
7 years ago |
|
Jack Ha
|
79561f44b1
Fix project load, new non existing machine. CURA-3756
|
7 years ago |
|
Jack Ha
|
d9f0e1fd4b
WIP project loading - at least it mostly works again. CURA-3756
|
7 years ago |
|
Lipu Fei
|
77864f4237
WIP: Fix definition_changes handling in 3mf reader
|
7 years ago |
|
Jack Ha
|
b688178a2e
Fix one part of project load - update existing. CURA-3756
|
7 years ago |
|
Lipu Fei
|
c60fefc927
Add non-existing instance containers when opening a project file
|
7 years ago |
|
Lipu Fei
|
acde348c6d
Use ConfigParser hack to replace connect_signals=False hack
|
7 years ago |
