Changeset 051e22f in sasview

Timestamp:

May 3, 2010 4:37:52 PM (15 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:

0c0d458

Parents:

67ffb10

Message:

working on data loader

File:

• calculatorview/perspectives/calculator/data_editor.py (modified) (11 diffs)

calculatorview/perspectives/calculator/data_editor.py

@@ -125 +125 @@
         data_run_txt = wx.StaticText(self, -1, 'Run : ') 
         data_run_txt.SetToolTipString('') 
-        self.data_run_tcl = wx.TextCtrl(self, -1, size=(PANEL_WIDTH*3/5, -1)) 
-        self.data_run_tcl.Bind(wx.EVT_TEXT_ENTER, self.on_change_run)
+        self.data_run_tcl = wx.TextCtrl(self, -1, size=(PANEL_WIDTH*3/5, -1), style=wx.TE_MULTILINE)
         hint_run = "Data's run."
         self.data_run_tcl.SetToolTipString(hint_run)
@@ -254 +253 @@
         self.data_cbox.Clear()
         for data in self._data:
-            pos = self.data_cbox.Append(str(data.filename))
+            name = data.title
+            if data.run:
+                name = data.run[0]
+            if name.lstrip().rstrip() =="":
+                name = data.filename
+            pos = self.data_cbox.Append(str(name))
             self.data_cbox.SetClientData(pos, data)
             self.data_cbox.SetSelection(pos)
-            self.data_cbox.SetStringSelection(str(data.filename)) 
-           
-            
+            self.data_cbox.SetStringSelection(str(name)) 
+       
     def reset_panel(self):
         """
         """
         self.enable_data_cbox()
+        self.data_title_tcl.SetValue("")
         self.data_run_tcl.SetValue("")
-        self.data_title_tcl.SetValue("")
         
     def on_select_data(self, event=None):
@@ -275 +278 @@
             return
         self.data_title_tcl.SetValue(str(data.title))
-        for item in data.run:
-            self.data_run_tcl.AppendText(str(item))
+        text = ""
+        if data.run:
+            for item in data.run:
+                text += item+"\n"
+        self.data_run_tcl.SetValue(str(text))
             
     def get_current_data(self):
         """
         """
-        if not self.data_cbox.IsEnabled():
-            return None, None, None
         position = self.data_cbox.GetSelection() 
         if position == wx.NOT_FOUND:
@@ -404 +408 @@
         dlg.ShowModal()
         
-    def choose_data_file(parent, location=None):
+    def choose_data_file(self, location=None):
         """
             Open a file dialog to allow loading a file
@@ -416 +420 @@
         wlist = '|'.join(cards)
         
-        dlg = wx.FileDialog(parent, "Choose a file", location, "", wlist, wx.OPEN)
+        dlg = wx.FileDialog(self, "Choose a file", location, "", wlist, wx.OPEN)
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
@@ -423 +427 @@
         return path
     
+    
     def complete_loading(self, data=None, filename=''):
         """
             Complete the loading and compute the slit size
         """
+        self.done = True
         self._data = []
         if data is None:
             msg = "Couldn't load data"
-            wx.PostEvent(self.parent.parent, StatusEvent(status=msg, type='stop'))
+            wx.PostEvent(self.parent.parent, StatusEvent(status=msg, info="warning",type='stop'))
             return 
         if not  data.__class__.__name__ == "list":
@@ -436 +442 @@
             self._reset_data.append(deepcopy(data))
         else:
-            self._data = data
+            self._data = deepcopy(data)
             self._reset_data = deepcopy(data)
-        # set data field
-        self.reset_panel()
         self.set_values()
-        
         if self.parent.parent is None:
             return 
         msg = "Load Complete"
-        wx.PostEvent(self.parent.parent, StatusEvent(status=msg, type='stop'))
+        wx.PostEvent(self.parent.parent, StatusEvent(status=msg,info="info",type='stop'))
   
     def set_values(self):
@@ -452 +455 @@
             through the panel
         """
-        if self._data == []:
-            return 
-        self.fill_data_combox()
-        self.on_select_data(event=None)
+        if self._data:
+            self.fill_data_combox()
+            self.on_select_data(event=None)
         
     def get_data(self):
@@ -473 +475 @@
             Change run
         """
-        data, data_name, position = self.get_current_data()
+        run = []
+        data, data_name, position = self.get_current_data()
+        for i in range(self.data_run_tcl.GetNumberOfLines()):
+            run.append(self.data_run_tcl.GetLineText(i).lstrip().rstrip())
         #Change data's name
-        run = self.data_run_tcl.GetValue().lstrip().rstrip()
-        if run == "":
-            run = []
+        #run = self.data_run_tcl.GetValue().lstrip().rstrip()
+       
         if data.run != run:
             self._notes += "Change data 's "
             self._notes += "run from %s to %s \n"%(data.run, str(run))
-            data.run = [run]
+            data.run = run
             
     def on_change_title(self, event=None):
@@ -502 +506 @@
         """
         path = self.choose_data_file(location=self._default_save_location)
-        
         if path is None:
             return 
+        if self.parent.parent is not None:
+            wx.PostEvent(self.parent.parent, StatusEvent(status="Loading...",info="info",
+                                type="progress"))
+        
+        self.done = False
         self._default_save_location = path
         try:
@@ -512 +520 @@
             if self.reader is not None and self.reader.isrunning():
                 self.reader.stop()
-            if self.parent.parent is not None:
-                wx.PostEvent(self.parent.parent, StatusEvent(status="Loading...",
-                                type="progress"))
             self.reader = DataReader(path=path,
                                     completefn=self.complete_loading,