chiark / gitweb /
Bugfix for mac and inproper values in settings.
authordaid303 <daid303@gmail.com>
Tue, 16 Apr 2013 14:15:09 +0000 (16:15 +0200)
committerdaid303 <daid303@gmail.com>
Tue, 16 Apr 2013 14:15:09 +0000 (16:15 +0200)
Cura/gui/configBase.py
Cura/gui/sceneView.py
Cura/util/profile.py

index 23df35bc1842396dc960981e7dd4fe51d266e9af..7bc4ebfccc1cab52e0a4bce37a603e799bdee030 100644 (file)
@@ -57,11 +57,11 @@ class configPanelBase(wx.Panel):
 
                sizer = wx.GridBagSizer(2, 2)
                leftConfigPanel.SetSizer(sizer)
-               sizer.AddGrowableCol(1)
+               #sizer.AddGrowableCol(1)
 
                sizer = wx.GridBagSizer(2, 2)
                rightConfigPanel.SetSizer(sizer)
-               sizer.AddGrowableCol(1)
+               #sizer.AddGrowableCol(1)
 
                sizer = wx.BoxSizer(wx.HORIZONTAL)
                sizer.Add(leftConfigPanel, proportion=1, border=35, flag=wx.EXPAND)
index c435a105aea252639cc79cddf705058f8bf87e0c..f342ac737b4fc853946fa3a1d60e95cc5ad175c5 100644 (file)
@@ -236,12 +236,15 @@ class SceneView(openglGui.glGuiPanel):
        def OnFillPlatform(self, e):
                if self._selectedObj is None:
                        return
+               n = 0
                while True:
+                       n += 1
                        newObj = self._selectedObj.copy()
                        self._scene.add(newObj)
                        self._scene.centerAll()
                        if not self._scene.checkPlatform(newObj):
                                break
+               self.notification.message("Created %i objects" % (n))
                self._scene.remove(newObj)
                self._scene.centerAll()
                self.sceneUpdated()
index 78abf27d11fa1e91b450119ca080b5f39553cd1b..0727cb93f7f48232aa035e7181c5ab9449f4f7a2 100644 (file)
@@ -453,7 +453,7 @@ def getProfileSettingFloat(name):
        try:
                setting = getProfileSetting(name).replace(',', '.')
                return float(eval(setting, {}, {}))
-       except (ValueError, SyntaxError, TypeError):
+       except:
                return 0.0
 
 def putProfileSetting(name, value):
@@ -476,7 +476,7 @@ def getPreferenceFloat(name):
        try:
                setting = getPreference(name).replace(',', '.')
                return float(eval(setting, {}, {}))
-       except (ValueError, SyntaxError, TypeError):
+       except:
                return 0.0
 
 def getPreferenceColour(name):