Changeset 20b228a0 in sasview

Timestamp:

Feb 14, 2011 3:13:15 PM (13 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:

982e953

Parents:

cb69775

Message:

add bookmark funtionality to toolbar

File:

• sansview/perspectives/fitting/basepage.py (modified) (6 diffs)

sansview/perspectives/fitting/basepage.py

@@ -13 +13 @@
 from sans.guiframe.events import PanelOnFocusEvent
 from sans.guiframe.events import StatusEvent
+from sans.guiframe.events import AppendBookmarkEvent
 import pagestate
 from pagestate import PageState
@@ -155 +156 @@
         self.popUpMenu.AppendItem(self._keep)
         self._keep.Enable(True)
+        self._set_bookmark_flag(False)
+        self._set_save_flag(False)
         wx.EVT_MENU(self, id, self.on_bookmark)
         self.popUpMenu.AppendSeparator()
@@ -168 +171 @@
         ## drawing Initial dispersion parameters sizer 
         self.set_dispers_sizer()
-        self._set_save_flag(True)
+        
         ## layout
         self.set_layout()
@@ -594 +597 @@
         Reset model state
         """
+        menu = event.GetEventObject()
         ## post help message for the selected model 
-        msg = self.popUpMenu.GetHelpString(event.GetId())
+        msg = menu.GetHelpString(event.GetId())
         msg +=" reloaded"
-        wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
-        
-        name= self.popUpMenu.GetLabel(event.GetId())
+        wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
+        
+        name = menu.GetLabel(event.GetId())
         self._on_select_model_helper()
         
@@ -626 +630 @@
         return new_state  
     
+    def _get_time_stamp(self):
+        """
+        return time and date stings
+        """
+        # date and time 
+        year, month, day,hour,minute,second,tda,ty,tm_isdst= time.localtime()
+        current_time= str(hour)+":"+str(minute)+":"+str(second)
+        current_date= str( month)+"/"+str(day)+"/"+str(year)
+        return current_time, current_date
+      
     def on_bookmark(self, event):
         """
@@ -638 +652 @@
         ##Add model state on context menu
         self.number_saved_state += 1
+        current_time, current_date = self._get_time_stamp()
         #name= self.model.name+"[%g]"%self.number_saved_state 
-        name= self.model.__class__.__name__+"[%g]"%self.number_saved_state 
+        name = "Fitting: %g]" % self.number_saved_state 
+        name += self.model.__class__.__name__ 
+        name += "bookmarked at %s on %s" % (current_time, current_date)
         self.saved_states[name]= new_state
         
         ## Add item in the context menu
-        
-        year, month, day,hour,minute,second,tda,ty,tm_isdst= time.localtime()
-        my_time= str(hour)+" : "+str(minute)+" : "+str(second)+" "
-        date= str( month)+"|"+str(day)+"|"+str(year)
-        msg=  "Model saved at %s on %s"%(my_time, date)
+        msg =  "Model saved at %s on %s"%(current_time, current_date)
          ## post help message for the selected model 
         msg +=" Saved! right click on this page to retrieve this model"
         wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
         
-        id = wx.NewId()
-        self.popUpMenu.Append(id,name,str(msg))
-        wx.EVT_MENU(self, id, self.onResetModel)
+        #id = wx.NewId()
+        #self.popUpMenu.Append(id,name,str(msg))
+        #wx.EVT_MENU(self, id, self.onResetModel)
+        wx.PostEvent(self.parent.parent, 
+                     AppendBookmarkEvent(title=name, 
+                                         hint=str(msg), handler=self.onResetModel))
         
     def old_on_bookmark(self, event):