Add information about which settings to ignore and to save.

Make load stl button functional.

diff --git a/SkeinPyPy_NewUI/fabmetheus_utilities/settings.py b/SkeinPyPy_NewUI/fabmetheus_utilities/settings.py
index ab7fb5bfb6dd8464bfc06186736f77b4e1f82fcc..0f24b3e971e62e5090b159210c2f885fd03cc33c 100644 (file)
--- a/SkeinPyPy_NewUI/fabmetheus_utilities/settings.py
+++ b/SkeinPyPy_NewUI/fabmetheus_utilities/settings.py
@@ -10,12 +10,308 @@ import __init__
 import ConfigParser
 import os
 
+def getSkeinPyPyConfigInformation():
+       return {
+               'carve': {
+                       'Add_Layer_Template_to_SVG': 'ignore',
+                       'Edge_Width_mm': 'ignore',
+                       'Extra_Decimal_Places_float': 'ignore',
+                       'Import_Coarseness_ratio': 'ignore',
+                       'Layer_Height_mm': 'save',
+                       'Layers_From_index': 'ignore',
+                       'Layers_To_index': 'ignore',
+                       'Correct_Mesh': 'ignore',
+                       'Unproven_Mesh': 'ignore',
+                       'SVG_Viewer': 'ignore',
+               },'scale': {
+                       'Activate_Scale': 'ignore',
+                       'XY_Plane_Scale_ratio': 'ignore',
+                       'Z_Axis_Scale_ratio': 'ignore',
+                       'SVG_Viewer': 'ignore',
+               },'bottom': {
+                       'Activate_Bottom': 'ignore',
+                       'Additional_Height_over_Layer_Thickness_ratio': 'ignore',
+                       'Altitude_mm': 'ignore',
+                       'SVG_Viewer': 'ignore',
+               },'preface': {
+                       'Meta': 'ignore',
+                       'Set_Positioning_to_Absolute': 'ignore',
+                       'Set_Units_to_Millimeters': 'ignore',
+                       'Start_at_Home': 'ignore',
+                       'Turn_Extruder_Off_at_Shut_Down': 'ignore',
+                       'Turn_Extruder_Off_at_Start_Up': 'ignore',
+               },'widen': {
+                       'Activate_Widen': 'save',
+               },'inset': {
+                       'Add_Custom_Code_for_Temperature_Reading': 'ignore',
+                       'Infill_in_Direction_of_Bridge': 'ignore',
+                       'Infill_Width_over_Thickness_ratio': 'ignore',
+                       'Loop_Order_Choice': 'ignore',
+                       'Overlap_Removal_Width_over_Perimeter_Width_ratio': 'ignore',
+                       'Turn_Extruder_Heater_Off_at_Shut_Down': 'ignore',
+                       'Volume_Fraction_ratio': 'ignore',
+               },'fill': {
+                       'Activate_Fill': 'save',
+                       'Diaphragm_Period_layers': 'save',
+                       'Diaphragm_Thickness_layers': 'save',
+                       'Extra_Shells_on_Alternating_Solid_Layer_layers': 'save',
+                       'Extra_Shells_on_Base_layers': 'save',
+                       'Extra_Shells_on_Sparse_Layer_layers': 'save',
+                       'Grid_Circle_Separation_over_Perimeter_Width_ratio': 'ignore',
+                       'Grid_Extra_Overlap_ratio': 'ignore',
+                       'Grid_Junction_Separation_Band_Height_layers': 'ignore',
+                       'Grid_Junction_Separation_over_Octogon_Radius_At_End_ratio': 'ignore',
+                       'Grid_Junction_Separation_over_Octogon_Radius_At_Middle_ratio': 'ignore',
+                       'Infill_Begin_Rotation_degrees': 'ignore',
+                       'Infill_Begin_Rotation_Repeat_layers': 'ignore',
+                       'Infill_Odd_Layer_Extra_Rotation_degrees': 'ignore',
+                       'Grid_Circular': 'ignore',
+                       'Grid_Hexagonal': 'ignore',
+                       'Grid_Rectangular': 'ignore',
+                       'Line': 'ignore',
+                       'Infill_Perimeter_Overlap_ratio': 'save',
+                       'Infill_Solidity_ratio': 'save',
+                       'Infill_Width': 'save',
+                       'Solid_Surface_Thickness_layers': 'save',
+                       'Start_From_Choice': 'ignore',
+                       'Surrounding_Angle_degrees': 'ignore',
+                       'Thread_Sequence_Choice': 'save',
+               },'multiply': {
+                       'Activate_Multiply': 'ignore',
+                       'Center_X_mm': 'save',
+                       'Center_Y_mm': 'save',
+                       'Number_of_Columns_integer': 'save',
+                       'Number_of_Rows_integer': 'save',
+                       'Reverse_Sequence_every_Odd_Layer': 'ignore',
+                       'Separation_over_Perimeter_Width_ratio': 'save',
+               },'speed': {
+                       'Activate_Speed': 'ignore',
+                       'Add_Flow_Rate': 'ignore',
+                       'Bridge_Feed_Rate_Multiplier_ratio': 'ignore',
+                       'Bridge_Flow_Rate_Multiplier_ratio': 'ignore',
+                       'Duty_Cyle_at_Beginning_portion': 'ignore',
+                       'Duty_Cyle_at_Ending_portion': 'ignore',
+                       'Feed_Rate_mm/s': 'save',
+                       'Flow_Rate_Setting_float': 'use:Feed_Rate_mm/s',
+                       'Object_First_Layer_Feed_Rate_Infill_Multiplier_ratio': 'save',
+                       'Object_First_Layer_Feed_Rate_Perimeter_Multiplier_ratio': 'use:Object_First_Layer_Feed_Rate_Infill_Multiplier_ratio',
+                       'Object_First_Layer_Feed_Rate_Travel_Multiplier_ratio': 'use:Object_First_Layer_Feed_Rate_Infill_Multiplier_ratio',
+                       'Object_First_Layer_Flow_Rate_Infill_Multiplier_ratio': 'use:Object_First_Layer_Feed_Rate_Infill_Multiplier_ratio',
+                       'Object_First_Layer_Flow_Rate_Perimeter_Multiplier_ratio': 'use:Object_First_Layer_Feed_Rate_Infill_Multiplier_ratio',
+                       'Object_First_Layers_Amount_Of_Layers_For_Speed_Change': 'save',
+                       'Orbital_Feed_Rate_over_Operating_Feed_Rate_ratio': 'ignore',
+                       'Maximum_Z_Feed_Rate_mm/s': 'save',
+                       'Perimeter_Feed_Rate_Multiplier_ratio': 'ignore',
+                       'Perimeter_Flow_Rate_Multiplier_ratio': 'ignore',
+                       'Travel_Feed_Rate_mm/s': 'save',
+               },'temperature': {
+                       'Activate_Temperature': 'ignore',
+                       'Cooling_Rate_Celcius/second': 'ignore',
+                       'Heating_Rate_Celcius/second': 'ignore',
+                       'Base_Temperature_Celcius': 'ignore',
+                       'Interface_Temperature_Celcius': 'ignore',
+                       'Object_First_Layer_Infill_Temperature_Celcius': 'ignore',
+                       'Object_First_Layer_Perimeter_Temperature_Celcius': 'ignore',
+                       'Object_Next_Layers_Temperature_Celcius': 'ignore',
+                       'Support_Layers_Temperature_Celcius': 'ignore',
+                       'Supported_Layers_Temperature_Celcius': 'ignore',
+               },'raft': {
+                       'Activate_Raft': 'ignore',
+                       'Add_Raft,_Elevate_Nozzle,_Orbit': 'ignore',
+                       'Base_Feed_Rate_Multiplier_ratio': 'ignore',
+                       'Base_Flow_Rate_Multiplier_ratio': 'ignore',
+                       'Base_Infill_Density_ratio': 'ignore',
+                       'Base_Layer_Thickness_over_Layer_Thickness': 'ignore',
+                       'Base_Layers_integer': 'ignore',
+                       'Base_Nozzle_Lift_over_Base_Layer_Thickness_ratio': 'ignore',
+                       'Initial_Circling': 'ignore',
+                       'Infill_Overhang_over_Extrusion_Width_ratio': 'ignore',
+                       'Interface_Feed_Rate_Multiplier_ratio': 'ignore',
+                       'Interface_Flow_Rate_Multiplier_ratio': 'ignore',
+                       'Interface_Infill_Density_ratio': 'ignore',
+                       'Interface_Layer_Thickness_over_Layer_Thickness': 'ignore',
+                       'Interface_Layers_integer': 'ignore',
+                       'Interface_Nozzle_Lift_over_Interface_Layer_Thickness_ratio': 'ignore',
+                       'Name_of_Support_End_File': 'ignore',
+                       'Name_of_Support_Start_File': 'ignore',
+                       'Operating_Nozzle_Lift_over_Layer_Thickness_ratio': 'ignore',
+                       'Raft_Additional_Margin_over_Length_%': 'ignore',
+                       'Raft_Margin_mm': 'ignore',
+                       'Support_Cross_Hatch': 'save',
+                       'Support_Flow_Rate_over_Operating_Flow_Rate_ratio': 'save',
+                       'Support_Gap_over_Perimeter_Extrusion_Width_ratio': 'save',
+                       'Support_Material_Choice_': 'save',
+                       'Support_Minimum_Angle_degrees': 'save',
+               },'skirt': {
+                       'Activate_Skirt': 'save',
+                       'Convex': 'ignore',
+                       'Gap_over_Perimeter_Width_ratio': 'save',
+                       'Layers_To_index': 'ignore',
+               },'chamber': {
+                       'Activate_Chamber': 'ignore',
+                       'Bed_Temperature_Celcius': 'ignore',
+                       'Bed_Temperature_Begin_Change_Height_mm': 'ignore',
+                       'Bed_Temperature_End_Change_Height_mm': 'ignore',
+                       'Bed_Temperature_End_Celcius': 'ignore',
+                       'Chamber_Temperature_Celcius': 'ignore',
+                       'Holding_Force_bar': 'ignore',
+               },'tower': {
+                       'Activate_Tower': 'ignore',
+                       'Extruder_Possible_Collision_Cone_Angle_degrees': 'ignore',
+                       'Maximum_Tower_Height_layers': 'ignore',
+                       'Tower_Start_Layer_integer': 'ignore',
+               },'jitter': {
+                       'Activate_Jitter': 'ignore',
+                       'Jitter_Over_Perimeter_Width_ratio': 'ignore',
+               },'clip': {
+                       'Activate_Clip': 'ignore',
+                       'Clip_Over_Perimeter_Width_ratio': 'ignore',
+                       'Maximum_Connection_Distance_Over_Perimeter_Width_ratio': 'ignore',
+               },'smooth': {
+                       'Activate_Smooth': 'ignore',
+                       'Layers_From_index': 'ignore',
+                       'Maximum_Shortening_over_Width_float': 'ignore',
+               },'stretch': {
+                       'Activate_Stretch': 'ignore',
+                       'Cross_Limit_Distance_Over_Perimeter_Width_ratio': 'ignore',
+                       'Loop_Stretch_Over_Perimeter_Width_ratio': 'ignore',
+                       'Path_Stretch_Over_Perimeter_Width_ratio': 'ignore',
+                       'Perimeter_Inside_Stretch_Over_Perimeter_Width_ratio': 'ignore',
+                       'Perimeter_Outside_Stretch_Over_Perimeter_Width_ratio': 'ignore',
+                       'Stretch_From_Distance_Over_Perimeter_Width_ratio': 'ignore',
+               },'skin': {
+                       'Activate_Skin': 'ignore',
+                       'Horizontal_Infill_Divisions_integer': 'ignore',
+                       'Horizontal_Perimeter_Divisions_integer': 'ignore',
+                       'Vertical_Divisions_integer': 'ignore',
+                       'Hop_When_Extruding_Infill': 'ignore',
+                       'Layers_From_index': 'ignore',
+               },'comb': {
+                       'Activate_Comb': 'ignore',
+                       'Running_Jump_Space_mm': 'ignore',
+               },'cool': {
+                       'Activate_Cool': 'save',
+                       'Bridge_Cool_Celcius': 'ignore',
+                       'Cool_Type': 'save',
+                       'Maximum_Cool_Celcius': 'ignore',
+                       'Minimum_Layer_Time_seconds': 'save',
+                       'Minimum_Orbital_Radius_millimeters': 'ignore',
+                       'Name_of_Cool_End_File': 'ignore',
+                       'Name_of_Cool_Start_File': 'ignore',
+                       'Orbital_Outset_millimeters': 'ignore',
+                       'Turn_Fan_On_at_Beginning': 'ignore',
+                       'Turn_Fan_Off_at_Ending': 'ignore',
+               },'hop': {
+                       'Activate_Hop': 'ignore',
+                       'Hop_Over_Layer_Thickness_ratio': 'ignore',
+                       'Minimum_Hop_Angle_degrees': 'ignore',
+               },'wipe': {
+                       'Activate_Wipe': 'ignore',
+                       'Arrival_X_mm': 'ignore',
+                       'Arrival_Y_mm': 'ignore',
+                       'Arrival_Z_mm': 'ignore',
+                       'Departure_X_mm': 'ignore',
+                       'Departure_Y_mm': 'ignore',
+                       'Departure_Z_mm': 'ignore',
+                       'Wipe_X_mm': 'ignore',
+                       'Wipe_Y_mm': 'ignore',
+                       'Wipe_Z_mm': 'ignore',
+                       'Wipe_Period_layers': 'ignore',
+               },'oozebane': {
+                       'Activate_Oozebane': 'ignore',
+                       'After_Startup_Distance_millimeters': 'ignore',
+                       'Early_Shutdown_Distance_millimeters': 'ignore',
+                       'Early_Startup_Distance_Constant_millimeters': 'ignore',
+                       'Early_Startup_Maximum_Distance_millimeters': 'ignore',
+                       'First_Early_Startup_Distance_millimeters': 'ignore',
+                       'Minimum_Distance_for_Early_Startup_millimeters': 'ignore',
+                       'Minimum_Distance_for_Early_Shutdown_millimeters': 'ignore',
+                       'Slowdown_Startup_Steps_positive_integer': 'ignore',
+               },'dwindle': {
+                       'Activate_Dwindle': 'ignore',
+                       'End_Rate_Multiplier_ratio': 'ignore',
+                       'Pent_Up_Volume_cubic_millimeters': 'ignore',
+                       'Slowdown_Steps_positive_integer': 'ignore',
+                       'Slowdown_Volume_cubic_millimeters': 'ignore',
+               },'splodge': {
+                       'Activate_Splodge': 'ignore',
+                       'Initial_Lift_over_Extra_Thickness_ratio': 'ignore',
+                       'Initial_Splodge_Feed_Rate_mm/s': 'ignore',
+                       'Operating_Splodge_Feed_Rate_mm/s': 'ignore',
+                       'Operating_Splodge_Quantity_Length_millimeters': 'ignore',
+                       'Initial_Splodge_Quantity_Length_millimeters': 'ignore',
+                       'Operating_Lift_over_Extra_Thickness_ratio': 'ignore',
+               },'home': {
+                       'Activate_Home': 'ignore',
+                       'Name_of_Home_File': 'ignore',
+               },'lash': {
+                       'Activate_Lash': 'ignore',
+                       'X_Backlash_mm': 'ignore',
+                       'Y_Backlash_mm': 'ignore',
+               },'fillet': {
+                       'Activate_Fillet': 'ignore',
+                       'Arc_Point': 'ignore',
+                       'Arc_Radius': 'ignore',
+                       'Arc_Segment': 'ignore',
+                       'Bevel': 'ignore',
+                       'Corner_Feed_Rate_Multiplier_ratio': 'ignore',
+                       'Fillet_Radius_over_Perimeter_Width_ratio': 'ignore',
+                       'Reversal_Slowdown_Distance_over_Perimeter_Width_ratio': 'ignore',
+                       'Use_Intermediate_Feed_Rate_in_Corners': 'ignore',
+               },'limit': {
+                       'Activate_Limit': 'ignore',
+                       'Maximum_Initial_Feed_Rate_mm/s': 'ignore',
+               },'unpause': {
+                       'Activate_Unpause': 'ignore',
+                       'Delay_milliseconds': 'ignore',
+                       'Maximum_Speed_ratio': 'ignore',
+               },'dimension': {
+                       'Activate_Dimension': 'ignore',
+                       'Absolute_Extrusion_Distance': 'ignore',
+                       'Relative_Extrusion_Distance': 'ignore',
+                       'Extruder_Retraction_Speed_mm/s': 'save',
+                       'Filament_Diameter_mm': 'save',
+                       'Filament_Packing_Density_ratio': 'save',
+                       'Maximum_E_Value_before_Reset_float': 'ignore',
+                       'Minimum_Travel_for_Retraction_millimeters': 'save',
+                       'Retract_Within_Island': 'save',
+                       'Retraction_Distance_millimeters': 'save',
+                       'Restart_Extra_Distance_millimeters': 'save',
+               },'alteration': {
+                       'Activate_Alteration': 'ignore',
+                       'Name_of_End_File': 'ignore',
+                       'Name_of_Start_File': 'ignore',
+                       'Remove_Redundant_Mcode': 'ignore',
+                       'Replace_Variable_with_Setting': 'ignore',
+               },'export': {
+                       'Activate_Export': 'ignore',
+                       'Add_Descriptive_Extension': 'ignore',
+                       'Add_Export_Suffix': 'ignore',
+                       'Add_Profile_Extension': 'ignore',
+                       'Add_Timestamp_Extension': 'ignore',
+                       'Also_Send_Output_To': 'ignore',
+                       'Analyze_Gcode': 'ignore',
+                       'Comment_Choice': 'ignore',
+                       'Do_Not_Change_Output': 'ignore',
+                       'binary_16_byte': 'ignore',
+                       'gcode_step': 'ignore',
+                       'gcode_time_segment': 'ignore',
+                       'gcode_small': 'ignore',
+                       'File_Extension': 'ignore',
+                       'Name_of_Replace_File': 'ignore',
+                       'Save_Penultimate_Gcode': 'ignore',
+               }
+       }
+
 def loadGlobalConfig(filename):
        "Read a configuration file as global config"
        global globalConfigParser
        globalConfigParser = ConfigParser.ConfigParser()
        globalConfigParser.read(filename)
 
