Changeset d560a37 in sasview

Timestamp:

Jul 3, 2012 2:40:59 PM (12 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:

8f59e95

Parents:

e0405592

Message:

changed label of taps and plot default title, and fixed loading text data

Location:

sansguiframe/src/sans/guiframe

Files:

• data_processor.py (modified) (7 diffs)
• gui_manager.py (modified) (6 diffs)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -561 +561 @@
         self.AddPage(grid, "", True)
         pos = self.GetPageIndex(grid)
-        title = "Batch" + str(self.GetPageCount())
+        title = "Grid" + str(self.GetPageCount())
         self.SetPageText(pos, title)
         self.SetSelection(pos)
@@ -892 +892 @@
                     wx.PostEvent(self.parent.parent, StatusEvent(status=msg, 
                                                                 info="error"))
-                    time.sleep(0.5)
+                    #time.sleep(0.5)
                     continue
                 else:
@@ -915 +915 @@
                             wx.PostEvent(self.parent.parent, 
                                  StatusEvent(status=msg, info="error")) 
-                            time.sleep(0.5)
-                            continue
+                            return
+                            #continue
                         #new_plot.name =  title + ': ' + new_plot.title
                         if issubclass(new_plot.__class__, Data1D):
@@ -935 +935 @@
                                                  StatusEvent(status=msg,
                                                               info="error"))
-                                    time.sleep(0.5) 
-                                    continue  
+                                    #time.sleep(0.5) 
+                                    return
+                                    #continue  
                         """
                         wx.PostEvent(self.parent.parent, 
@@ -958 +959 @@
                     wx.PostEvent(self.parent.parent, 
                          StatusEvent(status=msg, info="error")) 
-                    time.sleep(0.5)
-                    continue
+                    #time.sleep(0.5)
+                    return
+                    #continue
     
         
@@ -1040 +1042 @@
         new_plot.id =  wx.NewId()
         new_plot.group_id = wx.NewId()
-        title = "%s vs %s" % (self.y_axis_title.GetValue(), 
-                              self.x_axis_title.GetValue())
-        new_plot.xaxis(self.x_axis_title.GetValue(), 
+        y_title = self.y_axis_title.GetValue()
+        x_title = self.x_axis_title.GetValue()
+        title = "%s_vs_%s" % (y_title, 
+                              x_title)
+        new_plot.xaxis(x_title, 
                        self.x_axis_unit.GetValue())
-        new_plot.yaxis(self.y_axis_title.GetValue(), 
+        new_plot.yaxis(y_title, 
                        self.y_axis_unit.GetValue())
         try:
-            title = self.notebook.GetPageText(pos)
+            title = y_title.strip()
+            title += self.notebook.GetPageText(pos)
             new_plot.name = title
             new_plot.xtransform = "x"
             new_plot.ytransform  = "y"  
+            #new_plot.is_data = False
             wx.PostEvent(self.parent.parent, 
                         NewPlotEvent(plot=new_plot, 
@@ -1216 +1222 @@
 class GridFrame(wx.Frame):
     def __init__(self, parent=None, data_inputs=None, data_outputs=None, id=-1, 
-                 title="Batch Window", size=(800, 500)):
+                 title="Grid Window", size=(800, 500)):
         wx.Frame.__init__(self, parent=parent, id=id, title=title, size=size)
         self.parent = parent

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -372 +372 @@
                                   details=details,
                                   file_name=file_name)
-        self.batch_frame.Show(True)
+        self.show_batch_frame(None)
         
     def on_read_batch_tofile(self, event):
@@ -403 +403 @@
         fd = open(file_name, 'r')
         _, ext = os.path.splitext(file_name)
-        separator = "\t"
+        separator = None
         if ext.lower() == ".csv":
             separator = ","
@@ -414 +414 @@
         for index in range(len(lines)):
             line = lines[index]
+            line.strip()
             count = 0
-            if line.find(separator) != -1:
+            if separator == None:
+                line.replace('\t', ' ')
+                #found the first line containing the label
+                col_name_toks = line.split()
+                for item in col_name_toks:
+                    if item.strip() != "":
+                        count += 1
+                    else:
+                        line = " "
+            elif line.find(separator) != -1:
                 if line.count(separator) >= 2:
                     #found the first line containing the label
@@ -430 +440 @@
         if column_names_line.strip() == "" or index is None:
             return 
+
         col_name_toks = column_names_line.split(separator)
         c_index = 0
@@ -439 +450 @@
                 c_index += 1
                 
-      
         self.open_with_localapp(data_outputs=data, data_inputs=None,
                                 file_name=file_name, details=details)
@@ -1342 +1352 @@
         id = wx.NewId()
         hint = "Display batch results into a grid"
-        self._view_menu.Append(id, '&Show Batch Results', hint) 
+        self._view_menu.Append(id, '&Show Grid Window', hint) 
         wx.EVT_MENU(self, id, self.show_batch_frame)