Remove the tool selection when changing view modes.

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 9e00411862935750b493e0dba9d82b135b0931ae..355bf82e6ee311df34186d561bd6cfc348cf5d60 100644 (file)
--- 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 903e1cd9d692112f5dc4fa64f053952a078a68b7..0b4a3d3a63e6282b3b2f57c0e273cecd203e735b 100644 (file)
--- 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()