+def saveGlobalConfig(filename):
+       globalConfigParser.write(open(filename, 'w'))
+
 def getDefaultConfigPath():
        return os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../current_config.ini"))
 
@@ -29,18 +325,39 @@ def getReadRepository(repository):
        if not globals().has_key('globalConfigParser'):
                loadGlobalConfig(getDefaultConfigPath())
        
+       info = getSkeinPyPyConfigInformation()
+       if not info.has_key(repository.name):
+               print "Warning: Plugin: " + repository.name + " missing from SkeinPyPy info"
+               return repository
+       info = info[repository.name]
+       if not type(info) is dict:
+               print "Ignoring plugin configuration: " + repository.name
+               return repository
+       
        #print('getReadRepository:', repository.name)
        for p in repository.preferences:
+               name = safeConfigName(p.name)
+               if not info.has_key(name):
+                       print "Setting: " + repository.name + ":" + name + " missing from SkeinPyPy info"
+                       continue
+               #ignore this setting, use the default, always
+               if info[name] == 'ignore':
+                       continue
+               #Load this setting from another value.
+               if info[name][0:4] == "use:":
+                       p.setValueToString(globalConfigParser.get(repository.name, info[name][4:]))
+                       continue
+               
                try:
-                       p.setValueToString(globalConfigParser.get(repository.name, safeConfigName(p.name)))
+                       p.setValueToString(globalConfigParser.get(repository.name, name))
                except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
                        #Value not in configuration, add it.
                        try:
                                globalConfigParser.add_section(repository.name)
                        except:
                                pass
