chiark / gitweb /
Update on normal/quickprint mode. Now they share a lot of code and use the same main...
authordaid303 <daid303@gmail.com>
Fri, 7 Dec 2012 10:37:05 +0000 (11:37 +0100)
committerdaid303 <daid303@gmail.com>
Fri, 7 Dec 2012 10:37:05 +0000 (11:37 +0100)
Cura/cura.py
Cura/gui/configBase.py
Cura/gui/expertConfig.py
Cura/gui/mainWindow.py
Cura/gui/preferencesDialog.py
Cura/gui/projectPlanner.py
Cura/gui/simpleMode.py
Cura/gui/util/__init__.py [new file with mode: 0644]
Cura/gui/util/dropTarget.py

index fae6d8bbc99aea693b96d3efe786bbe5d569a8ec..fec91bfe58cc911a9a0769aa2e09b685fe951fbe 100644 (file)
@@ -98,7 +98,7 @@ def main():
                        mainWindow.main()
 
                app = CuraApp(False)
-               # Apple discurage usage of splash screens on a mac.
+               # Apple discourages usage of splash screens on a mac.
                if sys.platform.startswith('darwin'):
                        mainWindowRunCallback(None)
                else:
index f6c688487bb5b59483b81518d85454f83d2b3baf..a359046c802d300d4132117d3549da7f3233088d 100644 (file)
@@ -5,10 +5,10 @@ import wx, wx.lib.stattext, types
 from Cura.util import validators
 from Cura.util import profile
 
-class configWindowBase(wx.Frame):
+class configPanelBase(wx.Panel):
        "A base class for configuration dialogs. Handles creation of settings, and popups"
-       def __init__(self, title, style=wx.DEFAULT_FRAME_STYLE):
-               super(configWindowBase, self).__init__(None, title=title, style=style)
+       def __init__(self, parent):
+               super(configPanelBase, self).__init__(parent)
                
                self.settingControlList = []
                
index 6ba252ad7c2d9ab4bb24c4b6f1128514567fc380..b8ef30459def1b70d3239551550e07f8883990b0 100644 (file)
@@ -5,14 +5,15 @@ import wx
 from Cura.gui import configBase
 from Cura.util import validators
 
-class expertConfigWindow(configBase.configWindowBase):
+class expertConfigWindow(wx.Frame):
        "Expert configuration window"
        def __init__(self):
-               super(expertConfigWindow, self).__init__(title='Expert config', style=wx.DEFAULT_DIALOG_STYLE)
+               super(expertConfigWindow, self).__init__(None, title='Expert config', style=wx.DEFAULT_DIALOG_STYLE)
 
                wx.EVT_CLOSE(self, self.OnClose)
+               self.panel = configBase.configPanelBase(self)
 
-               left, right, main = self.CreateConfigPanel(self)
+               left, right, main = self.panel.CreateConfigPanel(self)
                
                configBase.TitleRow(left, "Accuracy")
                c = configBase.SettingRow(left, "Extra Wall thickness for bottom/top (mm)", 'extra_base_wall_thickness', '0.0', 'Additional wall thickness of the bottom and top layers.')
index af2bb74639d4da9da2ba353f6ec1082be9e1624e..7a5030b52cc3568c205997b1a9c21e4dbb5c5791 100644 (file)
@@ -29,7 +29,6 @@ from Cura.util import sliceRun
 from Cura.util import meshLoader
 
 def main():
-       #app = wx.App(False)
        if profile.getPreference('machine_type') == 'unknown':
                if platform.system() == "Darwin":
                        #Check if we need to copy our examples
@@ -43,67 +42,72 @@ def main():
                                        shutil.copy(filename, os.path.join(os.path.dirname(exampleFile), os.path.basename(filename)))
                                profile.putPreference('lastFile', exampleFile)
                configWizard.configWizard()
-       if profile.getPreference('startMode') == 'Simple':
-               simpleMode.simpleModeWindow()
-       else:
-               mainWindow()
-       #app.MainLoop()
+       mainWindow()
 
-class mainWindow(configBase.configWindowBase):
-       "Main user interface window"
+class mainWindow(wx.Frame):
        def __init__(self):
-               super(mainWindow, self).__init__(title='Cura - ' + version.getVersion())
+               super(mainWindow, self).__init__(None, title='Cura - ' + version.getVersion())
 
-               extruderCount = int(profile.getPreference('extruder_amount'))
+               self.extruderCount = int(profile.getPreference('extruder_amount'))
 
                wx.EVT_CLOSE(self, self.OnClose)
 
                self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions()))
 
-               menubar = wx.MenuBar()
-               fileMenu = wx.Menu()
-               i = fileMenu.Append(-1, 'Load model file...\tCTRL+L')
+               self.normalModeOnlyItems = []
+
+               self.menubar = wx.MenuBar()
+               self.fileMenu = wx.Menu()
+               i = self.fileMenu.Append(-1, 'Load model file...\tCTRL+L')
                self.Bind(wx.EVT_MENU, lambda e: self._showModelLoadDialog(1), i)
-               i = fileMenu.Append(-1, 'Prepare print...\tCTRL+R')
+               i = self.fileMenu.Append(-1, 'Prepare print...\tCTRL+R')
                self.Bind(wx.EVT_MENU, self.OnSlice, i)
-               i = fileMenu.Append(-1, 'Print...\tCTRL+P')
+               i = self.fileMenu.Append(-1, 'Print...\tCTRL+P')
                self.Bind(wx.EVT_MENU, self.OnPrint, i)
 
-               fileMenu.AppendSeparator()
-               i = fileMenu.Append(-1, 'Open Profile...')
+               self.fileMenu.AppendSeparator()
+               i = self.fileMenu.Append(-1, 'Open Profile...')
+               self.normalModeOnlyItems.append(i)
                self.Bind(wx.EVT_MENU, self.OnLoadProfile, i)
-               i = fileMenu.Append(-1, 'Save Profile...')
+               i = self.fileMenu.Append(-1, 'Save Profile...')
+               self.normalModeOnlyItems.append(i)
                self.Bind(wx.EVT_MENU, self.OnSaveProfile, i)
-               i = fileMenu.Append(-1, 'Load Profile from GCode...')
+               i = self.fileMenu.Append(-1, 'Load Profile from GCode...')
+               self.normalModeOnlyItems.append(i)
                self.Bind(wx.EVT_MENU, self.OnLoadProfileFromGcode, i)
-               fileMenu.AppendSeparator()
-               i = fileMenu.Append(-1, 'Reset Profile to default')
+               self.fileMenu.AppendSeparator()
+               i = self.fileMenu.Append(-1, 'Reset Profile to default')
+               self.normalModeOnlyItems.append(i)
                self.Bind(wx.EVT_MENU, self.OnResetProfile, i)
-               fileMenu.AppendSeparator()
-               i = fileMenu.Append(-1, 'Preferences...\tCTRL+,')
+
+               self.fileMenu.AppendSeparator()
+               i = self.fileMenu.Append(-1, 'Preferences...\tCTRL+,')
                self.Bind(wx.EVT_MENU, self.OnPreferences, i)
-               fileMenu.AppendSeparator()
-               i = fileMenu.Append(wx.ID_EXIT, 'Quit')
+               self.fileMenu.AppendSeparator()
+               i = self.fileMenu.Append(wx.ID_EXIT, 'Quit')
                self.Bind(wx.EVT_MENU, self.OnQuit, i)
