From ece8ba0f9c53964249b05b191a9364f4f85de727 Mon Sep 17 00:00:00 2001 From: daid303 Date: Thu, 28 Feb 2013 14:26:57 +0100 Subject: [PATCH] Remove the tool selection when changing view modes. --- Cura/gui/preview3d.py | 11 ++++++++--- Cura/gui/util/previewTools.py | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py index 9e004118..355bf82e 100644 --- a/Cura/gui/preview3d.py +++ b/Cura/gui/preview3d.py @@ -137,7 +137,7 @@ class previewPanel(wx.Panel): self.setViewMode('Normal') self.updateModelTransform() - def OnToolSelect(self): + def OnToolSelect(self, resetView = True): if self.rotateToolButton.getSelected(): self.tool = previewTools.toolRotate(self.glCanvas) elif self.scaleToolButton.getSelected(): @@ -154,7 +154,8 @@ class previewPanel(wx.Panel): self.mirrorXButton.setHidden(not self.mirrorToolButton.getSelected()) self.mirrorYButton.setHidden(not self.mirrorToolButton.getSelected()) self.mirrorZButton.setHidden(not self.mirrorToolButton.getSelected()) - self.returnToModelViewAndUpdateModel() + if resetView: + self.returnToModelViewAndUpdateModel() def OnScaleEntry(self, value, axis): try: @@ -311,7 +312,7 @@ class previewPanel(wx.Panel): if mode == "Normal": self.viewSelection.setValue(0) if mode == "GCode": - self.viewSelection.setValue(5) + self.viewSelection.setValue(4) wx.CallAfter(self.glCanvas.Refresh) def loadModelFiles(self, filelist, showWarning = False): @@ -472,6 +473,10 @@ class previewPanel(wx.Panel): self.glCanvas.viewMode = "Mixed" self.layerSelect.setHidden(self.glCanvas.viewMode != "GCode") self.updateToolbar() + self.rotateToolButton.setSelected(False) + self.scaleToolButton.setSelected(False) + self.mirrorToolButton.setSelected(False) + self.OnToolSelect(False) self.glCanvas.Refresh() def updateModelTransform(self, f=0): diff --git a/Cura/gui/util/previewTools.py b/Cura/gui/util/previewTools.py index 903e1cd9..0b4a3d3a 100644 --- a/Cura/gui/util/previewTools.py +++ b/Cura/gui/util/previewTools.py @@ -123,7 +123,7 @@ class toolRotate(object): cursorX0, cursorY0, cursorZ0, cursorYZ, cursorXZ, cursorXY = self._ProjectToPlanes(p0, p1) oldDragPlane = self.dragPlane if radius * self.rotateRingDistMin <= cursorXY <= radius * self.rotateRingDistMax or radius * self.rotateRingDistMin <= cursorYZ <= radius * self.rotateRingDistMax or radius * self.rotateRingDistMin <= cursorXZ <= radius * self.rotateRingDistMax: - self.parent.SetCursor(wx.StockCursor(wx.CURSOR_SIZING)) + #self.parent.SetCursor(wx.StockCursor(wx.CURSOR_SIZING)) if self.dragStartAngle is None: if radius * self.rotateRingDistMin <= cursorXY <= radius * self.rotateRingDistMax: self.dragPlane = 'XY' @@ -134,7 +134,7 @@ class toolRotate(object): else: if self.dragStartAngle is None: self.dragPlane = '' - self.parent.SetCursor(wx.StockCursor(wx.CURSOR_DEFAULT)) + #self.parent.SetCursor(wx.StockCursor(wx.CURSOR_DEFAULT)) def OnDragStart(self, p0, p1): radius = self.parent.getObjectBoundaryCircle() -- 2.30.2