Changeset e7b1ccf in sasview for sansview

Timestamp:

Jul 6, 2009 12:03:08 PM (15 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:

4331b05e

Parents:

ceb89ac

Message:

put the same width for txtcrtl

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• modelpage.py (modified) (1 diff)
• models.py (modified) (4 diffs)

sansview/perspectives/fitting/basepage.py

@@ -12 +12 @@
 (PreviousStateEvent, EVT_PREVIOUS_STATE)   = wx.lib.newevent.NewEvent()
 (NextStateEvent, EVT_NEXT_STATE)   = wx.lib.newevent.NewEvent()
-_BOX_WIDTH = 80
+_BOX_WIDTH = 76
 
 class BasicPage(wx.ScrolledWindow):

sansview/perspectives/fitting/modelpage.py

@@ -10 +10 @@
 from sans.guiframe.utils import format_number
 (ModelEventbox, EVT_MODEL_BOX) = wx.lib.newevent.NewEvent()
-_BOX_WIDTH = 80
+_BOX_WIDTH = 76
 
 import basepage

sansview/perspectives/fitting/models.py

@@ -1 +1 @@
 #TODO: add comments to document this module
 #TODO: clean-up the exception handling.
-#TODO: clean-up existing comments/documentation. 
-#      For example, the _getModelList method advertises 
-#      an 'id' parameter that is not part of the method's signature.
-#      It also advertises an ID as return value but it always returns zero.
+
 #TODO: clean-up the FractalAbsModel and PowerLawAbsModel menu items. Those
 #      model definitions do not belong here. They belong with the rest of the
@@ -16 +13 @@
 
 (ModelEvent, EVT_MODEL) = wx.lib.newevent.NewEvent()
-
+from sans.guicomm.events import StatusEvent  
 # Time is needed by the log method
 import time
@@ -114 +111 @@
             List of models we want to make available by default
             for this application
-            
-            @param id: first event ID to register the menu events with
+        
             @return: the next free event ID following the new menu events
         """
@@ -287 +283 @@
         if len(list1)>0:
             self.model_combobox.set_list(menuinfo[0],list1)
-              
+            
             for item in list1:
-                id = wx.NewId() 
-                struct_factor=item()
-                struct_name = struct_factor.__class__.__name__
-                if hasattr(struct_factor, "name"):
-                    struct_name = struct_factor.name
-                    
-                menuinfo[1].Append(int(id),struct_name,struct_name)
-                if not  item in self.struct_factor_dict.itervalues():
-                    self.struct_factor_dict[str(id)]= item
-                wx.EVT_MENU(self.event_owner, int(id), self._on_model)
+                try:
+                    id = wx.NewId() 
+                    struct_factor=item()
+                    struct_name = struct_factor.__class__.__name__
+                    if hasattr(struct_factor, "name"):
+                        struct_name = struct_factor.name
+                        
+                    menuinfo[1].Append(int(id),struct_name,struct_name)
+                    if not  item in self.struct_factor_dict.itervalues():
+                        self.struct_factor_dict[str(id)]= item
+                    wx.EVT_MENU(self.event_owner, int(id), self._on_model)
+                except:
+                    msg= "Error Occured: %s"%sys.exc_value
+                    wx.PostEvent(self.event_owner, StatusEvent(status=msg))
                 
         id = wx.NewId()