-               menubar.Append(fileMenu, '&File')
+               self.menubar.Append(self.fileMenu, '&File')
 
                toolsMenu = wx.Menu()
-               i = toolsMenu.Append(-1, 'Switch to Quickprint...')
+               i = toolsMenu.Append(-1, 'Switch to quickprint...')
                self.Bind(wx.EVT_MENU, self.OnSimpleSwitch, i)
+               i = toolsMenu.Append(-1, 'Switch to full settings...')
+               self.Bind(wx.EVT_MENU, self.OnNormalSwitch, i)
                toolsMenu.AppendSeparator()
                i = toolsMenu.Append(-1, 'Batch run...')
                self.Bind(wx.EVT_MENU, self.OnBatchRun, i)
                i = toolsMenu.Append(-1, 'Project planner...')
                self.Bind(wx.EVT_MENU, self.OnProjectPlanner, i)
-#              i = toolsMenu.Append(-1, 'Open SVG (2D) slicer...')
-#              self.Bind(wx.EVT_MENU, self.OnSVGSlicerOpen, i)
-               menubar.Append(toolsMenu, 'Tools')
+               #               i = toolsMenu.Append(-1, 'Open SVG (2D) slicer...')
+               #               self.Bind(wx.EVT_MENU, self.OnSVGSlicerOpen, i)
+               self.menubar.Append(toolsMenu, 'Tools')
 
                expertMenu = wx.Menu()
                i = expertMenu.Append(-1, 'Open expert settings...')
+               self.normalModeOnlyItems.append(i)
                self.Bind(wx.EVT_MENU, self.OnExpertOpen, i)
                expertMenu.AppendSeparator()
-               if firmwareInstall.getDefaultFirmware() != None:
+               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')
@@ -111,15 +115,15 @@ class mainWindow(configBase.configWindowBase):
                expertMenu.AppendSeparator()
                i = expertMenu.Append(-1, 'ReRun first run wizard...')
                self.Bind(wx.EVT_MENU, self.OnFirstRunWizard, i)
-               menubar.Append(expertMenu, 'Expert')
+               self.menubar.Append(expertMenu, 'Expert')
 
                helpMenu = wx.Menu()
                i = helpMenu.Append(-1, 'Online documentation...')
                self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('http://daid.github.com/Cura'), i)
                i = helpMenu.Append(-1, 'Report a problem...')
                self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('https://github.com/daid/Cura/issues'), i)
-               menubar.Append(helpMenu, 'Help')
-               self.SetMenuBar(menubar)
+               self.menubar.Append(helpMenu, 'Help')
+               self.SetMenuBar(self.menubar)
 
                if profile.getPreference('lastFile') != '':
                        self.filelist = profile.getPreference('lastFile').split(';')
@@ -128,109 +132,13 @@ class mainWindow(configBase.configWindowBase):
                        self.filelist = []
                self.progressPanelList = []
 
+               ##Gui components##
+               self.simpleSettingsPanel = simpleMode.simpleModePanel(self)
+               self.normalSettingsPanel = normalSettingsPanel(self)
+
                #Preview window
                self.preview3d = preview3d.previewPanel(self)
 