-                       globalConfigParser.set(repository.name, safeConfigName(p.name), str(p.value))
-                       globalConfigParser.write(open(getDefaultConfigPath(), 'w'))
+                       globalConfigParser.set(repository.name, name, str(p.value))
+                       saveGlobalConfig(getDefaultConfigPath())
                #print "============" + str(p) + "|" + p.name + "|" + str(p.value) + "|" + str(type(p.value))
        return repository
 
@@ -53,6 +370,7 @@ def getAlterationFileLines(fileName):
        'Get the alteration file line and the text lines from the fileName in the alterations directories.'
        print ('getAlterationFileLines:', fileName)
        return []
+
 def getAlterationLines(fileName):
        print ('getAlterationLines:', fileName)
        return []

diff --git a/SkeinPyPy_NewUI/newui/mainWindow.py b/SkeinPyPy_NewUI/newui/mainWindow.py
index a74d7fe5c660d8fce2535d4396416b6ae7cd84c1..fdf9617452612d0d3f4ce824c89eb7e49ab9c84a 100644 (file)
--- a/SkeinPyPy_NewUI/newui/mainWindow.py
+++ b/SkeinPyPy_NewUI/newui/mainWindow.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 import __init__
 
-import wx
+import wx, os
 
 from newui import preview3d
 from fabmetheus_utilities import archive
