chiark / gitweb /
Disable the rotate ring for now, unfinished and I want to make a release soon.
authordaid <daid303@gmail.com>
Thu, 27 Sep 2012 09:05:11 +0000 (11:05 +0200)
committerdaid <daid303@gmail.com>
Thu, 27 Sep 2012 09:05:11 +0000 (11:05 +0200)
Cura/gui/preview3d.py

index a123d5a211d6234fb81b41c9d01ba28a2cfefa68..ac7668c845b3376357d565dfd4f1dcaa966536fa 100644 (file)
@@ -436,7 +436,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                        p1 = numpy.array(gluUnProject(e.GetX(), self.viewport[1] + self.viewport[3] - e.GetY(), 1, self.modelMatrix, self.projMatrix, self.viewport))\r
                        cursorZ0 = p0 - (p1 - p0) * (p0[2] / (p1[2] - p0[2]))\r
                        cursorXY = math.sqrt((cursorZ0[0] * cursorZ0[0]) + (cursorZ0[1] * cursorZ0[1]))\r
-                       if cursorXY >= sizeXY * 0.7 and cursorXY <= sizeXY * 0.7 + 3:\r
+                       if cursorXY >= sizeXY * 0.7 and cursorXY <= sizeXY * 0.7 + 3 and False:\r
                                self.SetCursor(wx.StockCursor(wx.CURSOR_SIZING))\r
                        else:\r
                                self.SetCursor(wx.StockCursor(wx.CURSOR_DEFAULT))\r
@@ -444,7 +444,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                if e.Dragging() and e.LeftIsDown():\r
                        if self.dragType == '':\r
                                #Define the drag type depending on the cursor position.\r
-                               if cursorXY >= sizeXY * 0.7 and cursorXY <= sizeXY * 0.7 + 3:\r
+                               if cursorXY >= sizeXY * 0.7 and cursorXY <= sizeXY * 0.7 + 3 and False:\r
                                        self.dragType = 'modelRotate'\r
                                        self.dragStart = math.atan2(cursorZ0[0], cursorZ0[1])\r
                                else:\r
@@ -591,6 +591,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                                glCallList(self.gcodeDisplayList + i)\r
                                if time.time() - starttime > 0.1:\r
                                        break\r
+\r
                        glDisable(GL_LIGHTING)\r
                        glDisable(GL_COLOR_MATERIAL)\r
                        glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, [0.2, 0.2, 0.2, 1.0]);\r
@@ -701,7 +702,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                glTranslate(self.parent.machineCenter.x, self.parent.machineCenter.y, 0)\r
                \r
                #Draw the rotate circle\r
-               if self.parent.objectsMaxV != None:\r
+               if self.parent.objectsMaxV != None and False:\r
                        glDisable(GL_LIGHTING)\r
                        glDisable(GL_CULL_FACE)\r
                        glEnable(GL_BLEND)\r