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
e0c69eb675
Pressing enter on project overview will load the project file
...
CURA-4735
2018-01-19 12:51:09 +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
Jack Ha
71e4d42409
CURA-4795 set build plate of newly loaded 3mf files to active build plate
2018-01-16 10:47:30 +01:00
Lipu Fei
b60903afc2
Fix setting new ID in project loading
...
CURA-4795
2018-01-15 11:02:52 +01:00
ChrisTerBeke
08322d0a5e
Move all decorators in the scene subfolder
2018-01-03 15:09:19 +01:00
Jack Ha
bfa33c721c
CURA-4525 solved merge conflicts
2018-01-03 13:52:55 +01:00
Lipu Fei
eaa27114c6
Fix ID changing in project loading
2017-12-21 12:43:50 +01:00
Jack Ha
5152b2ae65
Solved merge conflicts. CURA-4525
2017-12-21 10:52:51 +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
Ghostkeeper
96c38bce2b
Merge branch '3.1'
2017-11-30 16:57:01 +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
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
Ghostkeeper
c63ef6fed6
Remove unused variables
...
The machine_name variable is later redefined.
Contributes to issue CURA-4243.
2017-11-28 16:58:04 +01:00
ChrisTerBeke
e3f1144d97
Update creating QML component in plugin browser - CURA-4568
2017-11-28 14:25:09 +01:00
Lipu Fei
7d01e3388f
Merge remote-tracking branch 'upstream/3.1'
2017-11-28 11:36:03 +01:00
Lipu Fei
6db06ea713
Fix project loading for single-extrusion machines
...
CURA-4617
2017-11-28 11:17:17 +01:00
ChrisTerBeke
a072af5585
Merge branch '3.1'
2017-11-27 17:17:02 +01:00
Lipu Fei
33a06e13a9
Remove legacy if check in project loading
...
CURA-4617
2017-11-27 14:27:11 +01:00
Lipu Fei
49cac860a8
Fix project loading
...
CURA-4617
2017-11-27 14:17:13 +01:00
Ghostkeeper
17a25f98a4
Merge branch '3.1'
2017-11-27 13:58:52 +01:00
Jaime van Kessel
0613b1e4b7
Creating components is now done with the prefab function
...
CURA-4568
2017-11-27 13:00:49 +01:00
Lipu Fei
828fff5ee5
Fix quality check in project loading
...
CURA-4617
2017-11-27 12:04:21 +01:00
Lipu Fei
46c6c6aa9b
Fix quality profile in project loading
...
CURA-4617
2017-11-27 11:19:40 +01:00
Lipu Fei
4a4f01f9eb
Fix resetting not supported profiles for project loading
...
CURA-4617
2017-11-27 10:52:29 +01:00
ChrisTerBeke
8082c092e5
Fix setting extruder definition in user changes container
2017-11-27 09:54:10 +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
6b3e130349
Fix edge cases with ultimaker2 and whatever other machines that may get affected
...
CURA-4617
2017-11-23 16:28:36 +01:00
Lipu Fei
ef37f0d8c7
Fix project loading to reset quality if it doesn't exist
...
CURA-4617
2017-11-23 15:35:33 +01:00
Lipu Fei
033cc4fbc7
Fix quality update in project loading
...
CURA-4613
2017-11-23 14:12:41 +01:00
Lipu Fei
1db448d7d8
Use the correct quality container for global stacks loaded from project files
...
CURA-4613
2017-11-23 13:04:06 +01:00
Lipu Fei
18c7a5acf3
Pass optional file_name for deserialization
...
CURA-4613
Some upgrades depend on the file_name, so the file_name is needed in
this case.
2017-11-23 11:28:16 +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
Diego Prado Gesto
feb0a08fd9
CURA-4581 The project name is cached instead of set
2017-11-21 12:34:08 +01:00
ChrisTerBeke
657a91c525
Merge pull request #2685 from Ultimaker/container_stack_improvements
...
Container stack improvements
2017-11-20 17:42:26 +01:00
Jack Ha
864f417723
CURA-4525 Fix load and save projects. Not storing build plates or object names yet.
2017-11-15 16:03:32 +01:00
Jack Ha
e21acd1a07
CURA-4525 first multi slice + multi layer data, added filter on build plate, added option arrange on load, visuals like convex hull are now correct
2017-11-09 17:03:20 +01:00
Ghostkeeper
3a9c8d16a2
Fix remaining references to instance_container._id
...
These must've slipped through the cracks.
Contributes to issue CURA-4243.
2017-10-30 15:07:46 +01:00
Lipu Fei
0096fe0de3
Fix project loading to handle "Not Supported" quality profiles
...
CURA-4451
2017-10-30 12:54:21 +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
Ghostkeeper
7745113704
Re-use stack variable
...
We're creating the variable but then requesting the 0th element from the list each time... That can be more logical and more efficient.
Contributes to issue CURA-4243.
2017-10-19 15:32:21 +02:00
Lipu Fei
052ea7d90a
Force use and update the job name with the loaded project file
...
CURA-4348
- If no project is loaded beforehand and then a model file is loaded,
the job name should be determined with the current machine name and
the first loaded model name.
- If a project is loaded, the job name should be the same as the project
name, and it should not change until another project is loaded.
2017-10-12 07:59:43 +02:00
