3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch '3.0'

Browse source
This commit is contained in:
Ghostkeeper 2017-10-03 12:29:27 +02:00
commit 179ea654cc
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -378,7 +378,11 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
Logger.log("e", "Could not find 'metadata/position' in extruder stack file") Logger.log("e", "Could not find 'metadata/position' in extruder stack file")
raise RuntimeError(msg) raise RuntimeError(msg)
extruder_position = extruder_config.get("metadata", "position") extruder_position = extruder_config.get("metadata", "position")
try:
extruder_stack = global_stack.extruders[extruder_position] extruder_stack = global_stack.extruders[extruder_position]
except KeyError:
Logger.log("w", "Could not find the matching extruder stack to override for position %s", extruder_position)
return None
# Override the given extruder stack # Override the given extruder stack
extruder_stack.deserialize(extruder_file_content) extruder_stack.deserialize(extruder_file_content)
@ -701,6 +705,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
if global_stack.getProperty("machine_extruder_count", "value") > 1: if global_stack.getProperty("machine_extruder_count", "value") > 1:
# deserialize new extruder stack over the current ones (if any) # deserialize new extruder stack over the current ones (if any)
stack = self._overrideExtruderStack(global_stack, extruder_file_content) stack = self._overrideExtruderStack(global_stack, extruder_file_content)
if stack is None:
continue
elif self._resolve_strategies["machine"] == "new": elif self._resolve_strategies["machine"] == "new":
new_id = extruder_stack_id_map[container_id] new_id = extruder_stack_id_map[container_id]

2
resources/qml/Topbar.qml
View file

@ -18,8 +18,6 @@ Rectangle
height: UM.Theme.getSize("sidebar_header").height height: UM.Theme.getSize("sidebar_header").height
color: base.monitoringPrint ? UM.Theme.getColor("topbar_background_color_monitoring") : UM.Theme.getColor("topbar_background_color") color: base.monitoringPrint ? UM.Theme.getColor("topbar_background_color_monitoring") : UM.Theme.getColor("topbar_background_color")
Behavior on color { ColorAnimation { duration: 100; } }
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
property bool monitoringPrint: false property bool monitoringPrint: false

2
resources/themes/cura-dark/theme.json
View file

@ -16,7 +16,7 @@
"secondary": [241, 242, 242, 255], "secondary": [241, 242, 242, 255],
"topbar_background_color": [0, 0, 0, 0], "topbar_background_color": [0, 0, 0, 0],
"topbar_background_color_monitoring": [0, 0, 0, 0], "topbar_background_color_monitoring": [31, 36, 39, 255],
"topbar_button_text_active": [255, 255, 255, 255], "topbar_button_text_active": [255, 255, 255, 255],
"topbar_button_text_inactive": [128, 128, 128, 255], "topbar_button_text_inactive": [128, 128, 128, 255],

2
resources/themes/cura-light/theme.json
View file

@ -68,7 +68,7 @@
"secondary": [245, 245, 245, 255], "secondary": [245, 245, 245, 255],
"topbar_background_color": [255, 255, 255, 0], "topbar_background_color": [255, 255, 255, 0],
"topbar_background_color_monitoring": [255, 255, 255, 0], "topbar_background_color_monitoring": [255, 255, 255, 255],
"topbar_button_text_active": [0, 0, 0, 255], "topbar_button_text_active": [0, 0, 0, 255],
"topbar_button_text_inactive": [128, 128, 128, 255], "topbar_button_text_inactive": [128, 128, 128, 255],