Changeset 3641881 in sasview for invariantview

Timestamp:

Jul 27, 2010 9:24:22 AM (14 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:

aa5617d

Parents:

9c1f463

Message:

working on combobbox of data

File:

• invariantview/perspectives/invariant/invariant_panel.py (modified) (5 diffs)

invariantview/perspectives/invariant/invariant_panel.py

@@ -167 +167 @@
             data_qmin = min (self._data.x)
             data_qmax = max (self._data.x)
-            self.data_name_tcl.SetValue(str(data_name))      
+            if data.name not in self.data_cbbox.GetItems():
+                self.data_cbbox.Insert(pos=0, clientData=(data, None), 
+                                       item=data.name)
+            else:
+                pos = self.data_cbbox.FindString(data.name)
+                print "pos", pos
+                self.data_cbbox.SetSelection(pos)
             self.data_min_tcl.SetLabel(str(data_qmin))
             self.data_max_tcl.SetLabel(str(data_qmax))
@@ -679 +685 @@
             current_compute_num = str(current_state['compute_num'])
         except :
-            raise ValueError,  "No such state exists in history"
+            raise
+            #raise ValueError,  "No such state exists in history"
         
         # get the state at pre_compute_num
@@ -1179 +1186 @@
         self.hint_msg_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.loaded_data_name_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.data_name_sizer = wx.BoxSizer(wx.HORIZONTAL)
+       
         self.data_range_sizer = wx.BoxSizer(wx.HORIZONTAL)
         #Sizer related to background and scale
@@ -1225 +1232 @@
         self.hint_msg_sizer.Add(self.hint_msg_txt)
         
-        self.data_txt = wx.StaticText(self, -1,"Loaded Data: ")
-        self.data_cbbox = wx.ComboBox(self, -1, size=(260,20))
+        self.data_txt = wx.StaticText(self, -1,"Data: ")
+        self.data_cbbox = wx.ComboBox(self, -1, size=(260,20),
+                                      style=wx.CB_READONLY)
         self.data_cbbox.Disable()
         wx.EVT_COMBOBOX(self.data_cbbox ,-1, self.on_select_data) 
-        
-
-        #Data name [string]
-        data_name_txt = wx.StaticText(self, -1, 'Data : ')  
-       
-        self.data_name_tcl = OutputTextCtrl(self, -1,size=(260,20), style=0, name='data_name_tcl') 
-        self.data_name_tcl.SetToolTipString("Data's name.")
+    
         self.loaded_data_name_sizer.AddMany([(self.data_txt, 0,
                                                wx.LEFT|wx.RIGHT, 10),
                                       (self.data_cbbox, 0, wx.EXPAND)])
-        self.data_name_sizer.AddMany([(data_name_txt, 0, wx.LEFT|wx.RIGHT, 10),
-                                       (self.data_name_tcl, 0, wx.EXPAND|wx.LEFT,35)])
-    
         #Data range [string]
         data_range_txt = wx.StaticText(self, -1, 'Total Q Range (1/A): ') 
@@ -1257 +1256 @@
         self.data_name_boxsizer.AddMany([(self.hint_msg_sizer, 0 , wx.ALL, 5),
                             (self.loaded_data_name_sizer, 0 , wx.ALL, 10),
-                                    (self.data_name_sizer, 0 , wx.LEFT|wx.RIGHT, 10),
                                      (self.data_range_sizer, 0 , wx.ALL, 10)])