@@ -19,7 +19,10 @@ class mainWindow(wx.Frame):
                super(mainWindow, self).__init__(None, title='SkeinPyPy')
                menubar = wx.MenuBar()
                fileMenu = wx.Menu()
+               fitem = fileMenu.Append(-1, 'Open Profile...', 'Open Profile...')
+               fitem = fileMenu.Append(-1, 'Save Profile...', 'Save Profile...')
                fitem = fileMenu.Append(wx.ID_EXIT, 'Quit', 'Quit application')
+               self.Bind(wx.EVT_MENU, self.OnQuit, fitem)
                menubar.Append(fileMenu, '&File')
                menubar.Append(wx.Menu(), 'Expert')
                self.SetMenuBar(menubar)
@@ -36,14 +39,19 @@ class mainWindow(wx.Frame):
 
                sizer = wx.GridBagSizer(2, 2)
                printConfig.SetSizer(sizer)
+               
+               skeinPyPySettingInfo = settings.getSkeinPyPyConfigInformation()
 
                for pluginName in plugins.keys():
                        box, configPanel = self.CreateGroup(printConfig, pluginName)
-                       sizer.Add(box, (sizer.GetRows(),0))
-                       sizer.SetRows(sizer.GetRows()+1)
                        
                        for pref in plugins[pluginName].preferences:
