From: daid Date: Sun, 16 Feb 2014 10:50:54 +0000 (+0100) Subject: Fix bug that causes objects not to be re-arranged when switching to one-at-a-time... X-Git-Tag: 14.02-RC2~9 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5012c8f25999292819416a60e5921580e9cb565d;p=cura.git Fix bug that causes objects not to be re-arranged when switching to one-at-a-time printing. --- diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index 97e9c6e3..e105056a 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -326,6 +326,7 @@ class mainWindow(wx.Frame): if self.oneAtATime.IsChecked() and profile.getMachineSettingFloat('extruder_head_size_height') < 1: wx.MessageBox(_('For "One at a time" printing, you need to have entered the correct head size and gantry height in the machine settings'), _('One at a time warning'), wx.OK | wx.ICON_WARNING) self.scene.updateProfileToControls() + self.scene._scene.pushFree() self.scene.sceneUpdated() def OnPreferences(self, e): diff --git a/Cura/util/objectScene.py b/Cura/util/objectScene.py index 1a3437c8..84964067 100644 --- a/Cura/util/objectScene.py +++ b/Cura/util/objectScene.py @@ -204,7 +204,11 @@ class Scene(object): obj1.setPosition((obj1.getPosition() + obj2.getPosition()) / 2) self.pushFree(obj1) - def pushFree(self, staticObj): + def pushFree(self, staticObj = None): + if staticObj is None: + for obj in self._objectList: + self.pushFree(obj) + return if not self.checkPlatform(staticObj): return pushList = []