-               #Main tabs
-               nb = wx.Notebook(self)
-
-               (left, right) = self.CreateConfigTab(nb, 'Print config')
-
-               configBase.TitleRow(left, "Quality")
-               c = configBase.SettingRow(left, "Layer height (mm)", 'layer_height', '0.2', 'Layer height in millimeters.\n0.2 is a good value for quick prints.\n0.1 gives high quality prints.')
-               validators.validFloat(c, 0.0001)
-               validators.warningAbove(c, lambda : (float(profile.getProfileSetting('nozzle_size')) * 80.0 / 100.0), "Thicker layers then %.2fmm (80%% nozzle size) usually give bad results and are not recommended.")
-               c = configBase.SettingRow(left, "Wall thickness (mm)", 'wall_thickness', '0.8', 'Thickness of the walls.\nThis is used in combination with the nozzle size to define the number\nof perimeter lines and the thickness of those perimeter lines.')
-               validators.validFloat(c, 0.0001)
-               validators.wallThicknessValidator(c)
-               c = configBase.SettingRow(left, "Enable retraction", 'retraction_enable', False, 'Retract the filament when the nozzle is moving over a none-printed area. Details about the retraction can be configured in the advanced tab.')
-
-               configBase.TitleRow(left, "Fill")
-               c = configBase.SettingRow(left, "Bottom/Top thickness (mm)", 'solid_layer_thickness', '0.6', 'This controls the thickness of the bottom and top layers, the amount of solid layers put down is calculated by the layer thickness and this value.\nHaving this value a multiply of the layer thickness makes sense. And keep it near your wall thickness to make an evenly strong part.')
-               validators.validFloat(c, 0.0)
-               c = configBase.SettingRow(left, "Fill Density (%)", 'fill_density', '20', 'This controls how densily filled the insides of your print will be. For a solid part use 100%, for an empty part use 0%. A value around 20% is usually enough')
-               validators.validFloat(c, 0.0, 100.0)
-
-               configBase.TitleRow(right, "Speed && Temperature")
-               c = configBase.SettingRow(right, "Print speed (mm/s)", 'print_speed', '50', 'Speed at which printing happens. A well adjusted Ultimaker can reach 150mm/s, but for good quality prints you want to print slower. Printing speed depends on a lot of factors. So you will be experimenting with optimal settings for this.')
-               validators.validFloat(c, 1.0)
-               validators.warningAbove(c, 150.0, "It is highly unlikely that your machine can achieve a printing speed above 150mm/s")
-               validators.printSpeedValidator(c)
-
-               #configBase.TitleRow(right, "Temperature")
-               c = configBase.SettingRow(right, "Printing temperature", 'print_temperature', '0', 'Temperature used for printing. Set at 0 to pre-heat yourself')
-               validators.validFloat(c, 0.0, 340.0)
-               validators.warningAbove(c, 260.0, "Temperatures above 260C could damage your machine, be careful!")
-               if profile.getPreference('has_heated_bed') == 'True':
-                       c = configBase.SettingRow(right, "Bed temperature", 'print_bed_temperature', '0', 'Temperature used for the heated printer bed. Set at 0 to pre-heat yourself')
-                       validators.validFloat(c, 0.0, 340.0)
-
-               configBase.TitleRow(right, "Support structure")
-               c = configBase.SettingRow(right, "Support type", 'support', ['None', 'Exterior Only', 'Everywhere'], 'Type of support structure build.\n"Exterior only" is the most commonly used support setting.\n\nNone does not do any support.\nExterior only only creates support where the support structure will touch the build platform.\nEverywhere creates support even on the insides of the model.')
-               c = configBase.SettingRow(right, "Add raft", 'enable_raft', False, 'A raft is a few layers of lines below the bottom of the object. It prevents warping. Full raft settings can be found in the expert settings.\nFor PLA this is usually not required. But if you print with ABS it is almost required.')
-               if extruderCount > 1:
-                       c = configBase.SettingRow(right, "Support dual extrusion", 'support_dual_extrusion', False, 'Print the support material with the 2nd extruder in a dual extrusion setup. The primary extruder will be used for normal material, while the second extruder is used to print support material.')
-
-               configBase.TitleRow(right, "Filament")
-               c = configBase.SettingRow(right, "Diameter (mm)", 'filament_diameter', '2.89', 'Diameter of your filament, as accurately as possible.\nIf you cannot measure this value you will have to callibrate it, a higher number means less extrusion, a smaller number generates more extrusion.')
-               validators.validFloat(c, 1.0)
-               validators.warningAbove(c, 3.5, "Are you sure your filament is that thick? Normal filament is around 3mm or 1.75mm.")
-               c = configBase.SettingRow(right, "Packing Density", 'filament_density', '1.00', 'Packing density of your filament. This should be 1.00 for PLA and 0.85 for ABS')
-               validators.validFloat(c, 0.5, 1.5)
-
-               (left, right) = self.CreateConfigTab(nb, 'Advanced config')
-
-               configBase.TitleRow(left, "Machine size")
-               c = configBase.SettingRow(left, "Nozzle size (mm)", 'nozzle_size', '0.4', 'The nozzle size is very important, this is used to calculate the line width of the infill, and used to calculate the amount of outside wall lines and thickness for the wall thickness you entered in the print settings.')
-               validators.validFloat(c, 0.1, 10.0)
-
-               configBase.TitleRow(left, "Skirt")
-               c = configBase.SettingRow(left, "Line count", 'skirt_line_count', '1', 'The skirt is a line drawn around the object at the first layer. This helps to prime your extruder, and to see if the object fits on your platform.\nSetting this to 0 will disable the skirt. Multiple skirt lines can help priming your extruder better for small objects.')
-               validators.validInt(c, 0, 10)
-               c = configBase.SettingRow(left, "Start distance (mm)", 'skirt_gap', '6.0', 'The distance between the skirt and the first layer.\nThis is the minimal distance, multiple skirt lines will be put outwards from this distance.')
-               validators.validFloat(c, 0.0)
-
-               configBase.TitleRow(left, "Retraction")
-               c = configBase.SettingRow(left, "Minimum travel (mm)", 'retraction_min_travel', '5.0', 'Minimum amount of travel needed for a retraction to happen at all. To make sure you do not get a lot of retractions in a small area')
-               validators.validFloat(c, 0.0)
-               c = configBase.SettingRow(left, "Speed (mm/s)", 'retraction_speed', '40.0', 'Speed at which the filament is retracted, a higher retraction speed works better. But a very high retraction speed can lead to filament grinding.')
-               validators.validFloat(c, 0.1)
-               c = configBase.SettingRow(left, "Distance (mm)", 'retraction_amount', '0.0', 'Amount of retraction, set at 0 for no retraction at all. A value of 2.0mm seems to generate good results.')
-               validators.validFloat(c, 0.0)
-               c = configBase.SettingRow(left, "Extra length on start (mm)", 'retraction_extra', '0.0', 'Extra extrusion amount when restarting after a retraction, to better "Prime" your extruder after retraction.')
-               validators.validFloat(c, 0.0)
-
-               configBase.TitleRow(right, "Speed")
-               c = configBase.SettingRow(right, "Travel speed (mm/s)", 'travel_speed', '150', 'Speed at which travel moves are done, a high quality build Ultimaker can reach speeds of 250mm/s. But some machines might miss steps then.')
-               validators.validFloat(c, 1.0)
-               validators.warningAbove(c, 300.0, "It is highly unlikely that your machine can achieve a travel speed above 300mm/s")
-               c = configBase.SettingRow(right, "Max Z speed (mm/s)", 'max_z_speed', '1.0', 'Speed at which Z moves are done. When you Z axis is properly lubercated you can increase this for less Z blob.')
-               validators.validFloat(c, 0.5)
-               c = configBase.SettingRow(right, "Bottom layer speed (mm/s)", 'bottom_layer_speed', '25', 'Print speed for the bottom layer, you want to print the first layer slower so it sticks better to the printer bed.')
-               validators.validFloat(c, 0.0)
-
-               configBase.TitleRow(right, "Cool")
-               c = configBase.SettingRow(right, "Minimal layer time (sec)", 'cool_min_layer_time', '10', 'Minimum time spend in a layer, gives the layer time to cool down before the next layer is put on top. If the layer will be placed down too fast the printer will slow down to make sure it has spend atleast this amount of seconds printing this layer.')
-               validators.validFloat(c, 0.0)
-               c = configBase.SettingRow(right, "Enable cooling fan", 'fan_enabled', True, 'Enable the cooling fan during the print. The extra cooling from the cooling fan is essensial during faster prints.')
-
-               configBase.TitleRow(right, "Quality")
-               c = configBase.SettingRow(right, "Initial layer thickness (mm)", 'bottom_thickness', '0.0', 'Layer thickness of the bottom layer. A thicker bottom layer makes sticking to the bed easier. Set to 0.0 to have the bottom layer thickness the same as the other layers.')
-               validators.validFloat(c, 0.0)
-               validators.warningAbove(c, lambda : (float(profile.getProfileSetting('nozzle_size')) * 3.0 / 4.0), "A bottom layer of more then %.2fmm (3/4 nozzle size) usually give bad results and is not recommended.")
-               c = configBase.SettingRow(right, "Duplicate outlines", 'enable_skin', False, 'Skin prints the outer lines of the prints twice, each time with half the thickness. This gives the illusion of a higher print quality.')
-
-               #Plugin page
-               self.pluginPanel = pluginPanel.pluginPanel(nb)
-               if len(self.pluginPanel.pluginList) > 0:
-                       nb.AddPage(self.pluginPanel, "Plugins")
-               else:
-                       self.pluginPanel.Show(False)
-
-               #Alteration page
-               self.alterationPanel = alterationPanel.alterationPanel(nb)
-               nb.AddPage(self.alterationPanel, "Start/End-GCode")
-
                # load and slice buttons.
                loadButton = wx.Button(self, -1, '&Load model')
                sliceButton = wx.Button(self, -1, 'P&repare print')
@@ -239,13 +147,13 @@ class mainWindow(configBase.configWindowBase):
                self.Bind(wx.EVT_BUTTON, self.OnSlice, sliceButton)
                self.Bind(wx.EVT_BUTTON, self.OnPrint, printButton)
 
-               if extruderCount > 1:
+               if self.extruderCount > 1:
                        loadButton2 = wx.Button(self, -1, 'Load Dual')
                        self.Bind(wx.EVT_BUTTON, lambda e: self._showModelLoadDialog(2), loadButton2)
-               if extruderCount > 2:
+               if self.extruderCount > 2:
                        loadButton3 = wx.Button(self, -1, 'Load Triple')
                        self.Bind(wx.EVT_BUTTON, lambda e: self._showModelLoadDialog(3), loadButton3)
-               if extruderCount > 3:
+               if self.extruderCount > 3:
                        loadButton4 = wx.Button(self, -1, 'Load Quad')
                        self.Bind(wx.EVT_BUTTON, lambda e: self._showModelLoadDialog(4), loadButton4)
 
@@ -255,19 +163,20 @@ class mainWindow(configBase.configWindowBase):
                #Main sizer, to position the preview window, buttons and tab control
                sizer = wx.GridBagSizer()
                self.SetSizer(sizer)
-               sizer.Add(nb, (0,0), span=(1,1), flag=wx.EXPAND)
-               sizer.Add(self.preview3d, (0,1), span=(1,2+extruderCount), flag=wx.EXPAND)
-               sizer.AddGrowableCol(2 + extruderCount)
+               sizer.Add(self.simpleSettingsPanel, (0,0), span=(1,1), flag=wx.EXPAND|wx.TOP|wx.LEFT, border=6)
+               sizer.Add(self.normalSettingsPanel, (0,1), span=(1,1), flag=wx.EXPAND|wx.TOP|wx.RIGHT, border=6)
+               sizer.Add(self.preview3d, (0,2), span=(1,2+self.extruderCount), flag=wx.EXPAND)
+               sizer.AddGrowableCol(2 + self.extruderCount)
                sizer.AddGrowableRow(0)
