from __future__ import absolute_import
+__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
import math
import wx
import numpy
import OpenGL
-OpenGL.ERROR_CHECKING = False
+#OpenGL.ERROR_CHECKING = False
from OpenGL.GLU import *
from OpenGL.GL import *
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'
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()
else:
self.dragPlane = 'YZ'
self.dragStartAngle = math.atan2(cursorX0[2], cursorX0[1]) * 180 / math.pi
+ self.dragEndAngle = self.dragStartAngle
return True
return False
glEnd()
glTranslatef(1.1,0,0)
glColor4ub(0,0,0,255)
- opengl.glDrawStringCenter("%d" % (abs(self.dragEndAngle - self.dragStartAngle)))
+ opengl.glDrawStringCenter("%d" % (abs(self.dragEndAngle - self.dragStartAngle) + 0.5))
glColor4ub(255,64,64,255)
glPopMatrix()
else:
return t
def _nodeSize(self):
- return float(self.parent.zoom) / float(self.parent.GetSize().GetWidth()) * 6.0
+ return float(self.parent._zoom) / float(self.parent.GetSize().GetWidth()) * 6.0
def OnMouseMove(self, p0, p1):
self.node = self._traceNodes(p0, p1)
radius *= self.scale
glPushMatrix()
glTranslate(0,0,size[2]/2 + 5)
- glRotate(-self.parent.yaw, 0,0,1)
- if self.parent.pitch < 80:
+ glRotate(-self.parent._yaw, 0,0,1)
+ if self.parent._pitch < 80:
glTranslate(0, radius + 5,0)
- elif self.parent.pitch < 100:
- glTranslate(0, (radius + 5) * (90 - self.parent.pitch) / 10,0)
+ elif self.parent._pitch < 100:
+ glTranslate(0, (radius + 5) * (90 - self.parent._pitch) / 10,0)
else:
glTranslate(0,-(radius + 5),0)
if self.parent.tempMatrix is not None:
glColor3ub(128,0,0)
glVertex3f(0, 0, 0)
glVertex3f(sx, 0, 0)
- glColor3ub(128,128,0)
+ glColor3ub(0,128,0)
glVertex3f(0, 0, 0)
glVertex3f(0, sy, 0)
- glColor3ub(0,128,0)
+ glColor3ub(0,0,128)
glVertex3f(0, 0, 0)
glVertex3f(0, 0, sz)
glEnd()
opengl.glDrawStringCenter("%0.2f" % (scaleX))
glPopMatrix()
if self.node == 3:
- glColor3ub(255,255,0)
+ glColor3ub(64,255,64)
else:
- glColor3ub(128,128,0)
+ glColor3ub(0,128,0)
glPushMatrix()
glTranslatef(0,sy,0)
opengl.DrawBox([-s,-s,-s], [s,s,s])
opengl.glDrawStringCenter("%0.2f" % (scaleY))
glPopMatrix()
if self.node == 4:
- glColor3ub(64,255,64)
+ glColor3ub(64,64,255)
else:
- glColor3ub(0,128,0)
+ glColor3ub(0,0,128)
glPushMatrix()
glTranslatef(0,0,sz)
opengl.DrawBox([-s,-s,-s], [s,s,s])