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

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

Browse Source
This commit is contained in:
Jack Ha 2017-05-08 10:51:29 +02:00
commit 82663a727f
4 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/CuraEngineBackend/CuraEngineBackend.py
View File

@ -275,7 +275,11 @@ class CuraEngineBackend(QObject, Backend):
error_labels = set() error_labels = set()
definition_container = self._global_container_stack.getBottom() definition_container = self._global_container_stack.getBottom()
for key in error_keys: for key in error_keys:
error_labels.add(definition_container.findDefinitions(key = key)[0].label) definitions = definition_container.findDefinitions(key = key)
if definitions:
error_labels.add(definitions[0].label)
else:
Logger.log("w", "Unable to find definition for key: {key}".format(key = key))
error_labels = ", ".join(error_labels) error_labels = ", ".join(error_labels)
self._error_message = Message(catalog.i18nc("@info:status", "Unable to slice with the current settings. The following settings have errors: {0}".format(error_labels))) self._error_message = Message(catalog.i18nc("@info:status", "Unable to slice with the current settings. The following settings have errors: {0}".format(error_labels)))

7
plugins/MachineSettingsAction/MachineSettingsAction.qml
View File

@ -29,7 +29,11 @@ Cura.MachineAction
repeat: false repeat: false
interval: 1 interval: 1
onTriggered: base.extruderTabsCount = (machineExtruderCountProvider.properties.value > 1) ? parseInt(machineExtruderCountProvider.properties.value) : 0 onTriggered:
{
var extruderCount = parseInt(machineExtruderCountProvider.properties.value);
base.extruderTabsCount = (extruderCount > 1) ? extruderCount : 0;
}
} }
Connections Connections
@ -42,6 +46,7 @@ Cura.MachineAction
onAccepted: manager.onFinishAction() onAccepted: manager.onFinishAction()
onRejected: manager.onFinishAction() onRejected: manager.onFinishAction()
onClosing: manager.onFinishAction() onClosing: manager.onFinishAction()
onVisibilityChanged: extruderTabsCountDelay.start()
} }
anchors.fill: parent; anchors.fill: parent;

2
plugins/USBPrinting/USBPrinterOutputDeviceManager.py
View File

@ -259,7 +259,7 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin, Extension):
i = 0 i = 0
while True: while True:
values = winreg.EnumValue(key, i) values = winreg.EnumValue(key, i)
if not only_list_usb or "USBSER" in values[0]: if not only_list_usb or "USBSER" or "VCP" in values[0]:
base_list += [values[1]] base_list += [values[1]]
i += 1 i += 1
except Exception as e: except Exception as e:

28
resources/definitions/delta_go.def.json
View File

@ -14,23 +14,29 @@
}, },
"overrides": { "overrides": {
"machine_name": { "default_value": "Delta Go" }, "machine_name": { "default_value": "Delta Go" },
"material_diameter": { "default_value": 1.75 }, "material_diameter": { "default_value": 1.75 },
"default_material_print_temperature": { "default_value": 210 },
"speed_travel": { "default_value": 150 }, "speed_travel": { "default_value": 150 },
"prime_tower_size": { "default_value": 8.66 }, "prime_tower_size": { "default_value": 8.66 },
"infill_sparse_density": { "default_value": 10 }, "infill_sparse_density": { "default_value": 10 },
"speed_wall_x": { "default_value": 30 }, "speed_wall_x": { "default_value": 30 },
"speed_wall_0": { "default_value": 30 }, "speed_wall_0": { "default_value": 30 },
"speed_topbottom": { "default_value": 20 }, "speed_topbottom": { "default_value": 20 },
"layer_height": { "default_value": 0.2 }, "layer_height": { "default_value": 0.15 },
"speed_print": { "default_value": 30 }, "speed_print": { "default_value": 30 },
"machine_heated_bed": { "default_value": false }, "machine_heated_bed": { "default_value": false },
"machine_center_is_zero": { "default_value": true }, "machine_center_is_zero": { "default_value": true },
"machine_height": { "default_value": 127 }, "machine_height": { "default_value": 154 },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_depth": { "default_value": 115 }, "machine_depth": { "default_value": 115 },
"machine_width": { "default_value": 115 }, "machine_width": { "default_value": 115 },
"retraction_amount": { "default_value": 4.2 }, "raft_airgap": { "default_value": 0.15 },
"retraction_speed": { "default_value": 400 }, "retraction_hop_enabled": { "value": "True" },
"machine_shape": { "default_value": "elliptic"} "retraction_amount": { "default_value": 4.1 },
"retraction_speed": { "default_value": 500 },
"retraction_hop": { "value": "0.2" },
"retraction_hop_only_when_collides": { "value": "True" },
"brim_width": { "value": "5" },
"machine_shape": { "default_value": "elliptic"}
} }
} }