Changeset 51fb7ab in sasview for invariantview

Timestamp:

Jul 27, 2010 6:23:27 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:

d318616

Parents:

8898e963

Message:

fixed conflicts w/datamanager

Location:

invariantview/perspectives/invariant

Files:

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

invariantview/perspectives/invariant/invariant.py

@@ -280 +280 @@
             self.__data.group_id = datainfo.filename
             self.__data.id = datainfo.filename
-
+            
             temp_state = copy.deepcopy(state)
             

invariantview/perspectives/invariant/invariant_panel.py

@@ -120 +120 @@
         data, path = self.data_cbbox.GetClientData(n)
         self._manager.compute_helper(data=data)
-        title = "Untitled"
-        if hasattr(data,"title"):
-            title = str(data.title.lstrip().rstrip())
-            if title == "":
-                title = str(data.name)
-        else:
-            title = str(data.name)
-        wx.PostEvent(self.parent, NewPlotEvent(plot=data, title=title))
+       
     
     def set_data(self, list=[], state=None):
@@ -144 +137 @@
             self.data_cbbox.Enable()
             self.on_select_data(event=None)
-            
-    def set_current_data(self, data):
+            title = "Untitled"
+            if hasattr(data,"title"):
+                title = str(data.title.lstrip().rstrip())
+                if title == "":
+                    title = str(data.name)
+            else:
+                title = str(data.name)
+
+            wx.PostEvent(self.parent, NewPlotEvent(plot=data, title=title))
+            
+    def set_current_data(self, data, path=None):
         """
         Set the data
@@ -167 +169 @@
             data_qmin = min (self._data.x)
             data_qmax = max (self._data.x)
-            print "set_current_data",self.data_cbbox.GetCount()
+
             if data.name not in self.data_cbbox.GetItems():
                 self.data_cbbox.Insert(pos=0, clientData=(data, None), 
@@ -220 +222 @@
             self.new_state = True
             self.state = state   
-
+            
             num = self.state.saved_state['state_num']
             

invariantview/perspectives/invariant/invariant_state.py

@@ -91 +91 @@
         self.compute_num = 0
         self.state_num = 0
-        self.timestamp = "('00:00:00', '00/00/0000')"
+        self.timestamp = ('00:00:00', '00/00/0000')
         self.container = None
         #plot image