GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2019-04-05 16:41:38 +02:00
commit ac0a5bb156
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/3MFReader/WorkspaceDialog.py
View File

@ -155,7 +155,7 @@ class WorkspaceDialog(QObject):
def setNumSettingsOverriddenByQualityChanges(self, num_settings_overridden_by_quality_changes): def setNumSettingsOverriddenByQualityChanges(self, num_settings_overridden_by_quality_changes):
self._num_settings_overridden_by_quality_changes = num_settings_overridden_by_quality_changes self._num_settings_overridden_by_quality_changes = num_settings_overridden_by_quality_changes
self.numSettingsOverriddenByQualityChangesChanged.emit() self.numSettingsOverridenByQualityChangesChanged.emit()
@pyqtProperty(str, notify=qualityNameChanged) @pyqtProperty(str, notify=qualityNameChanged)
def qualityName(self): def qualityName(self):

1
plugins/SimulationView/SimulationViewMenuComponent.qml
View File

@ -177,7 +177,6 @@ Cura.ExpandableComponent
height: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height height: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
width: parent.width width: parent.width
visible: !UM.SimulationView.compatibilityMode visible: !UM.SimulationView.compatibilityMode
enabled: index < 4
onClicked: onClicked:
{ {

2
plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py
View File

@ -356,7 +356,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
properties = device.getProperties().copy() properties = device.getProperties().copy()
if b"incomplete" in properties: if b"incomplete" in properties:
del properties[b"incomplete"] del properties[b"incomplete"]
properties[b"cluster_size"] = len(cluster_printers_list) properties[b"cluster_size"] = str(len(cluster_printers_list)).encode("utf-8")
self._onRemoveDevice(instance_name) self._onRemoveDevice(instance_name)
self._onAddDevice(instance_name, address, properties) self._onAddDevice(instance_name, address, properties)