Merge branch 'master' of https://github.com/Ultimaker/PluggableCura

Conflicts:
	plugins/USBPrinting/USBPrinterManager.py

PrinterConnection.py

@@ -95,7 +95,7 @@ class PrinterConnection(SignalEmitter):
             return
         self._gcode = gcode_list
         #Reset line number. If this is not done, first line is sometimes ignored
-        self._gcode.insert(0,"M110 N0") 
+        self._gcode.insert(0, "M110")
         self._gcode_position = 0
         self._print_start_time_100 = None
         self._is_printing = True
@@ -153,7 +153,6 @@ class PrinterConnection(SignalEmitter):
                         return 
         self.setIsConnected(False)
 
-    
     ##  Set the baud rate of the serial. This can cause exceptions, but we simply want to ignore those.
     def setBaudRate(self, baud_rate):
         try:
@@ -162,8 +161,6 @@ class PrinterConnection(SignalEmitter):
         except Exception as e:
             return False
 
-    
-    
     def setIsConnected(self, state):
         self._is_connecting = False
         if self._is_connected != state:
@@ -377,4 +374,3 @@ class PrinterConnection(SignalEmitter):
                 #ret.remove(prev)
                 #ret.insert(0, prev)
         return ret
-            

USBPrinterManager.py

@@ -142,7 +142,6 @@ class USBPrinterManager(QObject, SignalEmitter,PluginObject):
         
     def serialConectionStateCallback(self,serial_port):
         connection = self.getConnectionByPort(serial_port)
-        if connection is not None:
         if connection.isConnected():
             Application.getInstance().addOutputDevice(serial_port, {
                 'id': serial_port,
@@ -154,22 +153,13 @@ class USBPrinterManager(QObject, SignalEmitter,PluginObject):
         else:
             Application.getInstance().removeOutputDevice(serial_port)
 
-    
     def _writeToSerial(self, serial_port):
-        ## Create USB control window
-        #self.view = QQuickView()
-        #self.view.setSource(QUrl("plugins/USBPrinting/ControlWindow.qml"))
-        #self.view.show()
-        
-        #self.view.engine().rootContext().setContextProperty('manager',self)
-        
-        for node in DepthFirstIterator(Application.getInstance().getController().getScene().getRoot()):
-            if type(node) is not SceneNode or not node.getMeshData():
-                continue
-            
-            gcode = getattr(node.getMeshData(), 'gcode', False)
-            self.sendGCodeByPort(serial_port,gcode.split('\n'))
-            
+        gcode_list = getattr(Application.getInstance().getController().getScene(), 'gcode_list', None)
+        if gcode_list:
+            final_list = []
+            for gcode in gcode_list:
+                final_list += gcode.split('\n')
+            self.sendGCodeByPort(serial_port, gcode_list)
 
     ## Get a list of printer connection objects that are connected.
     def getActiveConnections(self):