-               sizer.Add(loadButton, (1,1), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
-               if extruderCount > 1:
-                       sizer.Add(loadButton2, (1,2), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
-               if extruderCount > 2:
-                       sizer.Add(loadButton3, (1,3), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
-               if extruderCount > 3:
-                       sizer.Add(loadButton4, (1,4), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
-               sizer.Add(sliceButton, (1,1+extruderCount), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
-               sizer.Add(printButton, (1,2+extruderCount), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
+               sizer.Add(loadButton, (1,2), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
+               if self.extruderCount > 1:
+                       sizer.Add(loadButton2, (1,3), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
+               if self.extruderCount > 2:
+                       sizer.Add(loadButton3, (1,4), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
+               if self.extruderCount > 3:
+                       sizer.Add(loadButton4, (1,5), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
+               sizer.Add(sliceButton, (1,2+self.extruderCount), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
+               sizer.Add(printButton, (1,3+self.extruderCount), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
                self.sizer = sizer
 
                if len(self.filelist) > 0:
@@ -275,94 +184,43 @@ class mainWindow(configBase.configWindowBase):
 
                self.updateProfileToControls()
 
-               self.SetBackgroundColour(nb.GetBackgroundColour())
+               self.SetBackgroundColour(self.normalSettingsPanel.GetBackgroundColour())
+
+               self.updateSliceMode(True)
 
-               self.Fit()
                if wx.Display().GetClientArea().GetWidth() < self.GetSize().GetWidth():
                        f = self.GetSize().GetWidth() - wx.Display().GetClientArea().GetWidth()
                        self.preview3d.SetMinSize(self.preview3d.GetMinSize().DecBy(f, 0))
                        self.Fit()
                self.preview3d.Fit()
                self.SetMinSize(self.GetSize())
+
                self.Centre()
                self.Show(True)
 
-       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.loadGlobalProfile(profileFile)
-                       self.updateProfileToControls()
-               dlg.Destroy()
-
-       def OnLoadProfileFromGcode(self, e):
-               dlg=wx.FileDialog(self, "Select gcode file to load profile from", os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
-               dlg.SetWildcard("gcode files (*.gcode)|*.gcode;*.g")
-               if dlg.ShowModal() == wx.ID_OK:
-                       gcodeFile = dlg.GetPath()
-                       f = open(gcodeFile, 'r')
-                       hasProfile = False
-                       for line in f:
-                               if line.startswith(';CURA_PROFILE_STRING:'):
-                                       profile.loadGlobalProfileFromString(line[line.find(':')+1:].strip())
-                                       hasProfile = True
-                       if hasProfile:
-                               self.updateProfileToControls()
-                       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()
-
-       def OnSaveProfile(self, e):
-               dlg=wx.FileDialog(self, "Select profile file to save", os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_SAVE)
-               dlg.SetWildcard("ini files (*.ini)|*.ini")
-               if dlg.ShowModal() == wx.ID_OK:
-                       profileFile = dlg.GetPath()
-                       profile.saveGlobalProfile(profileFile)
-               dlg.Destroy()
-
-       def OnResetProfile(self, e):
-               dlg = wx.MessageDialog(self, 'This will reset all profile settings to defaults.\nUnless you have saved your current profile, all settings will be lost!\nDo you really want to reset?', 'Profile reset', wx.YES_NO | wx.ICON_QUESTION)
-               result = dlg.ShowModal() == wx.ID_YES
-               dlg.Destroy()
-               if result:
-                       profile.resetGlobalProfile()
-                       self.updateProfileToControls()
+               self.updateSliceMode()
+               self.Centre()
 
-       def OnBatchRun(self, e):
-               br = batchRun.batchRunWindow(self)
-               br.Centre()
-               br.Show(True)
+       def updateSliceMode(self, forceSimple = False):
+               if forceSimple:
+                       isSimple = True
+               else:
+                       isSimple = profile.getPreference('startMode') == 'Simple'
+               self.normalSettingsPanel.Show(not isSimple)
+               self.simpleSettingsPanel.Show(isSimple)
+               for i in self.normalModeOnlyItems:
+                       i.Enable(not isSimple)
+
+               self.normalSettingsPanel.Layout()
+               self.simpleSettingsPanel.Layout()
+               self.Fit()
+               self.Refresh()
 
        def OnPreferences(self, e):
                prefDialog = preferencesDialog.preferencesDialog(self)
                prefDialog.Centre()
                prefDialog.Show(True)
 
-       def OnSimpleSwitch(self, e):
-               profile.putPreference('startMode', 'Simple')
-               simpleMode.simpleModeWindow()
-               self.Close()
-
-       def OnDefaultMarlinFirmware(self, e):
-               firmwareInstall.InstallFirmware()
-
-       def OnCustomFirmware(self, e):
-               if profile.getPreference('machine_type') == 'ultimaker':
-                       wx.MessageBox('Warning: Installing a custom firmware does not garantee 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")
-               if dlg.ShowModal() == wx.ID_OK:
-                       filename = dlg.GetPath()
-                       if not(os.path.exists(filename)):
-                               return
-                       #For some reason my Ubuntu 10.10 crashes here.
-                       firmwareInstall.InstallFirmware(filename)
-
-       def OnFirstRunWizard(self, e):
-               configWizard.configWizard()
-               self.updateProfileToControls()
-
        def _showOpenDialog(self, title, wildcard = meshLoader.wildcardFilter()):
                dlg=wx.FileDialog(self, title, os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
                dlg.SetWildcard(wildcard)
@@ -391,8 +249,8 @@ class mainWindow(configBase.configWindowBase):
                self.preview3d.loadModelFiles(self.filelist, True)
                self.preview3d.setViewMode("Normal")
 
-       def OnDropFiles(self, filenames):
-               self._loadModels(filenames)
+       def OnDropFiles(self, files):
+               self._loadModels(files)
 
        def OnLoadModel(self, e):
                self._showModelLoadDialog(1)
@@ -412,7 +270,7 @@ class mainWindow(configBase.configWindowBase):
                        return
                #Create a progress panel and add it to the window. The progress panel will start the Skein operation.
                spp = sliceProgessPanel.sliceProgessPanel(self, self, self.filelist)
-               self.sizer.Add(spp, (len(self.progressPanelList)+2,0), span=(1,4), flag=wx.EXPAND)
+               self.sizer.Add(spp, (len(self.progressPanelList)+2,0), span=(1, 4 + self.extruderCount), flag=wx.EXPAND)
                self.sizer.Layout()
                newSize = self.GetSize();
                newSize.IncBy(0, spp.GetSize().GetHeight())
@@ -429,21 +287,6 @@ class mainWindow(configBase.configWindowBase):
                        return
                printWindow.printFile(sliceRun.getExportFilename(self.filelist[0]))
 
-       def OnExpertOpen(self, e):
-               ecw = expertConfig.expertConfigWindow()
-               ecw.Centre()
-               ecw.Show(True)
-
-       def OnProjectPlanner(self, e):
-               pp = projectPlanner.projectPlanner()
-               pp.Centre()
-               pp.Show(True)
-
-       def OnSVGSlicerOpen(self, e):
-               svgSlicer = flatSlicerWindow.flatSlicerWindow()
-               svgSlicer.Centre()
-               svgSlicer.Show(True)
-
        def removeSliceProgress(self, spp):
                self.progressPanelList.remove(spp)
                newSize = self.GetSize();
@@ -460,15 +303,215 @@ class mainWindow(configBase.configWindowBase):
                        i += 1
                self.sizer.Layout()
 
-       def OnQuit(self, e):
-               self.Close()
+       def updateProfileToControls(self):
+               self.preview3d.updateProfileToControls()
+               self.normalSettingsPanel.updateProfileToControls()
+               self.simpleSettingsPanel.updateProfileToControls()
+
+       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.loadGlobalProfile(profileFile)
+                       self.updateProfileToControls()
+               dlg.Destroy()
+
+       def OnLoadProfileFromGcode(self, e):
+               dlg=wx.FileDialog(self, "Select gcode file to load profile from", os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
+               dlg.SetWildcard("gcode files (*.gcode)|*.gcode;*.g")
+               if dlg.ShowModal() == wx.ID_OK:
+                       gcodeFile = dlg.GetPath()
+                       f = open(gcodeFile, 'r')
+                       hasProfile = False
+                       for line in f:
+                               if line.startswith(';CURA_PROFILE_STRING:'):
+                                       profile.loadGlobalProfileFromString(line[line.find(':')+1:].strip())
+                                       hasProfile = True
+                       if hasProfile:
+                               self.updateProfileToControls()
+                       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()
+
+       def OnSaveProfile(self, e):
+               dlg=wx.FileDialog(self, "Select profile file to save", os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_SAVE)
+               dlg.SetWildcard("ini files (*.ini)|*.ini")
+               if dlg.ShowModal() == wx.ID_OK:
+                       profileFile = dlg.GetPath()
+                       profile.saveGlobalProfile(profileFile)
+               dlg.Destroy()
+
+       def OnResetProfile(self, e):
+               dlg = wx.MessageDialog(self, 'This will reset all profile settings to defaults.\nUnless you have saved your current profile, all settings will be lost!\nDo you really want to reset?', 'Profile reset', wx.YES_NO | wx.ICON_QUESTION)
+               result = dlg.ShowModal() == wx.ID_YES
+               dlg.Destroy()
+               if result:
+                       profile.resetGlobalProfile()
+                       self.updateProfileToControls()
+
+       def OnBatchRun(self, e):
+               br = batchRun.batchRunWindow(self)
+               br.Centre()
+               br.Show(True)
+
+       def OnSimpleSwitch(self, e):
+               profile.putPreference('startMode', 'Simple')
+               self.updateSliceMode()
+
+       def OnNormalSwitch(self, e):
+               profile.putPreference('startMode', 'Normal')
+               self.updateSliceMode()
+
+       def OnDefaultMarlinFirmware(self, e):
+               firmwareInstall.InstallFirmware()
+
+       def OnCustomFirmware(self, e):
+               if profile.getPreference('machine_type') == 'ultimaker':
+                       wx.MessageBox('Warning: Installing a custom firmware does not garantee 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")
+               if dlg.ShowModal() == wx.ID_OK:
+                       filename = dlg.GetPath()
+                       if not(os.path.exists(filename)):
+                               return
+                       #For some reason my Ubuntu 10.10 crashes here.
+                       firmwareInstall.InstallFirmware(filename)
+
+       def OnFirstRunWizard(self, e):
+               configWizard.configWizard()
+               self.updateProfileToControls()
+
+       def OnExpertOpen(self, e):
+               ecw = expertConfig.expertConfigWindow()
+               ecw.Centre()
+               ecw.Show(True)
+
+       def OnProjectPlanner(self, e):
+               pp = projectPlanner.projectPlanner()
+               pp.Centre()
+               pp.Show(True)
+
+       def OnSVGSlicerOpen(self, e):
+               svgSlicer = flatSlicerWindow.flatSlicerWindow()
+               svgSlicer.Centre()
+               svgSlicer.Show(True)
 
        def OnClose(self, e):
                profile.saveGlobalProfile(profile.getDefaultProfilePath())
                self.Destroy()
 
+       def OnQuit(self, e):
+               self.Close()
+
+class normalSettingsPanel(configBase.configPanelBase):
+       "Main user interface window"
+       def __init__(self, parent):
+               super(normalSettingsPanel, self).__init__(parent)
+
+               #Main tabs
+               nb = wx.Notebook(self)
+               self.SetSizer(wx.BoxSizer(wx.VERTICAL))
+               self.GetSizer().Add(nb, 1)
+
+               (left, right) = self.CreateConfigTab(nb, 'Print config')
+
+               configBase.TitleRow(left, "Quality")
+               c = configBase.SettingRow(left, "Layer height (mm)", 'layer_height', '0.2', 'Layer height in millimeters.\n0.2 is a good value for quick prints.\n0.1 gives high quality prints.')
+               validators.validFloat(c, 0.0001)
+               validators.warningAbove(c, lambda : (float(profile.getProfileSetting('nozzle_size')) * 80.0 / 100.0), "Thicker layers then %.2fmm (80%% nozzle size) usually give bad results and are not recommended.")
+               c = configBase.SettingRow(left, "Wall thickness (mm)", 'wall_thickness', '0.8', 'Thickness of the walls.\nThis is used in combination with the nozzle size to define the number\nof perimeter lines and the thickness of those perimeter lines.')
+               validators.validFloat(c, 0.0001)
+               validators.wallThicknessValidator(c)
+               c = configBase.SettingRow(left, "Enable retraction", 'retraction_enable', False, 'Retract the filament when the nozzle is moving over a none-printed area. Details about the retraction can be configured in the advanced tab.')
+
+               configBase.TitleRow(left, "Fill")
+               c = configBase.SettingRow(left, "Bottom/Top thickness (mm)", 'solid_layer_thickness', '0.6', 'This controls the thickness of the bottom and top layers, the amount of solid layers put down is calculated by the layer thickness and this value.\nHaving this value a multiply of the layer thickness makes sense. And keep it near your wall thickness to make an evenly strong part.')
+               validators.validFloat(c, 0.0)
+               c = configBase.SettingRow(left, "Fill Density (%)", 'fill_density', '20', 'This controls how densily filled the insides of your print will be. For a solid part use 100%, for an empty part use 0%. A value around 20% is usually enough')
+               validators.validFloat(c, 0.0, 100.0)
+
+               configBase.TitleRow(right, "Speed && Temperature")
+               c = configBase.SettingRow(right, "Print speed (mm/s)", 'print_speed', '50', 'Speed at which printing happens. A well adjusted Ultimaker can reach 150mm/s, but for good quality prints you want to print slower. Printing speed depends on a lot of factors. So you will be experimenting with optimal settings for this.')
+               validators.validFloat(c, 1.0)
+               validators.warningAbove(c, 150.0, "It is highly unlikely that your machine can achieve a printing speed above 150mm/s")
+               validators.printSpeedValidator(c)
+
+               #configBase.TitleRow(right, "Temperature")
+               c = configBase.SettingRow(right, "Printing temperature", 'print_temperature', '0', 'Temperature used for printing. Set at 0 to pre-heat yourself')
+               validators.validFloat(c, 0.0, 340.0)
+               validators.warningAbove(c, 260.0, "Temperatures above 260C could damage your machine, be careful!")
+               if profile.getPreference('has_heated_bed') == 'True':
+                       c = configBase.SettingRow(right, "Bed temperature", 'print_bed_temperature', '0', 'Temperature used for the heated printer bed. Set at 0 to pre-heat yourself')
+                       validators.validFloat(c, 0.0, 340.0)
+
+               configBase.TitleRow(right, "Support structure")
+               c = configBase.SettingRow(right, "Support type", 'support', ['None', 'Exterior Only', 'Everywhere'], 'Type of support structure build.\n"Exterior only" is the most commonly used support setting.\n\nNone does not do any support.\nExterior only only creates support where the support structure will touch the build platform.\nEverywhere creates support even on the insides of the model.')
+               c = configBase.SettingRow(right, "Add raft", 'enable_raft', False, 'A raft is a few layers of lines below the bottom of the object. It prevents warping. Full raft settings can be found in the expert settings.\nFor PLA this is usually not required. But if you print with ABS it is almost required.')
+               if int(profile.getPreference('extruder_amount')) > 1:
+                       c = configBase.SettingRow(right, "Support dual extrusion", 'support_dual_extrusion', False, 'Print the support material with the 2nd extruder in a dual extrusion setup. The primary extruder will be used for normal material, while the second extruder is used to print support material.')
+
+               configBase.TitleRow(right, "Filament")
+               c = configBase.SettingRow(right, "Diameter (mm)", 'filament_diameter', '2.89', 'Diameter of your filament, as accurately as possible.\nIf you cannot measure this value you will have to callibrate it, a higher number means less extrusion, a smaller number generates more extrusion.')
+               validators.validFloat(c, 1.0)
+               validators.warningAbove(c, 3.5, "Are you sure your filament is that thick? Normal filament is around 3mm or 1.75mm.")
+               c = configBase.SettingRow(right, "Packing Density", 'filament_density', '1.00', 'Packing density of your filament. This should be 1.00 for PLA and 0.85 for ABS')
+               validators.validFloat(c, 0.5, 1.5)
+
+               (left, right) = self.CreateConfigTab(nb, 'Advanced config')
+
+               configBase.TitleRow(left, "Machine size")
+               c = configBase.SettingRow(left, "Nozzle size (mm)", 'nozzle_size', '0.4', 'The nozzle size is very important, this is used to calculate the line width of the infill, and used to calculate the amount of outside wall lines and thickness for the wall thickness you entered in the print settings.')
+               validators.validFloat(c, 0.1, 10.0)
+
+               configBase.TitleRow(left, "Skirt")
+               c = configBase.SettingRow(left, "Line count", 'skirt_line_count', '1', 'The skirt is a line drawn around the object at the first layer. This helps to prime your extruder, and to see if the object fits on your platform.\nSetting this to 0 will disable the skirt. Multiple skirt lines can help priming your extruder better for small objects.')
+               validators.validInt(c, 0, 10)
+               c = configBase.SettingRow(left, "Start distance (mm)", 'skirt_gap', '6.0', 'The distance between the skirt and the first layer.\nThis is the minimal distance, multiple skirt lines will be put outwards from this distance.')
+               validators.validFloat(c, 0.0)
+
+               configBase.TitleRow(left, "Retraction")
+               c = configBase.SettingRow(left, "Minimum travel (mm)", 'retraction_min_travel', '5.0', 'Minimum amount of travel needed for a retraction to happen at all. To make sure you do not get a lot of retractions in a small area')
+               validators.validFloat(c, 0.0)
+               c = configBase.SettingRow(left, "Speed (mm/s)", 'retraction_speed', '40.0', 'Speed at which the filament is retracted, a higher retraction speed works better. But a very high retraction speed can lead to filament grinding.')
+               validators.validFloat(c, 0.1)
+               c = configBase.SettingRow(left, "Distance (mm)", 'retraction_amount', '0.0', 'Amount of retraction, set at 0 for no retraction at all. A value of 2.0mm seems to generate good results.')
+               validators.validFloat(c, 0.0)
+               c = configBase.SettingRow(left, "Extra length on start (mm)", 'retraction_extra', '0.0', 'Extra extrusion amount when restarting after a retraction, to better "Prime" your extruder after retraction.')
+               validators.validFloat(c, 0.0)
+
+               configBase.TitleRow(right, "Speed")
+               c = configBase.SettingRow(right, "Travel speed (mm/s)", 'travel_speed', '150', 'Speed at which travel moves are done, a high quality build Ultimaker can reach speeds of 250mm/s. But some machines might miss steps then.')
+               validators.validFloat(c, 1.0)
+               validators.warningAbove(c, 300.0, "It is highly unlikely that your machine can achieve a travel speed above 300mm/s")
+               c = configBase.SettingRow(right, "Max Z speed (mm/s)", 'max_z_speed', '1.0', 'Speed at which Z moves are done. When you Z axis is properly lubercated you can increase this for less Z blob.')
+               validators.validFloat(c, 0.5)
+               c = configBase.SettingRow(right, "Bottom layer speed (mm/s)", 'bottom_layer_speed', '25', 'Print speed for the bottom layer, you want to print the first layer slower so it sticks better to the printer bed.')
+               validators.validFloat(c, 0.0)
+
+               configBase.TitleRow(right, "Cool")
+               c = configBase.SettingRow(right, "Minimal layer time (sec)", 'cool_min_layer_time', '10', 'Minimum time spend in a layer, gives the layer time to cool down before the next layer is put on top. If the layer will be placed down too fast the printer will slow down to make sure it has spend atleast this amount of seconds printing this layer.')
+               validators.validFloat(c, 0.0)
+               c = configBase.SettingRow(right, "Enable cooling fan", 'fan_enabled', True, 'Enable the cooling fan during the print. The extra cooling from the cooling fan is essensial during faster prints.')
+
+               configBase.TitleRow(right, "Quality")
+               c = configBase.SettingRow(right, "Initial layer thickness (mm)", 'bottom_thickness', '0.0', 'Layer thickness of the bottom layer. A thicker bottom layer makes sticking to the bed easier. Set to 0.0 to have the bottom layer thickness the same as the other layers.')
+               validators.validFloat(c, 0.0)
+               validators.warningAbove(c, lambda : (float(profile.getProfileSetting('nozzle_size')) * 3.0 / 4.0), "A bottom layer of more then %.2fmm (3/4 nozzle size) usually give bad results and is not recommended.")
+               c = configBase.SettingRow(right, "Duplicate outlines", 'enable_skin', False, 'Skin prints the outer lines of the prints twice, each time with half the thickness. This gives the illusion of a higher print quality.')
+
+               #Plugin page
+               self.pluginPanel = pluginPanel.pluginPanel(nb)
+               if len(self.pluginPanel.pluginList) > 0:
+                       nb.AddPage(self.pluginPanel, "Plugins")
+               else:
+                       self.pluginPanel.Show(False)
+
+               #Alteration page
+               self.alterationPanel = alterationPanel.alterationPanel(nb)
+               nb.AddPage(self.alterationPanel, "Start/End-GCode")
+
        def updateProfileToControls(self):
-               super(mainWindow, self).updateProfileToControls()
-               self.preview3d.updateProfileToControls()
+               super(normalSettingsPanel, self).updateProfileToControls()
                self.alterationPanel.updateProfileToControls()
                self.pluginPanel.updateProfileToControls()
index 2a6d325fa4abc00b835fdb39037e720eb18b2f76..b583bc4e292f6c0dd364b333deca447534b26157 100644 (file)
@@ -7,16 +7,18 @@ from Cura.util import validators
 from Cura.util import machineCom
 from Cura.util import profile
 
-class preferencesDialog(configBase.configWindowBase):
+class preferencesDialog(wx.Frame):
        def __init__(self, parent):
-               super(preferencesDialog, self).__init__(title="Preferences", style=wx.DEFAULT_DIALOG_STYLE)
+               super(preferencesDialog, self).__init__(None, title="Preferences", style=wx.DEFAULT_DIALOG_STYLE)
                
                wx.EVT_CLOSE(self, self.OnClose)
                
                self.parent = parent
                self.oldExtruderAmount = int(profile.getPreference('extruder_amount'))
+
+               self.panel = configBase.configPanelBase(self)
                
-               left, right, main = self.CreateConfigPanel(self)
+               left, right, main = self.panel.CreateConfigPanel(self)
                configBase.TitleRow(left, 'Machine settings')
                c = configBase.SettingRow(left, 'Steps per E', 'steps_per_e', '0', 'Amount of steps per mm filament extrusion', type = 'preference')
                validators.validFloat(c, 0.1)
index f35d65fc6a33ab86b51c35d102e203c20bc747b8..ab0fe4926be92dc355b101e0d68015d7485e338f 100644 (file)
@@ -1104,16 +1104,17 @@ class ProjectSliceProgressWindow(wx.Frame):
        def OnShowLog(self, e):
                LogWindow('\n'.join(self.progressLog))
 
-class preferencesDialog(configBase.configWindowBase):
+class preferencesDialog(wx.Frame):
        def __init__(self, parent):
-               super(preferencesDialog, self).__init__(title="Project Planner Preferences")
+               super(preferencesDialog, self).__init__(None, title="Project Planner Preferences", style=wx.DEFAULT_DIALOG_STYLE)
                
                self.parent = parent
                wx.EVT_CLOSE(self, self.OnClose)
-               
+
+               self.panel = configBase.configPanelBase(self)
                extruderAmount = int(profile.getPreference('extruder_amount'))
                
-               left, right, main = self.CreateConfigPanel(self)
+               left, right, main = self.panel.CreateConfigPanel(self)
                configBase.TitleRow(left, 'Machine head size')
                c = configBase.SettingRow(left, 'Head size - X towards home (mm)', 'extruder_head_size_min_x', '0', 'Size of your printer head in the X direction, on the Ultimaker your fan is in this direction.', type = 'preference')
                validators.validFloat(c, 0.1)
index d17c0527f637bff517dec7b7e3eb659b22baef47..56f8057d1f877372039d9e9814a646f7f8b5788a 100644 (file)
@@ -1,84 +1,34 @@
 from __future__ import absolute_import
 
 import wx
-import os
-import webbrowser
 
-from Cura.gui import configBase
-from Cura.gui import preview3d
-from Cura.gui import sliceProgessPanel
-from Cura.gui import preferencesDialog
-from Cura.gui.util import dropTarget
-from Cura.gui import printWindow
 from Cura.util import profile
-from Cura.util import version
-from Cura.util import sliceRun
-from Cura.util import meshLoader
 
-class simpleModeWindow(configBase.configWindowBase):
+class simpleModePanel(wx.Panel):
        "Main user interface window for Quickprint mode"
-       def __init__(self):
-               super(simpleModeWindow, self).__init__(title='Cura - Quickprint - ' + version.getVersion())
+       def __init__(self, parent):
+               super(simpleModePanel, self).__init__(parent)
                
-               wx.EVT_CLOSE(self, self.OnClose)
+               #toolsMenu = wx.Menu()
+               #i = toolsMenu.Append(-1, 'Switch to Normal mode...')
+               #self.Bind(wx.EVT_MENU, self.OnNormalSwitch, i)
+               #self.menubar.Insert(1, toolsMenu, 'Normal mode')
 
-               self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions()))
-               
-               menubar = wx.MenuBar()
-               fileMenu = wx.Menu()
-               i = fileMenu.Append(-1, 'Load model file...\tCTRL+L')
-               self.Bind(wx.EVT_MENU, self.OnLoadModel, i)
-               i = fileMenu.Append(-1, 'Prepare print...\tCTRL+R')
-               self.Bind(wx.EVT_MENU, self.OnSlice, i)
-               i = fileMenu.Append(-1, 'Print...\tCTRL+P')
-               self.Bind(wx.EVT_MENU, self.OnPrint, i)
-               fileMenu.AppendSeparator()
-               i = fileMenu.Append(-1, 'Preferences...\tCTRL+,')
-               self.Bind(wx.EVT_MENU, self.OnPreferences, i)
-               fileMenu.AppendSeparator()
-               i = fileMenu.Append(wx.ID_EXIT, 'Quit')
-               self.Bind(wx.EVT_MENU, self.OnQuit, i)
-               menubar.Append(fileMenu, '&File')
-               
-               toolsMenu = wx.Menu()
-               i = toolsMenu.Append(-1, 'Switch to Normal mode...')
-               self.Bind(wx.EVT_MENU, self.OnNormalSwitch, i)
-               menubar.Append(toolsMenu, 'Normal mode')
-               
-               helpMenu = wx.Menu()
-               i = helpMenu.Append(-1, 'Online documentation...')
-               self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('https://daid.github.com/Cura'), i)
-               i = helpMenu.Append(-1, 'Report a problem...')
-               self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('https://github.com/daid/Cura/issues'), i)
-               menubar.Append(helpMenu, 'Help')
-               self.SetMenuBar(menubar)
-               
-               if profile.getPreference('lastFile') != '':
-                       self.filelist = profile.getPreference('lastFile').split(';')
-                       self.SetTitle('Cura - %s - %s' % (version.getVersion(), self.filelist[-1]))
-               else:
-                       self.filelist = []
-               self.progressPanelList = []
-
-               #Preview window
-               self.preview3d = preview3d.previewPanel(self)
-
-               configPanel = wx.Panel(self)
-               printTypePanel = wx.Panel(configPanel)
+               printTypePanel = wx.Panel(self)
                self.printTypeNormal = wx.RadioButton(printTypePanel, -1, 'Normal quality print', style=wx.RB_GROUP)
                self.printTypeLow = wx.RadioButton(printTypePanel, -1, 'Fast low quality print')
                self.printTypeHigh = wx.RadioButton(printTypePanel, -1, 'High quality print')
                self.printTypeJoris = wx.RadioButton(printTypePanel, -1, 'Thin walled cup or vase')
 
-               printMaterialPanel = wx.Panel(configPanel)
+               printMaterialPanel = wx.Panel(self)
                self.printMaterialPLA = wx.RadioButton(printMaterialPanel, -1, 'PLA', style=wx.RB_GROUP)
                self.printMaterialABS = wx.RadioButton(printMaterialPanel, -1, 'ABS')
                self.printMaterialDiameter = wx.TextCtrl(printMaterialPanel, -1, profile.getProfileSetting('filament_diameter'))
                
-               self.printSupport = wx.CheckBox(configPanel, -1, 'Print support structure')
+               self.printSupport = wx.CheckBox(self, -1, 'Print support structure')
                
                sizer = wx.GridBagSizer()
-               configPanel.SetSizer(sizer)
+               self.SetSizer(sizer)
 
                sb = wx.StaticBox(printTypePanel, label="Select a print type:")
                boxsizer = wx.StaticBoxSizer(sb, wx.VERTICAL)
@@ -100,74 +50,15 @@ class simpleModeWindow(configBase.configWindowBase):
                printMaterialPanel.GetSizer().Add(boxsizer, flag=wx.EXPAND)
                sizer.Add(printMaterialPanel, (1,0), flag=wx.EXPAND)
 
-               sb = wx.StaticBox(configPanel, label="Other:")
+               sb = wx.StaticBox(self, label="Other:")
                boxsizer = wx.StaticBoxSizer(sb, wx.VERTICAL)
                boxsizer.Add(self.printSupport)
                sizer.Add(boxsizer, (2,0), flag=wx.EXPAND)
 
-               # load and slice buttons.
-               loadButton = wx.Button(self, -1, '&Load model')
-               sliceButton = wx.Button(self, -1, 'P&repare print')
-               printButton = wx.Button(self, -1, '&Print')
-               self.Bind(wx.EVT_BUTTON, self.OnLoadModel, loadButton)
-               self.Bind(wx.EVT_BUTTON, self.OnSlice, sliceButton)
-               self.Bind(wx.EVT_BUTTON, self.OnPrint, printButton)
-               #Also bind double clicking the 3D preview to load an STL file.
-               self.preview3d.glCanvas.Bind(wx.EVT_LEFT_DCLICK, self.OnLoadModel, self.preview3d.glCanvas)
-
-               #Main sizer, to position the preview window, buttons and tab control
-               sizer = wx.GridBagSizer()
-               self.SetSizer(sizer)
-               sizer.Add(configPanel, (0,0), span=(1,1), flag=wx.EXPAND)
-               sizer.Add(self.preview3d, (0,1), span=(1,3), flag=wx.EXPAND)
-               sizer.AddGrowableCol(2)
-               sizer.AddGrowableRow(0)
-               sizer.Add(loadButton, (1,1), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
-               sizer.Add(sliceButton, (1,2), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
-               sizer.Add(printButton, (1,3), flag=wx.RIGHT|wx.BOTTOM|wx.TOP, border=5)
-               self.sizer = sizer
-
-               if len(self.filelist) > 0:
-                       self.preview3d.loadModelFiles(self.filelist)
-
-               self.SetBackgroundColour(configPanel.GetBackgroundColour())
-
-               self.updateProfileToControls()
-
                self.printTypeNormal.SetValue(True)
                self.printMaterialPLA.SetValue(True)
 
-               self.Fit()
-               self.preview3d.Fit()
-               self.SetMinSize(self.GetSize())
-               self.Centre()
-               self.Show(True)
-       
-       def OnPreferences(self, e):
-               prefDialog = preferencesDialog.preferencesDialog(self)
-               prefDialog.Centre()
-               prefDialog.Show(True)
-
-       def OnLoadModel(self, e):
-               dlg=wx.FileDialog(self, "Open file to print", os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
-               dlg.SetWildcard(meshLoader.wildcardFilter())
-               if dlg.ShowModal() == wx.ID_OK:
-                       self.filelist = [dlg.GetPath()]
-                       profile.putPreference('lastFile', ';'.join(self.filelist))
-                       self.preview3d.loadModelFiles(self.filelist, True)
-                       self.preview3d.setViewMode("Normal")
-               dlg.Destroy()
-
-       def OnDropFiles(self, filenames):
-               self.filelist = filenames
-               profile.putPreference('lastFile', ';'.join(self.filelist))
-               self.preview3d.loadModelFiles(self.filelist, True)
-               self.preview3d.setViewMode("Normal")
-       
-       def OnSlice(self, e):
-               if len(self.filelist) < 1:
-                       wx.MessageBox('You need to load a file before you can prepare it.', 'Print error', wx.OK | wx.ICON_INFORMATION)
-                       return
+       def setupSlice(self):
                #save the current profile so we can put it back latter
                oldProfile = profile.getGlobalProfileString()
                
@@ -264,58 +155,12 @@ class simpleModeWindow(configBase.configWindowBase):
                        put('fan_layer', '1')
                        put('bottom_thickness', '0.0')
                        put('print_temperature', '260')
-               
-               #Create a progress panel and add it to the window. The progress panel will start the Skein operation.
-               spp = sliceProgessPanel.sliceProgessPanel(self, self, self.filelist)
-               self.sizer.Add(spp, (len(self.progressPanelList)+2,0), span=(1,4), flag=wx.EXPAND)
-               self.sizer.Layout()
-               newSize = self.GetSize();
-               newSize.IncBy(0, spp.GetSize().GetHeight())
-               if newSize.GetWidth() < wx.GetDisplaySize()[0]:
-                       self.SetSize(newSize)
-               self.progressPanelList.append(spp)
-               
-               #Restore the old profile.
-               profile.loadGlobalProfileFromString(oldProfile)
-       
-       def OnPrint(self, e):
-               if len(self.filelist) < 1:
-                       wx.MessageBox('You need to load a file and prepare it before you can print.', 'Print error', wx.OK | wx.ICON_INFORMATION)
-                       return
-               if not os.path.exists(sliceRun.getExportFilename(self.filelist[0])):
-                       wx.MessageBox('You need to prepare the file before you can print.', 'Print error', wx.OK | wx.ICON_INFORMATION)
-                       return
-               printWindow.printFile(sliceRun.getExportFilename(self.filelist[0]))
-
-       def OnNormalSwitch(self, e):
-               from gui import mainWindow
-               profile.putPreference('startMode', 'Normal')
-               mainWindow.mainWindow()
-               self.Close()
-
-       def removeSliceProgress(self, spp):
-               self.progressPanelList.remove(spp)
-               newSize = self.GetSize();
-               newSize.IncBy(0, -spp.GetSize().GetHeight())
-               if newSize.GetWidth() < wx.GetDisplaySize()[0]:
-                       self.SetSize(newSize)
-               spp.Show(False)
-               self.sizer.Detach(spp)
-               for spp in self.progressPanelList:
-                       self.sizer.Detach(spp)
-               i = 2
-               for spp in self.progressPanelList:
-                       self.sizer.Add(spp, (i,0), span=(1,4), flag=wx.EXPAND)
-                       i += 1
-               self.sizer.Layout()
-
-       def OnQuit(self, e):
-               self.Close()
-       
-       def OnClose(self, e):
-               self.Destroy()
+               put('plugin_config', '')
 
        def updateProfileToControls(self):
-               super(simpleModeWindow, self).updateProfileToControls()
-               self.preview3d.updateProfileToControls()
+               pass
 
+#      def OnNormalSwitch(self, e):
+#              profile.putPreference('startMode', 'Normal')
+#              mainWindow.mainWindow()
+#              self.Close()
diff --git a/Cura/gui/util/__init__.py b/Cura/gui/util/__init__.py
new file mode 100644 (file)
index 0000000..e69de29
index bb3c2b461d5c016a5355ee1892ee30c951faf2bb..8490de9a68f9a031f3465c513adf460b8b222f81 100644 (file)
@@ -9,15 +9,15 @@ class FileDropTarget(wx.FileDropTarget):
                self.callback = callback
                self.filenameFilter = filenameFilter
 
-       def OnDropFiles(self, x, y, filenames):
+       def OnDropFiles(self, x, y, files):
                filteredList = []
                if self.filenameFilter is not None:
-                       for f in filenames:
+                       for f in files:
                                for ext in self.filenameFilter:
                                        if f.endswith(ext) or f.endswith(ext.upper()):
                                                filteredList.append(f)
                else:
-                       filteredList = filenames
+                       filteredList = files
                if len(filteredList) > 0:
                        self.callback(filteredList)