Changeset 8d0ec40 in sasview

Timestamp:

Sep 6, 2012 4:37:54 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:

65261207

Parents:

7034fc0

Message:

batch window: distinguishes non-numeric/empty cells in hightlighed cells

Files:

• calculatorview/src/sans/perspectives/calculator/model_editor.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/data_processor.py (modified) (6 diffs)

calculatorview/src/sans/perspectives/calculator/model_editor.py

@@ -778 +778 @@
             try:
                 # try to remove pyc file if exists
-                #_deleteFile(self.fname)
+                _deleteFile(self.fname)
                 _deleteFile(self.fname + "c")
             except:

sansguiframe/src/sans/guiframe/data_processor.py

@@ -682 +682 @@
                 
             # Finally check the highlighted cell if any cells missing
-            self.get_highlighted_row()
+            self.get_highlighted_row(True)
         else:
             msg = "No item selected.\n"
@@ -689 +689 @@
         return grid.selected_cells
        
-    def get_highlighted_row(self):
+    def get_highlighted_row(self, is_number=True):
         """
         Add highlight rows
@@ -700 +700 @@
             if grid.IsInSelection(row, col):
                 cel = (row, col)
-                if row < 1:
+                if row < 1 and not is_number:
                     continue
-                if not grid.GetCellValue(row, col):
+                # empty cell
+                if not grid.GetCellValue(row, col).lstrip().rstrip():
+                    if cel in grid.selected_cells:
+                        grid.selected_cells.remove(cel)
                     continue
+                if is_number:
+                    try: 
+                        float(grid.GetCellValue(row, col))
+                    except:
+                        # non numeric cell
+                        if cel in grid.selected_cells:
+                            grid.selected_cells.remove(cel)
+                        continue
                 if cel not in grid.selected_cells:
                     grid.selected_cells.append(cel)
@@ -970 +981 @@
         grid = self.notebook.GetPage(pos)
         title = self.notebook.GetPageText(pos)
-        self.notebook.get_highlighted_row()
+        self.notebook.get_highlighted_row(False)
         if len(grid.selected_cells) == 0:
             msg = "Highlight a Data or Chi2 column first..."
@@ -1280 +1291 @@
         try:
             cell_list = self.notebook.on_edit_axis()
+            label, title = self.create_axis_label(cell_list)
         except:
             msg = str(sys.exc_value)
@@ -1285 +1297 @@
                              StatusEvent(status=msg, info="error")) 
             return 
-        label, title = self.create_axis_label(cell_list)
         tcrtl = event.GetEventObject()
         if tcrtl == self.x_axis_add: