From: daid303 Date: Tue, 16 Apr 2013 14:15:09 +0000 (+0200) Subject: Bugfix for mac and inproper values in settings. X-Git-Tag: 13.05~96 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=946388b8f14ad2c10a6878e9f54fbb249646072a;p=cura.git Bugfix for mac and inproper values in settings. --- diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py index 23df35bc..7bc4ebfc 100644 --- a/Cura/gui/configBase.py +++ b/Cura/gui/configBase.py @@ -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) diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index c435a105..f342ac73 100644 --- a/Cura/gui/sceneView.py +++ b/Cura/gui/sceneView.py @@ -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() diff --git a/Cura/util/profile.py b/Cura/util/profile.py index 78abf27d..0727cb93 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -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):