Diego Prado Gesto
9561827bda
CURA-4680 Checking if there is global stack in the ExtruderManager.
...
Intead of checking for it in all the methods in MachineManager, now the
check is done in ExtruderManager when there is no printer in the list.
2017-12-06 14:12:51 +01:00
Lipu Fei
c0a502f99c
Check if there is an active machine before doing anything else
...
CURA-4680
2017-12-06 11:48:14 +01:00
Ghostkeeper
f045b85db3
Merge branch '3.1'
2017-12-01 10:19:36 +01:00
Lipu Fei
14c84d835a
Make quality switching clear
...
CURA-4650
2017-12-01 09:55:38 +01:00
Diego Prado Gesto
7e4ed8a257
CURA-4646 Fix save containers also for the extruders
2017-11-30 17:37:16 +01:00
Ghostkeeper
96c38bce2b
Merge branch '3.1'
2017-11-30 16:57:01 +01:00
ChrisTerBeke
3abf067d25
Fix loading .curaproject files with stack setups from earlier versions - CURA-4646
2017-11-30 15:24:51 +01:00
ChrisTerBeke
0668f80792
Merge pull request #2758 from fieldOfView/feature_mesh_types
...
Improved mesh type UX (Per Model Settings)
2017-11-29 13:24:38 +01:00
Diego Prado Gesto
e5ac33a929
CURA-4641 Minor changes
2017-11-29 11:19:11 +01:00
ChrisTerBeke
16e07fc461
Update color indicators for extruders when changing material color - CURA-4641
2017-11-29 10:47:39 +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
8cfaa44580
Fix resolving global stack definition when switching variant - CURA-4620
2017-11-27 16:40:23 +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
ChrisTerBeke
8082c092e5
Fix setting extruder definition in user changes container
2017-11-27 09:54:10 +01:00
Aleksei S
bb2be70dac
Finds candidate quality profile for fdmextruder
...
CURA-4620
2017-11-25 02:25:36 +01:00
Lipu Fei
c7667b56e2
Multiple fixes for stacks
...
CURA-4617
2017-11-24 09:45:59 +01:00
Lipu Fei
2397b68cd7
Optimize MaterialsModel update
...
CURA-4546
2017-11-23 14:07:40 +01:00
Lipu Fei
17f09ec21e
Fix variant/material/quality handling in stacks
...
CURA-4613
2017-11-23 12:46:33 +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
ChrisTerBeke
6c3eaca0fd
fix loading user changes container for single extruder machine
2017-11-22 16:22:23 +01:00
Jack Ha
3b5ed70113
CURA-4602 Fixed active custom profile selected check
2017-11-22 16:15:06 +01:00
ChrisTerBeke
532cfd8404
Fix showing correct quality changes in dropdown list after upgrading - CURA-4482
2017-11-22 10:48:21 +01:00
Lipu Fei
aeb478bb4b
Should only show Keep/Discard dialog when it's needed
...
CURA-4599
2017-11-22 09:32:17 +01:00
Lipu Fei
31c859b3d7
Show Keep/Discard dialog after the containers have been changed
...
CURA-4599
Or the default values will reflect those before the switch.
2017-11-22 09:18:20 +01:00
ChrisTerBeke
0625d22e04
Fix update script for single extrusion quality changes - CURA-4482
2017-11-21 16:43:05 +01:00
ChrisTerBeke
62d70b46d6
Fix filtering custom profiles per extruder - CURA-4482
2017-11-21 15:31:59 +01:00
ChrisTerBeke
657a91c525
Merge pull request #2685 from Ultimaker/container_stack_improvements
...
Container stack improvements
2017-11-20 17:42:26 +01:00
fieldOfView
1924946b59
Merge branch 'master' into feature_mesh_types
...
# Conflicts:
# plugins/SolidView/SolidView.py
2017-11-18 11:28:15 +01:00
Lipu Fei
2c39612bc8
Fix UM2 upgrade regarding the variant
...
CURA-4482
UM2 by default doesn't have variants, but if the user enables Olsson
Block, the variant option will become available. This commit fixes the
following cases:
- Make sure that the variant is set on the extruder stack but not the
global stack
- Extruder stacks don't contain information such as has_variant. Such
info should be retrieved from the global stack and not just from the
definition container because they can be overriden by other
containers.
2017-11-17 12:47:30 +01:00
Lipu Fei
e246784df2
Use parseBool() for metadata bool values
...
CURA-4482
2017-11-17 12:43:30 +01:00
fieldOfView
0b11117d6d
Set a property for non-printing-meshes
...
Remove code duplication
2017-11-09 12:28:55 +01:00
ChrisTerBeke
e29fdbe76d
Cleanup - CURA-4482
2017-11-01 14:32:58 +01:00
ChrisTerBeke
e23e6cfa31
Fix for global quality in case of user created quality profile - CURA-4482
2017-11-01 13:59:21 +01:00
ChrisTerBeke
97421ecf58
Create container stacks when loading older project file - CURA-4482
2017-11-01 13:31:25 +01:00
ChrisTerBeke
957009a768
Fix finding global quality for multi extrusion machines - CURA-4482
2017-10-31 17:32:21 +01:00
ChrisTerBeke
8f41185f22
Fix extruder manager single instance from qml - CURA-4482
2017-10-31 17:18:19 +01:00
ChrisTerBeke
2e1da58570
Cleanup - CURA-4482
2017-10-31 17:06:34 +01:00
ChrisTerBeke
911f619000
Fix for getting machine extruders from manager instance - CURA-4482
2017-10-31 14:43:48 +01:00
ChrisTerBeke
f20ba4a118
Only create new extruder stack for single extrusion machine if it does not exist yet - CURA-4482
2017-10-31 14:37:58 +01:00
ChrisTerBeke
e7f1900f71
Remove layer height from custom profiles in dropdown as it might have changed - CURA-4482
2017-10-31 14:01:15 +01:00
ChrisTerBeke
569047693e
Rename loop variable to be more explicit - CURA-4482
2017-10-31 13:55:47 +01:00
ChrisTerBeke
359514e08b
Cleanup CuraContainerRegistry.py - CURA-4482
2017-10-31 13:49:04 +01:00
ChrisTerBeke
dfe0212a41
Comment out unneeded materials fetching
2017-10-31 13:48:08 +01:00
ChrisTerBeke
bc6984a0ed
Fixes for selecting active variant, material and quality - CURA-4482
2017-10-31 13:19:28 +01:00
ChrisTerBeke
4701518404
Add default position to fdm extruder definition - CURA-4482
2017-10-31 10:23:30 +01:00
ChrisTerBeke
f36c9ffbc0
Create extruder stack for single extrusion machines when adding new machine - CURA-4482
2017-10-31 09:49:24 +01:00
Chris ter Beke
9806ec7374
Resolve merge conflicts with master - CURA-4482
2017-10-31 09:22:03 +01:00
