Changeset dbb3914 in sasview

Timestamp:

Jun 4, 2012 2:27:15 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:

7c720e9

Parents:

0320d36

Message:

fixing the pylint warnings

Files:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (3 diffs)
• sansguiframe/src/sans/guiframe/data_processor.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -627 +627 @@
             if self.state_index == 0 and len(self.mypanels) <= 0 \
             and self.sfile_ext == '.svs':
-                #TODO: Why was the following line left in the code
-                # if add_default_pages doesn't exist?
-                try:
-                    self.fit_panel.add_default_pages()
-                except:
-                    print sys.exc_value
                 self.temp_state = []
                 self.state_index = 0
@@ -2018 +2012 @@
         if data_copy.__class__.__name__ == "Data2D":
             if index == None:
-                index = numpy.ones(len(data_copy.data), ntype=bool)
+                index = numpy.ones(len(data_copy.data), dtype=bool)
             if weight != None:
                 data_copy.err_data = weight
@@ -2033 +2027 @@
             # 1 d theory from model_thread is only in the range of index
             if index == None: 
-                index = numpy.ones(len(data_copy.y), ntype=bool)
+                index = numpy.ones(len(data_copy.y), dtype=bool)
             if weight != None:
                 data_copy.dy = weight

sansguiframe/src/sans/guiframe/data_processor.py

@@ -766 +766 @@
         grid = self.GetPage(pos)
         grid.AppendCols(1, True)
+        
+    def on_remove_column(self):
+        """
+        Remove the selected column from the grid
+        """
+        pos = self.GetSelection()
+        grid = self.GetPage(pos)
+        grid.on_remove_column(event=None)
+        
         
 class GridPanel(SPanel):