GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-21 21:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,497 Commits 287 Branches 260 Tags
Commit Graph

95 Commits

Author SHA1 Message Date
Lipu Fei
22c1a118a8 Fix conflict detection when there is no definition_changes 
CURA-4053

An old project file doesn't have the definition_changes container in the
stacks. When this is the case, Cura should also check if the definition
changes container in an existing stack is empty or not for project file
loading conflict detection.
 2017-07-20 10:28:09 +02:00
Lipu Fei
356b3cf0ca Remove unnecessary code 
CURA-4053
 2017-07-19 16:44:04 +02:00
Lipu Fei
9288f408e5 Correctly detect old project files for conflicts 
CURA-4053

- In Cura 2.5, there is no definition_changes in the stack. This is now
  taken into account when doing conflicts detection.
- In Cura 2.5, we have empty containers named as "empty_variant" and
  such. Those are now properly handled in conflict detection.
 2017-07-19 16:39:04 +02:00
Lipu Fei
7148c71877 Change extruder stacks for conflicts only if the global stack is found 
CURA-4053

If the global stack is not found, we assume the machine is not there and
default to create a new one. If the machine is found and there is not
conflicts, then we check the extruders associated for conflicts.
 2017-07-19 16:35:52 +02:00
Lipu Fei
3474bb0738 Fix project conflict resolving for global stack and extruder stacks 
CURA-4053

- Fix that if the resolve strategy is new for machine, Cura should
  always create new global and extruder stacks
- Fix possible duplicated IDs when "Create New" machine is selected
 2017-07-19 15:20:29 +02:00
Lipu Fei
834fd055b6 Fix conflict resolve strategies in project loading 
CURA-4053

When loading a project file:

- Only check if the global stack exists to detect conflicts instead
  of checking the global stack and the extruder stacks. It can happen
  that the global stack exists while the extruder stacks not or the
  other way around.

- Always assign a resolve strategy to container(s). There can be
  "None" strategies and those were not handled correctly.
 2017-07-19 14:48:11 +02:00
Jaime van Kessel
99b236c8d4 Removed "fix" that caused project files to create new instances if there was no conflict. 
The overriding doesn't make any sense. The original commit mentions that it should fix something, but it doesn't acutally fix it. It seems
the original issue was fixed in the proper place, leaving this code to mess everything up.

CURA-3756
 2017-07-17 11:08:31 +02:00
Lipu Fei
870d6fe76a Use position number to get extruders for overriding in project loading 
CURA-3756
 2017-05-18 14:34:37 +02:00
Lipu Fei
cbdddd0b16 Ignore "quality" and "variant" containers in project loading 
CURA-3756
 2017-05-18 10:28:02 +02:00
Lipu Fei
18dd8dc6cc Simplify ExtruderStack override code in project loading 
CURA-3756
 2017-05-17 17:10:55 +02:00
Lipu Fei
e1455a4551 Fix deserializing ExtruderStacks in project loading 
CURA-3756
 2017-05-17 15:57:13 +02:00
Lipu Fei
e2e208261e Fix renaming quality_changes and definition containers in project loading 
CURA-3756
 2017-05-17 11:53:13 +02:00
Lipu Fei
a9ec3f2712 Add docs to project loading code 
CURA-3756
 2017-05-17 11:25:48 +02:00
Lipu Fei
8c2fe0951d Refactor project loading 
CURA-3756
 2017-05-17 11:03:52 +02:00
Lipu Fei
ee831928ba Fix overriding extruder stacks for project loading 
CURA-3756
 2017-05-17 10:20:14 +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
Lipu Fei
598751817a Fix resolve strategy "new" for user instance container 
CURA-3756
 2017-05-12 16:52:37 +02:00
Lipu Fei
3996230ff9 Load GlobalStack before ExtruderStacks for project loading 
CURA-3756
 2017-05-12 15:52:16 +02:00
Lipu Fei
fe11819ce9 Handle "new" resolve strategy for definition&quality changes 
CURA-3756
 2017-05-12 14:34:41 +02:00
Lipu Fei
9ea0f48341 Check definition changes conflicts in preRead() 
CURA-3756
 2017-05-12 14:34:41 +02:00
