3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix conflicts

Browse source
This commit is contained in:
ChrisTerBeke 2018-01-11 09:06:59 +01:00
commit b2d3d15011
136 changed files with 4422 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/USBPrinting/USBPrinterOutputDevice.py
View file

@ -96,9 +96,12 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
Application.getInstance().getController().setActiveStage("MonitorStage")
gcode_list = getattr(Application.getInstance().getController().getScene(), "gcode_list")
self._printGCode(gcode_list)
# find the G-code for the active build plate to print
active_build_plate_id = Application.getInstance().getBuildPlateModel().activeBuildPlate
gcode_dict = getattr(Application.getInstance().getController().getScene(), "gcode_dict")
gcode_list = gcode_dict[active_build_plate_id]
self._printGCode(gcode_list)
## Show firmware interface.
# This will create the view if its not already created.