from Cura.gui import firmwareInstall
from Cura.gui import simpleMode
from Cura.gui import sceneView
+from Cura.gui import aboutWindow
from Cura.gui.util import dropTarget
#from Cura.gui.tools import batchRun
from Cura.gui.tools import pidDebugger
from Cura.util import profile
from Cura.util import version
from Cura.util import meshLoader
-from Cura.util import resources
class mainWindow(wx.Frame):
def __init__(self):
super(mainWindow, self).__init__(None, title='Cura - ' + version.getVersion())
- self.extruderCount = int(profile.getPreference('extruder_amount'))
+ self.extruderCount = int(profile.getMachineSetting('extruder_amount'))
wx.EVT_CLOSE(self, self.OnClose)
- self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.loadSupportedExtensions()))
+ # allow dropping any file, restrict later
+ self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles))
self.normalModeOnlyItems = []
self.fileMenu.AppendSeparator()
i = self.fileMenu.Append(-1, _("Preferences...\tCTRL+,"))
self.Bind(wx.EVT_MENU, self.OnPreferences, i)
+ i = self.fileMenu.Append(-1, _("Machine settings..."))
+ self.Bind(wx.EVT_MENU, self.OnMachineSettings, i)
self.fileMenu.AppendSeparator()
# Model MRU list
modelHistoryMenu = wx.Menu()
- self.fileMenu.AppendMenu(wx.NewId(), _("&Recent Model Files"), modelHistoryMenu)
+ self.fileMenu.AppendMenu(wx.NewId(), '&' + _("Recent Model Files"), modelHistoryMenu)
self.modelFileHistory.UseMenu(modelHistoryMenu)
self.modelFileHistory.AddFilesToMenu()
self.Bind(wx.EVT_MENU_RANGE, self.OnModelMRU, id=self.ID_MRU_MODEL1, id2=self.ID_MRU_MODEL10)
# Profle MRU list
profileHistoryMenu = wx.Menu()
- self.fileMenu.AppendMenu(wx.NewId(), _("&Recent Profile Files"), profileHistoryMenu)
+ self.fileMenu.AppendMenu(wx.NewId(), _("Recent Profile Files"), profileHistoryMenu)
self.profileFileHistory.UseMenu(profileHistoryMenu)
self.profileFileHistory.AddFilesToMenu()
self.Bind(wx.EVT_MENU_RANGE, self.OnProfileMRU, id=self.ID_MRU_PROFILE1, id2=self.ID_MRU_PROFILE10)
self.fileMenu.AppendSeparator()
i = self.fileMenu.Append(wx.ID_EXIT, _("Quit"))
self.Bind(wx.EVT_MENU, self.OnQuit, i)
- self.menubar.Append(self.fileMenu, _("&File"))
+ self.menubar.Append(self.fileMenu, '&' + _("File"))
toolsMenu = wx.Menu()
- i = toolsMenu.Append(-1, _("Switch to quickprint..."))
- self.switchToQuickprintMenuItem = i
- self.Bind(wx.EVT_MENU, self.OnSimpleSwitch, i)
- i = toolsMenu.Append(-1, _("Switch to full settings..."))
- self.switchToNormalMenuItem = i
- self.Bind(wx.EVT_MENU, self.OnNormalSwitch, i)
- toolsMenu.AppendSeparator()
#i = toolsMenu.Append(-1, 'Batch run...')
#self.Bind(wx.EVT_MENU, self.OnBatchRun, i)
#self.normalModeOnlyItems.append(i)
+
if minecraftImport.hasMinecraft():
- i = toolsMenu.Append(-1, _("Minecraft import..."))
+ i = toolsMenu.Append(-1, _("Minecraft map import..."))
self.Bind(wx.EVT_MENU, self.OnMinecraftImport, i)
+
if version.isDevVersion():
i = toolsMenu.Append(-1, _("PID Debugger..."))
self.Bind(wx.EVT_MENU, self.OnPIDDebugger, i)
+
+ i = toolsMenu.Append(-1, _("Copy profile to clipboard"))
+ self.Bind(wx.EVT_MENU, self.onCopyProfileClipboard,i)
self.menubar.Append(toolsMenu, _("Tools"))
+ #Machine menu for machine configuration/tooling
+ self.machineMenu = wx.Menu()
+ self.updateMachineMenu()
+
+ self.menubar.Append(self.machineMenu, _("Machine"))
+
expertMenu = wx.Menu()
+ i = expertMenu.Append(-1, _("Switch to quickprint..."), kind=wx.ITEM_RADIO)
+ self.switchToQuickprintMenuItem = i
+ self.Bind(wx.EVT_MENU, self.OnSimpleSwitch, i)
+
+ i = expertMenu.Append(-1, _("Switch to full settings..."), kind=wx.ITEM_RADIO)
+ self.switchToNormalMenuItem = i
+ self.Bind(wx.EVT_MENU, self.OnNormalSwitch, i)
+ expertMenu.AppendSeparator()
+
i = expertMenu.Append(-1, _("Open expert settings..."))
self.normalModeOnlyItems.append(i)
self.Bind(wx.EVT_MENU, self.OnExpertOpen, i)
expertMenu.AppendSeparator()
- if firmwareInstall.getDefaultFirmware() is not None:
- i = expertMenu.Append(-1, _("Install default Marlin firmware"))
- self.Bind(wx.EVT_MENU, self.OnDefaultMarlinFirmware, i)
- i = expertMenu.Append(-1, _("Install custom firmware"))
- self.Bind(wx.EVT_MENU, self.OnCustomFirmware, 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..."))
if self.extruderCount > 1:
i = expertMenu.Append(-1, _("Run head offset wizard..."))
self.Bind(wx.EVT_MENU, self.OnHeadOffsetWizard, i)
+
self.menubar.Append(expertMenu, _("Expert"))
helpMenu = wx.Menu()
sizer.Layout()
self.sizer = sizer
- self.updateProfileToControls()
+ self.updateProfileToAllControls()
self.SetBackgroundColour(self.normalSettingsPanel.GetBackgroundColour())
self.SetSize((wx.Display().GetClientArea().GetWidth()/2,wx.Display().GetClientArea().GetHeight()/2))
self.Centre()
+ #Timer set; used to check if profile is on the clipboard
+ self.timer = wx.Timer(self)
+ self.Bind(wx.EVT_TIMER, self.onTimer)
+ self.timer.Start(1000)
+ self.lastTriedClipboard = profile.getProfileString()
+
# Restore the window position, size & state from the preferences file
try:
if profile.getPreference('window_maximized') == 'True':
self.updateSliceMode()
+ def onTimer(self, e):
+ #Check if there is something in the clipboard
+ profileString = ""
+ try:
+ if not wx.TheClipboard.IsOpened():
+ wx.TheClipboard.Open()
+ do = wx.TextDataObject()
+ if wx.TheClipboard.GetData(do):
+ profileString = do.GetText()
+ wx.TheClipboard.Close()
+
+ startTag = "CURA_PROFILE_STRING:"
+ if startTag in profileString:
+ #print "Found correct syntax on clipboard"
+ profileString = profileString.replace("\n","").strip()
+ profileString = profileString[profileString.find(startTag)+len(startTag):]
+ if profileString != self.lastTriedClipboard:
+ print profileString
+ self.lastTriedClipboard = profileString
+ profile.setProfileFromString(profileString)
+ self.scene.notification.message("Loaded new profile from clipboard.")
+ self.updateProfileToAllControls()
+ except:
+ print "Unable to read from clipboard"
+
+
def updateSliceMode(self):
isSimple = profile.getPreference('startMode') == 'Simple'
for i in self.normalModeOnlyItems:
i.Enable(not isSimple)
- self.switchToQuickprintMenuItem.Enable(not isSimple)
- self.switchToNormalMenuItem.Enable(isSimple)
+ if isSimple:
+ self.switchToQuickprintMenuItem.Check()
+ else:
+ self.switchToNormalMenuItem.Check()
# Set splitter sash position & size
if isSimple:
# Save normal mode sash
self.normalSashPos = self.splitter.GetSashPosition()
- # Change location of sash to width of quick mode pane
+ # Change location of sash to width of quick mode pane
(width, height) = self.simpleSettingsPanel.GetSizer().GetSize()
self.splitter.SetSashPosition(width, True)
self.splitter.SetSashPosition(self.normalSashPos, True)
# Enabled sash
self.splitter.SetSashSize(4)
+ self.defaultFirmwareInstallMenuItem.Enable(firmwareInstall.getDefaultFirmware() is not None)
self.scene.updateProfileToControls()
def OnPreferences(self, e):
prefDialog = preferencesDialog.preferencesDialog(self)
prefDialog.Centre()
prefDialog.Show()
+ wx.CallAfter(prefDialog.Show)
+
+ def OnMachineSettings(self, e):
+ prefDialog = preferencesDialog.machineSettingsDialog(self)
+ prefDialog.Centre()
+ prefDialog.Show()
def OnDropFiles(self, files):
if len(files) > 0:
profile.setPluginConfig([])
- self.updateProfileToControls()
- self.scene.loadScene(files)
+ self.updateProfileToAllControls()
+ self.scene.loadFiles(files)
def OnModelMRU(self, e):
fileNum = e.GetId() - self.ID_MRU_MODEL1
# Load Model
profile.putPreference('lastFile', path)
filelist = [ path ]
- self.scene.loadScene(filelist)
+ self.scene.loadFiles(filelist)
def addToModelMRU(self, file):
self.modelFileHistory.AddFileToHistory(file)
self.config.SetPath("/ProfileMRU")
self.profileFileHistory.Save(self.config)
self.config.Flush()
- # Load Profile
+ # Load Profile
profile.loadProfile(path)
- self.updateProfileToControls()
+ self.updateProfileToAllControls()
def addToProfileMRU(self, file):
self.profileFileHistory.AddFileToHistory(file)
self.config.SetPath("/ProfileMRU")
self.profileFileHistory.Save(self.config)
- self.config.Flush()
+ self.config.Flush()
- def updateProfileToControls(self):
+ def updateProfileToAllControls(self):
self.scene.updateProfileToControls()
self.normalSettingsPanel.updateProfileToControls()
self.simpleSettingsPanel.updateProfileToControls()
+ def reloadSettingPanels(self):
+ self.leftSizer.Detach(self.simpleSettingsPanel)
+ self.leftSizer.Detach(self.normalSettingsPanel)
+ self.simpleSettingsPanel.Destroy()
+ self.normalSettingsPanel.Destroy()
+ self.simpleSettingsPanel = simpleMode.simpleModePanel(self.leftPane, lambda : self.scene.sceneUpdated())
+ self.normalSettingsPanel = normalSettingsPanel(self.leftPane, lambda : self.scene.sceneUpdated())
+ self.leftSizer.Add(self.simpleSettingsPanel, 1)
+ self.leftSizer.Add(self.normalSettingsPanel, 1, wx.EXPAND)
+ self.updateSliceMode()
+ self.updateProfileToAllControls()
+
+ def updateMachineMenu(self):
+ #Remove all items so we can rebuild the menu. Inserting items seems to cause crashes, so this is the safest way.
+ for item in self.machineMenu.GetMenuItems():
+ self.machineMenu.RemoveItem(item)
+
+ #Add a menu item for each machine configuration.
+ for n in xrange(0, profile.getMachineCount()):
+ i = self.machineMenu.Append(n, profile.getMachineSetting('machine_name', n).title(), kind=wx.ITEM_RADIO)
+ if n == int(profile.getPreferenceFloat('active_machine')):
+ i.Check(True)
+ self.Bind(wx.EVT_MENU, lambda e: self.OnSelectMachine(e.GetId()), i)
+
+ self.machineMenu.AppendSeparator()
+ i = self.machineMenu.Append(-1, _("Add new machine..."))
+ self.Bind(wx.EVT_MENU, self.OnAddNewMachine, 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.Bind(wx.EVT_MENU, self.OnDefaultMarlinFirmware, 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")
if dlg.ShowModal() == wx.ID_OK:
profileFile = dlg.GetPath()
profile.loadProfile(profileFile)
- self.updateProfileToControls()
+ self.updateProfileToAllControls()
# Update the Profile MRU
self.addToProfileMRU(profileFile)
hasProfile = False
for line in f:
if line.startswith(';CURA_PROFILE_STRING:'):
- profile.loadProfileFromString(line[line.find(':')+1:].strip())
+ profile.setProfileFromString(line[line.find(':')+1:].strip())
hasProfile = True
if hasProfile:
- self.updateProfileToControls()
+ self.updateProfileToAllControls()
else:
wx.MessageBox(_("No profile found in GCode file.\nThis feature only works with GCode files made by Cura 12.07 or newer."), _("Profile load error"), wx.OK | wx.ICON_INFORMATION)
dlg.Destroy()
dlg.Destroy()
if result:
profile.resetProfile()
- self.updateProfileToControls()
+ self.updateProfileToAllControls()
def OnSimpleSwitch(self, e):
profile.putPreference('startMode', 'Simple')
firmwareInstall.InstallFirmware()
def OnCustomFirmware(self, e):
- if profile.getPreference('machine_type').startswith('ultimaker'):
+ if profile.getMachineSetting('machine_type').startswith('ultimaker'):
wx.MessageBox(_("Warning: Installing a custom firmware does not guarantee that you machine will function correctly, and could damage your machine."), _("Firmware update"), wx.OK | wx.ICON_EXCLAMATION)
dlg=wx.FileDialog(self, _("Open firmware to upload"), os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
dlg.SetWildcard("HEX file (*.hex)|*.hex;*.HEX")
firmwareInstall.InstallFirmware(filename)
def OnFirstRunWizard(self, e):
+ self.Hide()
configWizard.configWizard()
- self.updateProfileToControls()
+ 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()
def OnBedLevelWizard(self, e):
configWizard.bedLevelWizard()
debugger.Centre()
debugger.Show(True)
+ def onCopyProfileClipboard(self, e):
+ try:
+ if not wx.TheClipboard.IsOpened():
+ wx.TheClipboard.Open()
+ clipData = wx.TextDataObject()
+ self.lastTriedClipboard = profile.getProfileString()
+ profileString = profile.insertNewlines("CURA_PROFILE_STRING:" + self.lastTriedClipboard)
+ clipData.SetText(profileString)
+ wx.TheClipboard.SetData(clipData)
+ wx.TheClipboard.Close()
+ except:
+ print "Could not write to clipboard, unable to get ownership. Another program is using the clipboard."
+
def OnCheckForUpdate(self, e):
newVersion = version.checkForNewerVersion()
if newVersion is not None:
wx.MessageBox(_("You are running the latest version of Cura!"), _("Awesome!"), wx.ICON_INFORMATION)
def OnAbout(self, e):
- info = wx.AboutDialogInfo()
- info.SetName("Cura")
- info.SetDescription(_("End solution for Open Source Fused Filament Fabrication 3D printing."))
- info.SetWebSite('http://software.ultimaker.com/')
- info.SetCopyright(_("Copyright (C) David Braam"))
- info.SetLicence("""
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-""")
- wx.AboutBox(info)
+ aboutBox = aboutWindow.aboutWindow()
+ aboutBox.Centre()
+ aboutBox.Show()
def OnClose(self, e):
profile.saveProfile(profile.getDefaultProfilePath())
profile.putPreference('window_pos_y', posy)
(width, height) = self.GetSize()
profile.putPreference('window_width', width)
- profile.putPreference('window_height', height)
-
+ profile.putPreference('window_height', height)
+
# Save normal sash position. If in normal mode (!simple mode), get last position of sash before saving it...
isSimple = profile.getPreference('startMode') == 'Simple'
if not isSimple:
self.normalSashPos = self.splitter.GetSashPosition()
profile.putPreference('window_normal_sash', self.normalSashPos)
- #HACK: Set the paint function of the glCanvas to nothing so it won't keep refreshing. Which keeps wxWidgets from quiting.
+ #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()
(left, right, self.printPanel) = self.CreateDynamicConfigTab(self.nb, 'Basic')
self._addSettingsToPanels('basic', left, right)
self.SizeLabelWidths(left, right)
-
+
(left, right, self.advancedPanel) = self.CreateDynamicConfigTab(self.nb, 'Advanced')
self._addSettingsToPanels('advanced', left, right)
self.SizeLabelWidths(left, right)
#Plugin page
self.pluginPanel = pluginPanel.pluginPanel(self.nb, callback)
- if len(self.pluginPanel.pluginList) > 0:
- self.nb.AddPage(self.pluginPanel, "Plugins")
- else:
- self.pluginPanel.Show(False)
+ self.nb.AddPage(self.pluginPanel, _("Plugins"))
#Alteration page
- if profile.getPreference('gcode_flavor') == 'UltiGCode':
+ if profile.getMachineSetting('gcode_flavor') == 'UltiGCode':
self.alterationPanel = None
else:
self.alterationPanel = alterationPanel.alterationPanel(self.nb, callback)
n += 1 + len(profile.getSettingsForCategory(category, title))
if n > count / 2:
p = right
- configBase.TitleRow(p, title)
+ configBase.TitleRow(p, _(title))
for s in profile.getSettingsForCategory(category, title):
- if s.checkConditions():
- configBase.SettingRow(p, s.getName())
+ configBase.SettingRow(p, s.getName())
def SizeLabelWidths(self, left, right):
leftWidth = self.getLabelColumnWidth(left)
def OnSize(self, e):
# Make the size of the Notebook control the same size as this control
self.nb.SetSize(self.GetSize())
-
+
# Propegate the OnSize() event (just in case)
e.Skip()
-
+
# Perform out resize magic
self.UpdateSize(self.printPanel)
self.UpdateSize(self.advancedPanel)
-
+
def UpdateSize(self, configPanel):
sizer = configPanel.GetSizer()
-
+
# Pseudocde
# if horizontal:
# if width(col1) < best_width(col1) || width(col2) < best_width(col2):
# if width(col1) > (best_width(col1) + best_width(col1)):
# switch to horizontal
#
-
+
col1 = configPanel.leftPanel
colSize1 = col1.GetSize()
colBestSize1 = col1.GetBestSize()
colBestSize2 = col2.GetBestSize()
orientation = sizer.GetOrientation()
-
+
if orientation == wx.HORIZONTAL:
if (colSize1[0] <= colBestSize1[0]) or (colSize2[0] <= colBestSize2[0]):
configPanel.Freeze()