3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

Browse source
This commit is contained in:
fieldOfView 2016-03-17 16:29:37 +01:00
commit 476ab9226d
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/BuildVolume.py
View file

@ -259,7 +259,7 @@ class BuildVolume(SceneNode):
skirt_line_count = profile.getSettingValue("skirt_line_count")
skirt_size = skirt_distance + (skirt_line_count * profile.getSettingValue("skirt_line_width"))
elif adhesion_type == "brim":
skirt_size = profile.getSettingValue("brim_width")
skirt_size = profile.getSettingValue("brim_line_count") * profile.getSettingValue("skirt_line_width")
elif adhesion_type == "raft":
skirt_size = profile.getSettingValue("raft_margin")

4
plugins/USBPrinting/PrinterConnection.py
View file

@ -391,6 +391,10 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter):
def homeHead(self):
self._sendCommand("G28")
@pyqtSlot()
def homeBed(self):
self._sendCommand("G28 Z")
## Directly send the command, withouth checking connection state (eg; printing).
# \param cmd string with g-code
def _sendCommand(self, cmd):

2
resources/qml/WizardPages/Bedleveling.qml
View file

@ -21,6 +21,8 @@ Item
property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer
Component.onCompleted:
{
printer_connection.homeBed()
printer_connection.moveHeadRelative(0, 0, 3)
printer_connection.homeHead()
}
UM.I18nCatalog { id: catalog; name:"cura"}