Changeset c911f34 in sasview for sansguiframe/src/sans

Timestamp:

Sep 12, 2011 4:50:43 PM (13 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:

2073eb7

Parents:

8523a1f2

Message:

working on data processor , allow plotting data

File:

• sansguiframe/src/sans/guiframe/data_processor.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -433 +433 @@
         grid = self.notebook.GetPage(pos)
         for row in list:
-            label = grid.GetCellValue(row - 1, col)
-            if label.strip() != "":
-                axis.append(float(label.strip()))
+            label = grid.GetCellValue(0, col)
+            value = grid.GetCellValue(row - 1, col).strip()
+            if value != "":
+                if label.lower().strip() == "data":
+                    axis.append(float(row - 1))
+                else:
+                    axis.append(float(value))
+            else:
+                axis.append(None) 
         return axis