From 583ce5ae50f8b86de72e03297ec84fffe5651a1f Mon Sep 17 00:00:00 2001 From: daid303 Date: Thu, 17 Jan 2013 09:30:42 +0100 Subject: [PATCH] Fixing #328 --- Cura/gui/preview3d.py | 23 +++++++++++++++++++++++ Cura/gui/util/opengl.py | 1 + 2 files changed, 24 insertions(+) diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py index eeea98db..db5e4845 100644 --- a/Cura/gui/preview3d.py +++ b/Cura/gui/preview3d.py @@ -261,6 +261,27 @@ class toolRotate(object): glVertex3f(math.cos(i/32.0*math.pi), 0, math.sin(i/32.0*math.pi)) glEnd() +class toolScale(object): + def __init__(self, parent): + self.parent = parent + + def OnMouseMove(self, p0, p1): + pass + + def OnDragStart(self, p0, p1): + pass + + def OnDrag(self, p0, p1): + pass + + def OnDragEnd(self): + pass + + def OnDraw(self): + glDisable(GL_LIGHTING) + size = self.parent.getObjectSize() / 2 + opengl.DrawBox(-size, size) + class previewPanel(wx.Panel): def __init__(self, parent): super(previewPanel, self).__init__(parent,-1) @@ -376,6 +397,8 @@ class previewPanel(wx.Panel): self.tool = toolInfo(self.glCanvas) if self.rotateToolButton.GetValue(): self.tool = toolRotate(self.glCanvas) + if self.scaleToolButton.GetValue(): + self.tool = toolScale(self.glCanvas) self.returnToModelViewAndUpdateModel() def OnMirrorX(self, e): diff --git a/Cura/gui/util/opengl.py b/Cura/gui/util/opengl.py index 42d9da5e..29b487e0 100644 --- a/Cura/gui/util/opengl.py +++ b/Cura/gui/util/opengl.py @@ -15,6 +15,7 @@ try: from OpenGL.GLUT import * from OpenGL.GLU import * from OpenGL.GL import * + glutInit() hasOpenGLlibs = True except: -- 2.30.2