GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 13:49:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,065 Commits 287 Branches 260 Tags
Commit Graph

345 Commits

Author SHA1 Message Date
Diego Prado Gesto
3fb14691a9 CURA-5160 Skip empty quality when load project file 2018-03-27 14:09:17 +02:00
Ghostkeeper
6d3fed8f52
Allow getContainer() to return None 
And in the rest of the locations we must then check if it's None and handle that gracefully.
Here we assume that the getContainer message shows a message to the user if necessary. For now we'll just log it.

Contributes to issue CURA-5045.
 2018-03-26 15:48:03 +02:00
Lipu Fei
6d21a6bddb Show printer group and which machine to update in project loading 
CURA-5125
 2018-03-20 16:23:23 +01:00
Ian Paschal
d7b0f11ddf CURA-4400 Fixed project loading 
"enabled" metadata is now read from saved projects (.3mf)
 2018-03-20 11:17:39 +01:00
Lipu Fei
d78e2d56f7 Fix quality and variant processing in project loading 
From version 22 to 24, there is an upgrade for "quality" that changes
it to "quality_changes", but for "quality", we don't have any upgrades.
 2018-03-16 10:33:22 +01:00
Lipu Fei
22573a685d Fix quality definition comparison in quality importing 
CURA-4946
 2018-03-14 14:31:30 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles 
Setting Visibility Presets sidebar menu
 2018-03-14 13:25:59 +01:00
Lipu Fei
86afd6f5ff Do not overwrite existing metadata with in material deserializeMetadata() 
CURA-5056
 2018-03-14 10:32:57 +01:00
Lipu Fei
dc427488a2 Fix extruder position check in project loading 
CURA-5056

The field is now "position" instead of "extruder"
 2018-03-14 10:30:32 +01:00
Lipu Fei
7312ed8e3c Fix project loading for version upgrade 
CURA-5054
 2018-03-09 19:35:23 +01:00
Lipu Fei
e09325bf82 Fix project loading for version upgrade 
CURA-5054
 2018-03-09 17:16:27 +01:00
fieldOfView
4c66c935af Merge branch 'master' into feature_setting_visibility_profiles 2018-03-09 15:45:24 +01:00
Lipu Fei
8c7e413038 Remove unnecessary setGlobalContainerStack() in project loading 
CURA-5073
 2018-03-09 14:37:43 +01:00
Lipu Fei
15f017b404 Set dirty for containers created in project loading 
CURA-5056
 2018-03-09 10:18:51 +01:00
Lipu Fei
ef8cd304dc No keep/discard setting dialog in project loading 
CURA-4966
 2018-03-08 20:00:21 +01:00
Lipu Fei
b8d3cbfe16 Refactor project loading 
CURA-4966
 2018-03-08 19:50:45 +01:00
Lipu Fei
618bcebd82 Fix create new for conflicting materials in project loading 
CURA-5056
 2018-03-07 16:38:24 +01:00
Lipu Fei
c0d55ac2a8 Postpone signals in project loading to avoid incomplete data update 
CURA-5056
 2018-03-07 11:45:49 +01:00
fieldOfView
97d7354839 Merge branch 'master' into feature_setting_visibility_profiles 2018-03-05 23:09:51 +01:00
Lipu Fei
ca88e0df88 Add doc for calllater active machine in project loading 2018-03-03 16:12:33 +01:00
Lipu Fei
2f86687320 Fix init machine for machines loaded from project files 2018-02-27 13:49:45 +01:00
Jack Ha
22cf5abec2 Merge branch 'master' into refactoring_machine_manager 2018-02-27 10:24:56 +01:00
Lipu Fei
12c51f4066 Use setActiveMachine() in project loading 2018-02-26 17:05:55 +01:00
Ghostkeeper
b5d1e5be36
Remove 'None' default for quality_type 
It has no semantic meaning to specify that here. The behaviour of this commit should be the same since 'None' is the default value for that parameter.

Contributes to issue CURA-4966.
 2018-02-26 16:21:46 +01:00
Diego Prado Gesto
f5b3775b7c CURA-4966 When loading a project, check the quality in all the extruder stacks and replace with 
the global quality if they don't match.
 2018-02-26 14:01:43 +01:00
Lipu Fei
62c31c2f6c WIP: Remove old QualityManager 2018-02-19 22:11:47 +01:00
Aleksei S
86b31c3a6c Fix: in 3.0 version we did not save quality type under extruder.cfg in project 
for custom fdm pritners. For this case during deserializing share quality stack
between global and extruder's stacks
CURA-4966
 2018-02-16 09:12:42 +01:00
fieldOfView
74fe281e1d Sync currently selected preset between visibility-page and -menu 2018-02-09 18:54:04 +01:00
Lipu Fei
ffa4df6a06 Merge 3.2 into master 2018-02-07 13:20:24 +01:00
Jack Ha
a460804bbe CURA-4924 always use interpolation = None for configparser, preventive 2018-02-07 10:21:40 +01:00
Lipu Fei
367e50669d Refactor code 
CURA-3710
 2018-02-01 13:56:49 +01:00
Lipu Fei
0e5c67a38f Merge remote-tracking branch 'origin/master' into CURA-3710_setting_visibility_preset 2018-02-01 11:00:13 +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
Diego Prado Gesto
7a84712fc9 CURA-4854 Revert some changes in 619a8cc that make that issue not working 2018-01-23 12:13:26 +01:00
Aleksei S
54dc63a596 Add missing changes 
CURA-3710
 2018-01-23 11:24:27 +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
3fb9877a30 Add call_on_qt_thread to fix project loading crashing on rendering 
CURA-4839

See comments...
 2018-01-22 17:22:27 +01:00
Diego Prado Gesto
619a8ccce5 CURA-4839 Fix single extrusing for overrite the extruder stack. 2018-01-22 15:04:24 +01:00
Diego Prado Gesto
20da35ec5c Check when the containers are empty instead of None. Contributes to CURA-4845 2018-01-22 13:12:22 +01:00
Diego Prado Gesto
fe6019988c CURA-4839 Create variable before asignment 2018-01-22 10:53:52 +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
322420092d Fix extruder handling in project loading 
CURA-4824

When a machine is getting overriden, it should not try to create the
ExtruderStack for the single-extrusion machine loaded from the project
file, otherwise that ExtruderStack will become an extra one.
 2018-01-18 13:49:41 +01:00
Ghostkeeper
1e892dc45c
Remove unused variables 
Contributes to issue CURA-4810.
 2018-01-16 10:53:14 +01:00
Ghostkeeper
063eb8e5cd
Don't give an error when reading normal 3MF files 
We have a signalling return value for this case. Let's use it.

Contributes to issue CURA-4810.
 2018-01-16 10:53:02 +01:00
Lipu Fei
b60903afc2 Fix setting new ID in project loading 
CURA-4795
 2018-01-15 11:02:52 +01:00
Lipu Fei
eaa27114c6 Fix ID changing in project loading 2017-12-21 12:43:50 +01:00
Lipu Fei
196bffd3ad Only try to get a new unique name when it already exists 
CURA-4704
 2017-12-20 13:20:24 +01:00
Lipu Fei
4f28dec884 Fix typo 2017-12-20 13:19:48 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
ChrisTerBeke
d76081ae1d Only restore global profile based on extruders that are actually in use when loading legacy project file 2017-11-30 16:24:46 +01:00