GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 07:38:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into simple_convex_hull

Browse Source
This commit is contained in:
Simon Edwards 2016-06-22 15:09:53 +02:00
commit 6548930d46
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/USBPrinting/USBPrinterOutputDeviceManager.py
View File

@ -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 = []

10
resources/definitions/fdmprinter.def.json
View File

@ -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
}