Changeset 27976fd0 in sasview

Timestamp:

Apr 21, 2009 7:07:20 PM (16 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:

f99a6b1

Parents:

c09ac449

Message:

model description details

Location:

sansview

Files:

• perspectives/fitting/fitting.py (modified) (6 diffs)
• perspectives/fitting/modelpage.py (modified) (2 diffs)
• plugins/testmodel.py (modified) (1 diff)

sansview/perspectives/fitting/fitting.py

@@ -125 +125 @@
         self.fit_panel.set_model_list(self.menu_mng.get_model_list())
         owner.Bind(fitpage.EVT_MODEL_BOX,self._on_model_panel)
-        
-        #self.menu3= wx.Menu()
-        #id4 = wx.NewId()
-        
+      
         #create  menubar items
         return [(id, self.menu1, "Fitting"),
                 (id2, menu2, "Model")]
-        #return [(id, self.menu1, "Fitting"),
-        #        (id4,self.menu3,"Averagers"),
-        #        (id2, menu2, "Model")]
+       
     
     def on_add_sim_page(self, event):
@@ -448 +443 @@
                     current_pg= page
             except:
-                raise
-                return
-                #msg= "%s error: %s" % (engineType,sys.exc_value)
-                #wx.PostEvent(self.parent, StatusEvent(status= msg ))
-                #return 
+                msg= "%s error: %s" % (engineType,sys.exc_value)
+                wx.PostEvent(self.parent, StatusEvent(status= msg ))
+                return 
         #Do the simultaneous fit
         try:
@@ -483 +476 @@
             
         except:
-            raise
-            #msg= "%s error: %s" % (engineType,sys.exc_value)
-            #wx.PostEvent(self.parent, StatusEvent(status= msg ,type="stop"))
-            #return 
+            msg= "%s error: %s" % (engineType,sys.exc_value)
+            wx.PostEvent(self.parent, StatusEvent(status= msg ,type="stop"))
+            return 
               
               
@@ -570 +562 @@
             value.clear_model_param()
         except:
-            raise
+            msg= title +" error: %s" % sys.exc_value
+            wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
             return
-            #msg= title +" error: %s" % sys.exc_value
-            #wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop"))
-            #return
        
     def _onSelect(self,event):
@@ -658 +648 @@
                         wx.PostEvent(self.parent, StatusEvent(status="Page was already Created"))
                 except:
-                    raise
-                    #wx.PostEvent(self.parent, StatusEvent(status="Creating Fit page: %s"\
-                    #%sys.exc_value))
-                    #return
+                    wx.PostEvent(self.parent, StatusEvent(status="Creating Fit page: %s"\
+                    %sys.exc_value))
+                    return
+                
+                
     def _updateFit(self):
         """
@@ -712 +703 @@
             wx.PostEvent(self.parent, StatusEvent(status=" " , type="stop")) 
         except:
-            raise
-            #msg= "Single Fit completed but Following error occurred:%s"% sys.exc_value
-            #wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
-            #return
+            msg= "Single Fit completed but Following error occurred:%s"% sys.exc_value
+            wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
+            return
        
        

sansview/perspectives/fitting/modelpage.py

@@ -66 +66 @@
             
         else:
-            description=""
+            description="Model contains no description"
             if self.model!=None:
                 description = self.model.description
-                
+            if description.lstrip().rstrip() =="": 
+                description="Model contains no description"
             self.description = wx.StaticText( self,-1,str(description) )
             self.sizer_description.Add( self.description, 1, wx.EXPAND | wx.ALL, 10 )
@@ -403 +404 @@
         if frame.rhelp.HasAnchor(name):
             frame.rhelp.ScrollToAnchor(name)
+        else:
+           msg= "Model does not contains an available description "
+           msg +="Please.Search in the Help window"
+           wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+                     
             
             

sansview/plugins/testmodel.py

@@ -30 +30 @@
         self.details['B'] = ['', -1e16, 1e16]
         self.details['C'] = ['', -1e16, 1e16]
+        self.description = "F(x)=A+Bcos(2x)+Csin(2x) "
    
     def function(self, x = 0.0):