Changeset f24925ab in sasview

Timestamp:

Aug 1, 2010 12:32:53 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

d45e7e9

Parents:

0399c78

Message:

made better gui flow when loading data or state file

Location:

invariantview/perspectives/invariant

Files:

• invariant.py (modified) (4 diffs)
• invariant_panel.py (modified) (9 diffs)

invariantview/perspectives/invariant/invariant.py

@@ -47 +47 @@
         #  for your plug-in. This defines your plug-in "perspective"
         self.perspective = []
-        
-        # is this data from *.inv file?
-        self.is_state_data = False
         
         self.state_reader = None   
@@ -238 +235 @@
         if data is None:
             return 
-        if self.is_state_data:
-            self.is_state_data = False
-        else:
+        # set current data if not it's a state data
+        if not self.invariant_panel.is_state_data:
             # Store reference to data
             self.__data = data
@@ -253 +249 @@
         :param state: invariant state 
         """     
-        
         # Write the state to file
         # First, check that the data is of the right type
-
         current_plottable = self.__data
 
@@ -280 +274 @@
             self.__data.group_id = datainfo.filename
             self.__data.id = datainfo.filename
-            
+
             temp_state = copy.deepcopy(state)
-            
+            # set state
+            self.invariant_panel.is_state_data = True
             # Load the invariant states
             # Make sure the user sees the invariant panel after loading
             self.parent.set_perspective(self.perspective)
-            # set state
-            self.is_state_data = True 
-            self.invariant_panel.is_state_data = True
-            self.invariant_panel.set_state(state=temp_state,data=self.__data)
-                       
+            self.invariant_panel.set_state(state=temp_state,data=self.__data)         
 
         except:
             logging.error("invariant.set_state: %s" % sys.exc_value)
-        
-    
+
         
     def plot_theory(self, data=None, name=None):

invariantview/perspectives/invariant/invariant_panel.py

@@ -81 +81 @@
         # default flags for state
         self.new_state = False
+        self.is_state_data = False
         self.is_power_out = False
-        self.is_state_data = False
 
         #container of invariant value
@@ -117 +117 @@
     def on_select_data(self, event=None):
         """
-        On select data by combobox or contextmenu or by set_data
+        On select data by combobox or by set_data
         """
         if event !=None:
+            self.state
             n = self.data_cbbox.GetCurrentSelection()
+            self.data_cbbox.SetSelection(n)
             data, path = self.data_cbbox.GetClientData(n)
-            #warning message for losing all the calculation and states
             if self._data !=None:
-                if self._data.name != data.name:
-                    if self._show_message():
-                        self._manager.compute_helper(data=data)
-                        data = self._data
+                self._manager.compute_helper(data=data)
+                data = self._data
             return
         
@@ -149 +148 @@
             return 
 
-        count_bf = self.data_cbbox.GetCount()
+        #count_bf = self.data_cbbox.GetCount()
         for data, path in list:
             if data.__class__.__name__ != "Data2D" and \
@@ -158 +157 @@
                 
         count = self.data_cbbox.GetCount()
-        if count >0:
-            # set data only on the first or state data            
-            if count ==1 or self.is_state_data:
-                self.data_cbbox.Enable()
-                self._data = data
-                self.on_select_data(event=None)
-                self.is_state_data = False
-                
+        if count > 0:
+            self.data_cbbox.Enable()
+            # reset data (cb) only on the first data            
+            if count ==1:
+                try:
+                    #check if the data is from inv file
+                    self._data.meta_data['invstate'].file
+                except:
+                    self._data = data
+                    self.on_select_data(event=None)
+            
+    #data = self._data    
         title = "Untitled"
         if hasattr(data,"title"):
@@ -174 +177 @@
             title = str(data.name)
 
+        if self.is_state_data:
+            self.data_cbbox.SetValue(title)
+        self.data_cbbox.Enable(True)
+        self.is_state_data = False
+             
         wx.PostEvent(self.parent, NewPlotEvent(plot=data, title=title))
             
@@ -206 +214 @@
                                        item=data.name)
             else:
-                pos = self.data_cbbox.FindString(data.name)
-                self.data_cbbox.SetSelection(pos)
+                position = self.data_cbbox.FindString(data.name)
+            self.data_cbbox.SetSelection(position)
 
             self.data_min_tcl.SetLabel(str(data_qmin))
@@ -251 +259 @@
             self.state = IState()
         else:
+            self.new_state = True
             if not self.set_current_data(data, path=None):
                 return
-            self.new_state = True
             self.state = state   
             
@@ -282 +290 @@
             self.state.data = self._data
             self.new_state = False 
+            self.is_state_data = False
 
             
@@ -1174 +1183 @@
         Show warning message when resetting data
         """
+        # no message for now
+        return True
         count_bf = self.data_cbbox.GetCount()
         if count_bf > 1: