Changeset 199cef2 in sasview

Timestamp:

Apr 8, 2010 7:48:55 AM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

a704bb5

Parents:

eed601e

Message:

remove unused import of fitpanel

Location:

theoryview/perspectives/theory

Files:

• model_panel.py (modified) (2 diffs)
• theory.py (modified) (1 diff)

theoryview/perspectives/theory/model_panel.py

@@ -605 +605 @@
                                         None,None, None, None,None])
                 self.orientation_params.append([None,item, ctl1,
-                                        None,None, None, None,None])
-                    
-        iy+=1
+                                        None,None, None, None,None])  
+        iy += 1
         
         #Display units text on panel
@@ -613 +612 @@
             self.text2_4.Show()
 
-      
         boxsizer1.Add(sizer)
         self.sizer3.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10)
         self.sizer3.Layout()
         self.SetScrollbars(20,20,25,65)
-    
- 
-
                 
-        
-class HelpWindow(wx.Frame):
-    def __init__(self, parent, id, title):
-        wx.Frame.__init__(self, parent, id, title, size=(570, 400))
-       
-        from sans.models.CylinderModel import CylinderModel
-        model = CylinderModel()
-        #from sans.models.LineModel import LineModel
-        #model = LineModel()
-        from fitpanel import PageInfo
-        myinfo = PageInfo(self,model)
-        from models import ModelList
-        mylist= ModelList()
-        
-        from sans.models.SphereModel import SphereModel
-        from sans.models.SquareWellStructure import SquareWellStructure
-        from sans.models.DebyeModel import DebyeModel
-        from sans.models.LineModel import LineModel
-        name= "shapes"
-        list1= [SphereModel]
-        mylist.set_list( name, list1)
-        
-        name= "Shape-independent"
-        list1= [DebyeModel]
-        mylist.set_list( name, list1)
-        
-        name= "Structure Factors"
-        list1= [SquareWellStructure]
-        mylist.set_list( name, list1)
-        
-        name= "Added models"
-        list1= [LineModel]
-        mylist.set_list( name, list1)
-        
-        myinfo.model_list_box = mylist.get_list()
-        
-        self.page = ModelPage(self, myinfo) 
-        
-        
-        
-        self.Centre()
-        self.Show(True)
-
-
-   
-if __name__=="__main__":
-    app = wx.App()
-    HelpWindow(None, -1, 'HelpWindow')
-    app.MainLoop()
-                

theoryview/perspectives/theory/theory.py

@@ -275 +275 @@
             
         except:
-            raise
-            #msg= " Error occurred when drawing %s Model 1D: "%model.name
-            #msg+= " %s"%sys.exc_value
-            #wx.PostEvent( self.parent, StatusEvent(status= msg ))
-            #return  
-        
+            msg = " Error occurred when drawing %s Model 1D: "%model.name
+            msg += " %s"%sys.exc_value
+            wx.PostEvent(self.parent, StatusEvent(status=msg))
+            
     def _update1D(self,x, output):
         """