From 45ff62465105653b312a9ae05290afaadf729d25 Mon Sep 17 00:00:00 2001 From: Daid Date: Fri, 17 May 2013 11:51:47 +0200 Subject: [PATCH] Fix the expert window on MacOS. Remove the exception if the GCode loader is interrupted because of new GCode. --- Cura/gui/expertConfig.py | 4 ++-- Cura/gui/mainWindow.py | 5 ++--- Cura/gui/sceneView.py | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cura/gui/expertConfig.py b/Cura/gui/expertConfig.py index 624be954..e82ae710 100644 --- a/Cura/gui/expertConfig.py +++ b/Cura/gui/expertConfig.py @@ -22,11 +22,11 @@ class expertConfigWindow(wx.Dialog): if s.checkConditions(): configBase.SettingRow(p, s.getName()) - def __init__(self): + def __init__(self, callback): super(expertConfigWindow, self).__init__(None, title='Expert config', style=wx.DEFAULT_DIALOG_STYLE) wx.EVT_CLOSE(self, self.OnClose) - self.panel = configBase.configPanelBase(self) + self.panel = configBase.configPanelBase(self, callback) left, right, main = self.panel.CreateConfigPanel(self) self._addSettingsToPanels('expert', left, right) diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index d6005c3c..8a35c2f7 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -388,10 +388,9 @@ class mainWindow(wx.Frame): configWizard.headOffsetWizard() def OnExpertOpen(self, e): - ecw = expertConfig.expertConfigWindow() + ecw = expertConfig.expertConfigWindow(lambda : self.scene.sceneUpdated()) ecw.Centre() - ecw.ShowModal() - self.scene.sceneUpdated() + ecw.Show() def OnMinecraftImport(self, e): mi = minecraftImport.minecraftImportWindow(self) diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index b060e7c0..f6965743 100644 --- a/Cura/gui/sceneView.py +++ b/Cura/gui/sceneView.py @@ -443,6 +443,8 @@ class SceneView(openglGui.glGuiPanel): return True if len(self._gcode.layerList) % 5 == 0: time.sleep(0.1) + if self._gcode is None: + return True if self.layerSelect.getValue() == self.layerSelect.getMaxValue(): self.layerSelect.setRange(1, len(self._gcode.layerList) - 1) self.layerSelect.setValue(self.layerSelect.getMaxValue()) -- 2.30.2