From 6f002fee9d8414f0510e8d4658942d45895552a2 Mon Sep 17 00:00:00 2001 From: "hg42@gmx.net" Date: Sat, 4 Jan 2014 18:38:31 +0100 Subject: [PATCH] show printing z position in gcode view via layer range and slider --HG-- extra : source : 4c79c88d8b17cf02771861eeed9c2e09b113c24d --- Cura/gui/sceneView.py | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index e123ad42..63c331f0 100644 --- a/Cura/gui/sceneView.py +++ b/Cura/gui/sceneView.py @@ -292,6 +292,7 @@ class SceneView(openglGui.glGuiPanel): self._usbPrintMonitor.loadFile(self._gcodeFilename, self._slicer.getID()) if self._gcodeFilename == self._slicer.getGCodeFilename(): self._slicer.submitSliceInfoOnline() + self.viewSelection.setValue(4) def showSaveGCode(self): if len(self._scene._objectList) < 1: @@ -1227,16 +1228,28 @@ void main(void) self._drawMachine() if self._usbPrintMonitor.getState() == 'PRINTING' and self._usbPrintMonitor.getID() == self._slicer.getID(): - glEnable(GL_BLEND) z = self._usbPrintMonitor.getZ() - size = self._machineSize - glColor4ub(255,255,0,128) - glBegin(GL_QUADS) - glVertex3f(-size[0]/2,-size[1]/2, z) - glVertex3f( size[0]/2,-size[1]/2, z) - glVertex3f( size[0]/2, size[1]/2, z) - glVertex3f(-size[0]/2, size[1]/2, z) - glEnd() + if self.viewMode == 'gcode': + layer_height = profile.getProfileSettingFloat('layer_height') + layer1_height = profile.getProfileSettingFloat('bottom_thickness') + if layer_height > 0: + if layer1_height > 0: + layer = int((z - layer1_height) / layer_height) + 1 + else: + layer = int(z / layer_height) + else: + layer = 1 + self.layerSelect.setValue(layer) + else: + size = self._machineSize + glEnable(GL_BLEND) + glColor4ub(255,255,0,128) + glBegin(GL_QUADS) + glVertex3f(-size[0]/2,-size[1]/2, z) + glVertex3f( size[0]/2,-size[1]/2, z) + glVertex3f( size[0]/2, size[1]/2, z) + glVertex3f(-size[0]/2, size[1]/2, z) + glEnd() if self.viewMode == 'gcode': if self._gcodeLoadThread is not None and self._gcodeLoadThread.isAlive(): -- 2.30.2