From f139e91f8805818c93127cc557aae3b8f0f3b984 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 15 Jun 2016 14:20:07 +0200 Subject: [PATCH 1/3] Remove minimum and maximum of _extruder_nr settings This way the validation won't get an error any more. There is no validation. It's an enum anyway. Contributes to issue CURA-1716. --- resources/definitions/fdmprinter.def.json | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 433517504d..ac40eed0ae 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2724,9 +2724,7 @@ "label": "Platform Adhesion Extruder", "description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.", "type": "extruder", - "default_value": 0, - "minimum_value": "0", - "maximum_value": "machine_extruder_count - 1", + "default_value": "0", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -2735,9 +2733,7 @@ "label": "Support Extruder", "description": "The extruder train to use for printing the support. This is used in multi-extrusion.", "type": "extruder", - "default_value": 0, - "minimum_value": "0", - "maximum_value": "machine_extruder_count - 1", + "default_value": "0", "enabled": "support_enable", "settable_per_mesh": false, "settable_per_extruder": false, @@ -2747,10 +2743,8 @@ "label": "Support Infill Extruder", "description": "The extruder train to use for printing the infill of the support. This is used in multi-extrusion.", "type": "extruder", - "default_value": 0, + "default_value": "0", "value": "support_extruder_nr", - "minimum_value": "0", - "maximum_value": "machine_extruder_count - 1", "enabled": "support_enable", "settable_per_mesh": false, "settable_per_extruder": false @@ -2760,10 +2754,8 @@ "label": "First Layer Support Extruder", "description": "The extruder train to use for printing the first layer of support infill. This is used in multi-extrusion.", "type": "extruder", - "default_value": 0, + "default_value": "0", "value": "support_extruder_nr", - "minimum_value": "0", - "maximum_value": "machine_extruder_count - 1", "enabled": "support_enable", "settable_per_mesh": false, "settable_per_extruder": false @@ -2773,10 +2765,8 @@ "label": "Support Roof Extruder", "description": "The extruder train to use for printing the roof of the support. This is used in multi-extrusion.", "type": "extruder", - "default_value": 0, + "default_value": "0", "value": "support_extruder_nr", - "minimum_value": "0", - "maximum_value": "machine_extruder_count - 1", "enabled": "support_enable", "settable_per_mesh": false, "settable_per_extruder": false From 63edd6f74d20e2b6c1e9e5aa694e2aa529ce27ab Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 21 Jun 2016 12:57:33 +0200 Subject: [PATCH 2/3] Improve default raft settings Results from materials testing. --- resources/definitions/fdmprinter.def.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ac40eed0ae..1a3f8f144a 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2479,7 +2479,7 @@ "description": "The speed at which the raft is printed.", "unit": "mm/s", "type": "float", - "default_value": 30, + "default_value": 20, "minimum_value": "0.1", "maximum_value": "299792458000", "maximum_value_warning": "200", @@ -2495,7 +2495,7 @@ "description": "The speed at which the top raft layers are printed. These should be printed a bit slower, so that the nozzle can slowly smooth out adjacent surface lines.", "unit": "mm/s", "type": "float", - "default_value": 30, + "default_value": 20, "minimum_value": "0.1", "maximum_value": "299792458000", "maximum_value_warning": "100", @@ -2510,12 +2510,12 @@ "description": "The speed at which the middle raft layer is printed. This should be printed quite slowly, as the volume of material coming out of the nozzle is quite high.", "unit": "mm/s", "type": "float", - "default_value": 15, + "default_value": 20, "minimum_value": "0.1", "maximum_value": "299792458000", "maximum_value_warning": "150", "enabled": "adhesion_type == \"raft\"", - "value": "0.5 * raft_speed", + "value": "raft_speed", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -2530,7 +2530,7 @@ "maximum_value": "299792458000", "maximum_value_warning": "200", "enabled": "adhesion_type == \"raft\"", - "value": "0.5 * raft_speed", + "value": "0.75 * raft_speed", "settable_per_mesh": false, "settable_per_extruder": true } From 8a206b74fd02d4a7088ad96e7c09f9d505123b44 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 21 Jun 2016 16:24:07 +0200 Subject: [PATCH 3/3] Use new-style signalemitter decorator instead of SingalEmitter subclass CURA-1615 --- plugins/USBPrinting/USBPrinterOutputDeviceManager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/USBPrinting/USBPrinterOutputDeviceManager.py b/plugins/USBPrinting/USBPrinterOutputDeviceManager.py index 5009ba69bb..760b1b1564 100644 --- a/plugins/USBPrinting/USBPrinterOutputDeviceManager.py +++ b/plugins/USBPrinting/USBPrinterOutputDeviceManager.py @@ -1,7 +1,7 @@ # Copyright (c) 2015 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. -from UM.Signal import Signal, SignalEmitter +from UM.Signal import Signal, signalemitter from . import USBPrinterOutputDevice from UM.Application import Application from UM.Resources import Resources @@ -28,7 +28,8 @@ i18n_catalog = i18nCatalog("cura") ## Manager class that ensures that a usbPrinteroutput device is created for every connected USB printer. -class USBPrinterOutputDeviceManager(QObject, SignalEmitter, OutputDevicePlugin, Extension): +@signalemitter +class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin, Extension): def __init__(self, parent = None): super().__init__(parent = parent) self._serial_port_list = []