Changeset 61f329f0 in sasview for src/sas/sascalc/dataloader/file_reader_base_class.py

Timestamp:

Oct 25, 2017 3:46:56 AM (7 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fe15198

Parents:

5582b078

Message:

Reset file reader class data state each time a new data file is loaded.

File:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (2 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -54 +54 @@
         :param filepath: The full or relative path to a file to be loaded
         """
+        self.reset_state()
         if os.path.isfile(filepath):
             basename, extension = os.path.splitext(os.path.basename(filepath))
@@ -86 +87 @@
         # Return a list of parsed entries that data_loader can manage
         return self.output
+
+    def reset_state(self):
+        """
+        Resets the class state to a base case when loading a new data file so previous
+        data files do not appear a second time
+        """
+        self.current_datainfo = None
+        self.current_dataset = None
+        self.output = []
 
     def nextline(self):