D6: Refactoring

cura/CuraApplication.py

@@ -609,11 +609,9 @@ class CuraApplication(QtApplication):
         print_information = self.getPrintInformation()
         if should_pause:
             self.getBackend().pauseSlicing()
-            self.setHideSettings(True)
             print_information.setPreSliced(True)
         else:
             self.getBackend().continueSlicing()
-            self.setHideSettings(False)
             if print_information:
                 print_information.setPreSliced(False)
 
@@ -1033,17 +1031,4 @@ class CuraApplication(QtApplication):
     def log(self, msg):
         Logger.log("d", msg)
 
-    _hide_settings = False
-
-    hideSettingsChanged = pyqtSignal(bool)
-
-    @pyqtSlot(bool)
-    def setHideSettings(self, hide):
-        self._hide_settings = hide
-        self.hideSettingsChanged.emit(hide)
-
-    @pyqtProperty(bool, fset=setHideSettings, notify=hideSettingsChanged)
-    def hideSettings(self):
-        return self._hide_settings
-
 

plugins/GCodeReader/GCodeReader.py

@@ -24,6 +24,7 @@ from UM.Scene.SliceableObjectDecorator import SliceableObjectDecorator
 import numpy
 import math
 import re
+from collections import namedtuple
 
 
 # Class for loading and parsing G-code files
@@ -36,12 +37,13 @@ class GCodeReader(MeshReader):
         self._message = None
         self._clearValues()
         self._scene_node = None
+        self._position = namedtuple('Position', ['x', 'y', 'z', 'e'])
 
     def _clearValues(self):
         self._extruder = 0
         self._layer_type = LayerPolygon.Inset0Type
         self._layer = 0
-        self._prev_z = 0
+        self._previous_z = 0
         self._layer_data_builder = LayerDataBuilder.LayerDataBuilder()
         self._center_is_zero = False
 
@@ -93,7 +95,7 @@ class GCodeReader(MeshReader):
         try:
             self._layer_data_builder.addLayer(self._layer)
             self._layer_data_builder.setLayerHeight(self._layer, path[0][2])
-            self._layer_data_builder.setLayerThickness(self._layer, math.fabs(current_z - self._prev_z))
+            self._layer_data_builder.setLayerThickness(self._layer, math.fabs(current_z - self._previous_z))
             this_layer = self._layer_data_builder.getLayer(self._layer)
         except ValueError:
             return False
@@ -120,21 +122,20 @@ class GCodeReader(MeshReader):
 
     def _gCode0(self, position, params, path):
         x, y, z, e = position
-        xp, yp, zp, ep = params
+        x = params.x if params.x is not None else x
-        x = xp if xp is not None else x
+        y = params.y if params.y is not None else y
-        y = yp if yp is not None else y
         z_changed = False
-        if zp is not None:
+        if params.z is not None:
-            if z != zp:
+            if z != params.z:
                 z_changed = True
-                self._prev_z = z
+                self._previous_z = z
-            z = zp
+            z = params.z
-        if ep is not None:
+        if params.e is not None:
-            if ep > e[self._extruder]:
+            if params.e > e[self._extruder]:
                 path.append([x, y, z, self._layer_type])  # extrusion
             else:
                 path.append([x, y, z, LayerPolygon.MoveRetractionType])  # retraction
-            e[self._extruder] = ep
+            e[self._extruder] = params.e
         else:
             path.append([x, y, z, LayerPolygon.MoveCombingType])
         if z_changed:
@@ -144,25 +145,23 @@ class GCodeReader(MeshReader):
                 path.clear()
             else:
                 path.clear()
-        return (x, y, z, e)
+        return self._position(x, y, z, e)
 
     def _gCode28(self, position, params, path):
-        x, y, z, e = position
+        return self._position(
-        xp, yp, zp, ep = params
+            params.x if params.x is not None else position.x,
-        return (xp if xp is not None else x,
+            params.y if params.y is not None else position.y,
-            yp if yp is not None else y,
             0,
-            e)
+            position.e)
 
     def _gCode92(self, position, params, path):
-        x, y, z, e = position
+        if params.e is not None:
-        xp, yp, zp, ep = params
+            position.e[self._extruder] = params.e
-        if ep is not None:
+        return self._position(
-            e[self._extruder] = ep
+            params.x if params.x is not None else position.x,
-        return (xp if xp is not None else x,
+            params.y if params.y is not None else position.y,
-            yp if yp is not None else y,
+            params.z if params.z is not None else position.z,
-            zp if zp is not None else z,
+            position.e)
-            e)
 
     _gCode1 = _gCode0
 
@@ -175,7 +174,7 @@ class GCodeReader(MeshReader):
         if func is not None:
             if (x is not None and x < 0) or (y is not None and y < 0):
                 self._center_is_zero = True
-            params = (x, y, z, e)
+            params = self._position(x, y, z, e)
             return func(position, params, path)
         return position
 
@@ -219,12 +218,12 @@ class GCodeReader(MeshReader):
 
             Logger.log("d", "Parsing %s" % file_name)
 
-            current_position = (0, 0, 0, [0, 0])  # x, y, z, e
+            current_position = self._position(0, 0, 0, [0, 0])
             current_path = []
 
             for line in file:
                 if self._cancelled:
-                    Logger.log("w", "Parsing %s cancelled" % file_name)
+                    Logger.log("i", "Parsing %s cancelled" % file_name)
                     return None
                 current_line += 1
                 if current_line % file_step == 0:

resources/qml/Sidebar.qml

@@ -16,7 +16,7 @@ Rectangle
 
     property int currentModeIndex;
     property bool monitoringPrint: false
-    property bool hideSettings: Printer.hideSettings
+    property bool hideSettings: PrintInformation.preSliced
     Connections
     {
         target: Printer