Changeset d560a37 in sasview for sansguiframe/src/sans/guiframe/gui_manager.py

Timestamp:

Jul 3, 2012 4: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

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (6 diffs)

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)