chiark / gitweb /
Merge pull request #601 from CapnBry/reloadscene
[cura.git] / Cura / gui / mainWindow.py
index d954b952ff71272e5196d94703ff3d4f4d1377ba..d193bd4692a846ffb0c103c0d8f3421b0629bbba 100644 (file)
@@ -1,9 +1,10 @@
-from __future__ import absolute_import
 __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
 
 import wx
 import os
 import webbrowser
+import sys
+
 
 from Cura.gui import configBase
 from Cura.gui import expertConfig
@@ -27,13 +28,21 @@ class mainWindow(wx.Frame):
        def __init__(self):
                super(mainWindow, self).__init__(None, title='Cura - ' + version.getVersion())
 
-               self.extruderCount = int(profile.getMachineSetting('extruder_amount'))
-
                wx.EVT_CLOSE(self, self.OnClose)
 
                # allow dropping any file, restrict later
                self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles))
 
+               # TODO: wxWidgets 2.9.4 has a bug when NSView does not register for dragged types when wx drop target is set. It was fixed in 2.9.5
+               if sys.platform.startswith('darwin'):
+                       try:
+                               import objc
+                               nswindow = objc.objc_object(c_void_p=self.MacGetTopLevelWindowRef())
+                               view = nswindow.contentView()
+                               view.registerForDraggedTypes_([u'NSFilenamesPboardType'])
+                       except:
+                               pass
+
                self.normalModeOnlyItems = []
 
                mruFile = os.path.join(profile.getBasePath(), 'mru_filelist.ini')
@@ -64,11 +73,11 @@ class mainWindow(wx.Frame):
 
                self.fileMenu.AppendSeparator()
                i = self.fileMenu.Append(-1, _("Print...\tCTRL+P"))
-               self.Bind(wx.EVT_MENU, lambda e: self.scene.showPrintWindow(), i)
+               self.Bind(wx.EVT_MENU, lambda e: self.scene.OnPrintButton(1), i)
                i = self.fileMenu.Append(-1, _("Save GCode..."))
                self.Bind(wx.EVT_MENU, lambda e: self.scene.showSaveGCode(), i)
                i = self.fileMenu.Append(-1, _("Show slice engine log..."))
-               self.Bind(wx.EVT_MENU, lambda e: self.scene._showSliceLog(), i)
+               self.Bind(wx.EVT_MENU, lambda e: self.scene._showEngineLog(), i)
 
                self.fileMenu.AppendSeparator()
                i = self.fileMenu.Append(-1, _("Open Profile..."))
@@ -126,6 +135,17 @@ class mainWindow(wx.Frame):
 
                i = toolsMenu.Append(-1, _("Copy profile to clipboard"))
                self.Bind(wx.EVT_MENU, self.onCopyProfileClipboard,i)
+
+               toolsMenu.AppendSeparator()
+               self.allAtOnceItem = toolsMenu.Append(-1, _("Print all at once"), kind=wx.ITEM_RADIO)
+               self.Bind(wx.EVT_MENU, self.onOneAtATimeSwitch, self.allAtOnceItem)
+               self.oneAtATime = toolsMenu.Append(-1, _("Print one at a time"), kind=wx.ITEM_RADIO)
+               self.Bind(wx.EVT_MENU, self.onOneAtATimeSwitch, self.oneAtATime)
+               if profile.getPreference('oneAtATime') == 'True':
+                       self.oneAtATime.Check(True)
+               else:
+                       self.allAtOnceItem.Check(True)
+
                self.menubar.Append(toolsMenu, _("Tools"))
 
                #Machine menu for machine configuration/tooling
@@ -144,17 +164,16 @@ class mainWindow(wx.Frame):
                self.Bind(wx.EVT_MENU, self.OnNormalSwitch, i)
                expertMenu.AppendSeparator()
 
-               i = expertMenu.Append(-1, _("Open expert settings..."))
+               i = expertMenu.Append(-1, _("Open expert settings...\tCTRL+E"))
                self.normalModeOnlyItems.append(i)
                self.Bind(wx.EVT_MENU, self.OnExpertOpen, i)
                expertMenu.AppendSeparator()
                i = expertMenu.Append(-1, _("Run first run wizard..."))
                self.Bind(wx.EVT_MENU, self.OnFirstRunWizard, i)
-               i = expertMenu.Append(-1, _("Run bed leveling wizard..."))
-               self.Bind(wx.EVT_MENU, self.OnBedLevelWizard, i)
-               if self.extruderCount > 1:
-                       i = expertMenu.Append(-1, _("Run head offset wizard..."))
-                       self.Bind(wx.EVT_MENU, self.OnHeadOffsetWizard, i)
+               self.bedLevelWizardMenuItem = expertMenu.Append(-1, _("Run bed leveling wizard..."))
+               self.Bind(wx.EVT_MENU, self.OnBedLevelWizard, self.bedLevelWizardMenuItem)
+               self.headOffsetWizardMenuItem = expertMenu.Append(-1, _("Run head offset wizard..."))
+               self.Bind(wx.EVT_MENU, self.OnHeadOffsetWizard, self.headOffsetWizardMenuItem)
 
                self.menubar.Append(expertMenu, _("Expert"))
 
