Changeset d318616 in sasview for invariantview/perspectives/invariant

Timestamp:

Jul 27, 2010 11:36:25 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:

0881f51

Parents:

51fb7ab

Message:

hoped fixed mal-behavior of loading into the panel

Location:

invariantview/perspectives/invariant

Files:

• invariant.py (modified) (1 diff)
• invariant_panel.py (modified) (4 diffs)

invariantview/perspectives/invariant/invariant.py

@@ -287 +287 @@
             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.is_state_data = True            
+                       
 
         except:

invariantview/perspectives/invariant/invariant_panel.py

@@ -82 +82 @@
         self.new_state = False
         self.is_power_out = False
+        self.is_state_data = False
 
         #container of invariant value
@@ -117 +118 @@
         """
         """
+        
         n = self.data_cbbox.GetCurrentSelection()
-        data, path = self.data_cbbox.GetClientData(n)
-        self._manager.compute_helper(data=data)
-       
+        try:
+            data, path = self.data_cbbox.GetClientData(n)
+        
+            if not self._data == data:
+                self._manager.compute_helper(data=data)
+            else:
+                msg = "The data named %s is already loaded..."% data.name
+                wx.PostEvent(self.parent, StatusEvent(status=msg))
+        except:
+           self.data_cbbox.SetSelection(0)
     
     def set_data(self, list=[], state=None):
@@ -128 +137 @@
         if not list:
             return 
+        count_bf = self.data_cbbox.GetCount()
         for data, path in list:
             if data.__class__.__name__ != "Data2D" and \
                 data.name not in self.data_cbbox.GetItems():
-                self.data_cbbox.Insert(item=data.name, pos=0,
+                position = self.data_cbbox.GetCount()
+                self.data_cbbox.Insert(item=data.name, pos=position,
                                     clientData=(data, path))
-        if self.data_cbbox.GetCount() >0:
-            self.data_cbbox.SetSelection(0)
-            self.data_cbbox.Enable()
-            self.on_select_data(event=None)
+        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:
+                # when count increased especially if self.is_state_data.
+                if count > count_bf:
+                    self.data_cbbox.SetSelection(count-1)
+
+                self.data_cbbox.Enable()
+                self.on_select_data(event=None)
+                self.is_state_data = False
+            
             title = "Untitled"
             if hasattr(data,"title"):
@@ -144 +163 @@
             else:
                 title = str(data.name)
-
+    
             wx.PostEvent(self.parent, NewPlotEvent(plot=data, title=title))