-                               self.AddSetting(configPanel, pref.name, wx.TextCtrl(configPanel, -1, str(pref)))
+                               if skeinPyPySettingInfo[pluginName][settings.safeConfigName(pref.name)] == 'save':
+                                       self.AddSetting(configPanel, pref.name, wx.TextCtrl(configPanel, -1, str(pref.value)))
+
+                       if configPanel.GetSizer().GetRows() > 0:
+                               sizer.Add(box, (sizer.GetRows(),0))
+                               sizer.SetRows(sizer.GetRows()+1)
                
                #self.AddSetting(generalConfig, "Speed (mm/s)", wx.TextCtrl(generalConfig, -1, "50.0"))
 
@@ -58,20 +66,20 @@ class mainWindow(wx.Frame):
                nb.AddPage(machineConfig, "Machine")
                nb.AddPage(wx.Panel(nb), "Start/End-GCode")
 
-               p3d = preview3d.myGLCanvas(p)
+               #Preview window, load and slice buttons.
+               self.preview3d = preview3d.myGLCanvas(p)
                
                loadButton = wx.Button(p, 1, 'Load STL')
+               self.Bind(wx.EVT_BUTTON, self.OnLoadSTL, loadButton)
                
                sizer = wx.GridBagSizer()
                sizer.Add(nb, (0,0), span=(2,1), flag=wx.EXPAND)