@@ -250,13 +269,15 @@ class mainWindow(wx.Frame):
                        self.Centre()
 
                self.updateSliceMode()
+               self.scene.SetFocus()
 
        def onTimer(self, e):
                #Check if there is something in the clipboard
                profileString = ""
                try:
                        if not wx.TheClipboard.IsOpened():
-                               wx.TheClipboard.Open()
+                               if not wx.TheClipboard.Open():
+                                       return
                                do = wx.TextDataObject()
                                if wx.TheClipboard.GetData(do):
                                        profileString = do.GetText()
@@ -307,22 +328,37 @@ class mainWindow(wx.Frame):
                        # Enabled sash
                        self.splitter.SetSashSize(4)
                self.defaultFirmwareInstallMenuItem.Enable(firmwareInstall.getDefaultFirmware() is not None)
+               if profile.getMachineSetting('machine_type') == 'ultimaker2':
+                       self.bedLevelWizardMenuItem.Enable(False)
+                       self.headOffsetWizardMenuItem.Enable(False)
+               if int(profile.getMachineSetting('extruder_amount')) < 2:
+                       self.headOffsetWizardMenuItem.Enable(False)
+               self.scene.updateProfileToControls()
+               self.scene._scene.pushFree()
+
+       def onOneAtATimeSwitch(self, e):
+               profile.putPreference('oneAtATime', self.oneAtATime.IsChecked())
+               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):
                prefDialog = preferencesDialog.preferencesDialog(self)
                prefDialog.Centre()
                prefDialog.Show()
+               prefDialog.Raise()
                wx.CallAfter(prefDialog.Show)
 
        def OnMachineSettings(self, e):
                prefDialog = preferencesDialog.machineSettingsDialog(self)
                prefDialog.Centre()
                prefDialog.Show()
+               prefDialog.Raise()
 
        def OnDropFiles(self, files):
                if len(files) > 0:
-                       profile.setPluginConfig([])
                        self.updateProfileToAllControls()
                self.scene.loadFiles(files)
 
@@ -393,17 +429,19 @@ class mainWindow(wx.Frame):
                        self.Bind(wx.EVT_MENU, lambda e: self.OnSelectMachine(e.GetId() - 0x1000), i)
 
                self.machineMenu.AppendSeparator()
-               i = self.machineMenu.Append(-1, _("Add new machine..."))
-               self.Bind(wx.EVT_MENU, self.OnAddNewMachine, i)
+
+               i = self.machineMenu.Append(-1, _("Machine settings..."))
+               self.Bind(wx.EVT_MENU, self.OnMachineSettings, i)
 
                #Add tools for machines.
                self.machineMenu.AppendSeparator()
-               i = self.machineMenu.Append(-1, _("Install custom firmware..."))
-               self.Bind(wx.EVT_MENU, self.OnCustomFirmware, i)
 
-               self.defaultFirmwareInstallMenuItem = self.machineMenu.Append(-1, _("Install default Marlin firmware..."))
+               self.defaultFirmwareInstallMenuItem = self.machineMenu.Append(-1, _("Install default firmware..."))
                self.Bind(wx.EVT_MENU, self.OnDefaultMarlinFirmware, self.defaultFirmwareInstallMenuItem)
 
+               i = self.machineMenu.Append(-1, _("Install custom firmware..."))
+               self.Bind(wx.EVT_MENU, self.OnCustomFirmware, i)
+
        def OnLoadProfile(self, e):
                dlg=wx.FileDialog(self, _("Select profile file to load"), os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
                dlg.SetWildcard("ini files (*.ini)|*.ini")
@@ -478,14 +516,6 @@ class mainWindow(wx.Frame):
                self.Show()
                self.reloadSettingPanels()
 
-       def OnAddNewMachine(self, e):
-               self.Hide()
-               profile.setActiveMachine(profile.getMachineCount())
-               configWizard.configWizard(True)
-               self.Show()
-               self.reloadSettingPanels()
-               self.updateMachineMenu()
-
        def OnSelectMachine(self, index):
                profile.setActiveMachine(index)
                self.reloadSettingPanels()
@@ -538,7 +568,7 @@ class mainWindow(wx.Frame):
                aboutBox.Show()
 
        def OnClose(self, e):
-               profile.saveProfile(profile.getDefaultProfilePath())
+               profile.saveProfile(profile.getDefaultProfilePath(), True)
 
                # Save the window position, size & state from the preferences file
                profile.putPreference('window_maximized', self.IsMaximized())
@@ -559,7 +589,7 @@ class mainWindow(wx.Frame):
                #HACK: Set the paint function of the glCanvas to nothing so it won't keep refreshing. Which can keep wxWidgets from quiting.
                print "Closing down"
                self.scene.OnPaint = lambda e : e
-               self.scene._slicer.cleanup()
+               self.scene._engine.cleanup()
                self.Destroy()
 
        def OnQuit(self, e):