Change how the matrixes are applied on SVG objects. Fix a minor bug when the renderin...

[cura.git] / Cura / gui / util / openglGui.py

diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py
index 4799cc3f3f3b3928dc2ad212a230cd362d19b36b..bab767e3235ba62e5e1d2846f8d70f05e33df86c 100644 (file)
--- a/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@ -230,20 +230,22 @@ class glGuiPanel(glcanvas.GLCanvas):
                        glFlush()
                        if version.isDevVersion():
                                renderTime = time.time() - renderStartTime
+                               if renderTime == 0:
+                                       renderTime = 0.001
                                glLoadIdentity()
                                glTranslate(10, self.GetSize().GetHeight() - 30, -1)
                                glColor4f(0.2,0.2,0.2,0.5)
                                opengl.glDrawStringLeft("fps:%d" % (1 / renderTime))
                        self.SwapBuffers()
                except:
-                       errStr = 'An error has occurred during the 3D view drawing.'
+                       errStr = _("An error has occurred during the 3D view drawing.")
                        tb = traceback.extract_tb(sys.exc_info()[2])
                        errStr += "\n%s: '%s'" % (str(sys.exc_info()[0].__name__), str(sys.exc_info()[1]))
                        for n in xrange(len(tb)-1, -1, -1):
                                locationInfo = tb[n]
                                errStr += "\n @ %s:%s:%d" % (os.path.basename(locationInfo[0]), locationInfo[2], locationInfo[1])
                        if not self._shownError:
-                               wx.CallAfter(wx.MessageBox, errStr, '3D window error', wx.OK | wx.ICON_EXCLAMATION)
+                               wx.CallAfter(wx.MessageBox, errStr, _("3D window error"), wx.OK | wx.ICON_EXCLAMATION)
                                self._shownError = True
 
        def _drawGui(self):
@@ -500,22 +502,26 @@ class glButton(glGuiControl):
                elif len(self._altTooltip) > 0:
                        glPushMatrix()
                        glTranslatef(pos[0], pos[1], 0)
-                       glTranslatef(0.6*bs*scale, 0, 0)
-
-                       glPushMatrix()
-                       glColor4ub(60,60,60,255)
-                       glTranslatef(-1, -1, 0)
-                       opengl.glDrawStringLeft(self._altTooltip)
-                       glTranslatef(0, 2, 0)
-                       opengl.glDrawStringLeft(self._altTooltip)
-                       glTranslatef(2, 0, 0)
-                       opengl.glDrawStringLeft(self._altTooltip)
-                       glTranslatef(0, -2, 0)
-                       opengl.glDrawStringLeft(self._altTooltip)
-                       glPopMatrix()
-
-                       glColor4ub(255,255,255,255)
-                       opengl.glDrawStringLeft(self._altTooltip)
+                       glTranslatef(0, 0.6*bs, 0)
+                       glTranslatef(0, 6, 0)
+                       #glTranslatef(0.6*bs*scale, 0, 0)
+
+                       for line in self._altTooltip.split('\n'):
+                               glPushMatrix()
+                               glColor4ub(60,60,60,255)
+                               glTranslatef(-1, -1, 0)
+                               opengl.glDrawStringCenter(line)
+                               glTranslatef(0, 2, 0)
+                               opengl.glDrawStringCenter(line)
+                               glTranslatef(2, 0, 0)
+                               opengl.glDrawStringCenter(line)
+                               glTranslatef(0, -2, 0)
+                               opengl.glDrawStringCenter(line)
+                               glPopMatrix()
+
+                               glColor4ub(255,255,255,255)
+                               opengl.glDrawStringCenter(line)
+                               glTranslatef(0, 18, 0)
                        glPopMatrix()
 
        def _checkHit(self, x, y):