Lipu Fei
8a94f94258 WIP: use .userChanges property to replace user containers in project loading 
CURA-3756
 2017-05-11 14:54:00 +02:00
Lipu Fei
3baec9b742 WIP: set dirty after overriding a user container with deserialize() 
CURA-3756
 2017-05-11 14:53:04 +02:00
Lipu Fei
bb0e711577 WIP: fix material container renaming in project loading 
CURA-3756
 2017-05-11 14:20:11 +02:00
Lipu Fei
f436da8674 WIP: fix project loading and container renaming 
CURA-3756
 2017-05-11 14:20:11 +02:00
Jack Ha
79561f44b1 Fix project load, new non existing machine. CURA-3756 2017-05-10 16:16:57 +02:00
Jack Ha
d9f0e1fd4b WIP project loading - at least it mostly works again. CURA-3756 2017-05-10 15:37:22 +02:00
Lipu Fei
77864f4237 WIP: Fix definition_changes handling in 3mf reader 
CURA-3756
 2017-05-10 13:07:45 +02:00
Jack Ha
b688178a2e Fix one part of project load - update existing. CURA-3756 2017-05-10 10:56:19 +02:00
Lipu Fei
c60fefc927 Add non-existing instance containers when opening a project file 
CURA-3756
 2017-05-09 14:58:18 +02:00
Lipu Fei
acde348c6d Use ConfigParser hack to replace connect_signals=False hack 
CURA-3756
 2017-05-09 13:07:42 +02:00
Jack Ha
0d76ce72b0 Add comments CURA-3756 2017-05-09 13:07:42 +02:00
Lipu Fei
711b493ebf Fix code style 2017-05-09 13:07:42 +02:00
Lipu Fei
3e6d4b9230 document why no signals connecting in project file pre-read 
CURA-3756
 2017-05-09 13:07:41 +02:00
Lipu Fei
9c747733c4 Project Reader: Use ".<ext>" for profile type detection 
CURA-3756
 2017-05-09 13:07:41 +02:00
Ghostkeeper
61f7b6aa68 Add spaces around binary operator 
According to our code style.

Contributes to issue CURA-3756.
 2017-05-09 13:07:41 +02:00
Lipu Fei
53141303d2 WIP: Fix project loading 
CURA-3756
 2017-05-09 13:07:41 +02:00
Lipu Fei
e00c68344a CURA-3495 open project/models in one dialog 2017-03-16 13:37:06 +01:00
Jaime van Kessel
bae7af1ea0 Dots in the ID no longer confuse workspace reader 
CURA-3450
 2017-03-02 17:06:10 +01:00
fieldOfView
9229027001 Refactor properties that start with 'get' to avoid confusion between slots & properties 
Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.
 2017-02-17 13:35:01 +01:00
Jaime van Kessel
fa3f473b61 Changed order of buttons 2016-12-16 11:35:08 +01:00
Jaime van Kessel
a7135a0f5f Added machine type to load menu 
CURA-1263
 2016-12-16 10:38:30 +01:00
Jaime van Kessel
2be773c9a3 Added num user settings to workspace loading 
CURA-1263
 2016-12-16 10:26:30 +01:00
Jaime van Kessel
0d9355daab All added containers are now set as dirty, so they are saved 
CURA-1263
 2016-12-12 11:07:29 +01:00
Jaime van Kessel
1752c56272 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-08 12:37:20 +01:00
Jaime van Kessel
7ed5a7768a Use logException instead of just log for project loading 
CURA-1263
 2016-12-08 11:59:37 +01:00
Arjen Hiemstra
3449108d59 Update 3MFWorkspaceReader to handle the new format of ContainerStack 
Contributes to CURA-3098
 2016-12-08 11:53:15 +01:00
Jaime van Kessel
bc8a9c30cf Use right type for logging 
CURA-1263
 2016-12-08 10:58:17 +01:00
Jaime van Kessel
535250e714 Loading a project no longer destroys authentication 
CURA-1263
 2016-12-05 11:43:27 +01:00
Jaime van Kessel
db18635049 Instead of emitting signals for all containers, only emit them for top 
This significantly speeds up project loading. CURA-1263
 2016-12-02 16:27:58 +01:00