-               sizer.Add(p3d, (0,1), span=(1,1), flag=wx.EXPAND)
+               sizer.Add(self.preview3d, (0,1), span=(1,1), flag=wx.EXPAND)
                sizer.Add(loadButton, (1,1))
                sizer.AddGrowableCol(1)
                sizer.AddGrowableRow(0)
                p.SetSizer(sizer)
                
-               self.Bind(wx.EVT_MENU, self.OnQuit, fitem)
-
                self.SetSize((800, 400))
                self.Centre()
                self.Show(True)
@@ -93,6 +101,15 @@ class mainWindow(wx.Frame):
                sizer.Add(ctrl, (sizer.GetRows(),1), flag=wx.ALIGN_BOTTOM|wx.EXPAND)
                sizer.SetRows(sizer.GetRows()+1)
        
+       def OnLoadSTL(self, e):
+               dlg=wx.FileDialog(self, "Open file to print", style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
+               dlg.SetWildcard("OBJ, STL files (;*.stl;*.STL;*.obj;*.OBJ;)")
+               if dlg.ShowModal() == wx.ID_OK:
+                       self.filename=dlg.GetPath()
+                       if not(os.path.exists(self.filename)):
+                               return
+                       self.preview3d.loadFile(self.filename)
+       
        def OnQuit(self, e):
                self.Close()
 

diff --git a/SkeinPyPy_NewUI/newui/preview3d.py b/SkeinPyPy_NewUI/newui/preview3d.py
index 33ebb649179fe1feb846f4def2f6f26059cd47b5..0b86e113d8ba781c2b2ff0c66ca31a9d9f60e4c6 100644 (file)
--- a/SkeinPyPy_NewUI/newui/preview3d.py
+++ b/SkeinPyPy_NewUI/newui/preview3d.py
@@ -32,14 +32,14 @@ class myGLCanvas(GLCanvas):
        \r
        def loadFile(self, filename):\r
                self.triangleMesh = fabmetheus_interpret.getCarving(filename)\r
-               minZ = self.triangleMesh.getMinimumZ()\r
-               min = self.triangleMesh.getCarveCornerMinimum()\r
-               max = self.triangleMesh.getCarveCornerMaximum()\r
                self.moveModel()\r
                \r
-       def moveModel():\r
+       def moveModel(self):\r
                if self.triangleMesh == None:\r
                        return\r
+               minZ = self.triangleMesh.getMinimumZ()\r
+               min = self.triangleMesh.getCarveCornerMinimum()\r
+               max = self.triangleMesh.getCarveCornerMaximum()\r
                for v in self.triangleMesh.vertexes:\r
                        v.z -= minZ\r
                        v.x -= min.x + (max.x - min.x) / 2\r