Changeset c9ecd1b in sasview for src/sas

Timestamp:

Sep 8, 2017 11:22:46 AM (7 years ago)

Author:

krzywon

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

cd57c7d4

Parents:

b682c6a

Message:

Comment NXcanSAS reader and remove unused variable from fitpanel.

Location:

src/sas

Files:

• sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (2 diffs)
• sasgui/perspectives/fitting/fitpanel.py (modified) (1 diff)

src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py

@@ -126 +126 @@
 
             if isinstance(value, h5py.Group):
-                parent_class = class_name
+                # Set parent class before recursion
                 self.parent_class = class_name
                 parent_list.append(key)
@@ -137 +137 @@
                 # Recursion step to access data within the group
                 self.read_children(value, parent_list)
-                self.parent_class = parent_class
+                # Reset parent class when returning from recursive method
+                self.parent_class = class_name
                 self.add_intermediate()
                 parent_list.remove(key)

src/sas/sasgui/perspectives/fitting/fitpanel.py

@@ -407 +407 @@
                     self.SetSelection(pos)
                     self.on_close_page(event=None)
-                    temp = self.GetSelection()
                     self.DeletePage(pos)
                     self.sim_page = None