Changeset 3331e11 in sasview for src/sas

Timestamp:

Jul 14, 2016 7:01:17 AM (8 years ago)

Author:

lewis

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

Children:

af84162

Parents:

8b633dd

Message:

Fix bug when convert button clicked for a 2nd time after changing metadata

File:

• src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) (1 diff)

src/sas/sasgui/perspectives/file_converter/converter_panel.py

@@ -111 +111 @@
             run = self.metadata['run']
             run_name = self.metadata['run_name']
-            self.metadata['run'] = [run]
-            if run_name is not None:
-                self.metadata['run_name'] = { run: run_name }
+
+            if not isinstance(run, list) and run is not None:
+                self.metadata['run'] = [run]
             else:
-                self.metadata['run_name'] = {}
+                run = run[0]
+
+            if not isinstance(run_name, dict):
+                if run_name is not None:
+                    self.metadata['run_name'] = { run: run_name }
+                else:
+                    self.metadata['run_name'] = {}
+            else:
+                self.metadata['run_name'][run] = run_name.values()[0]
         else:
             self.metadata['run'] = []
             self.metadata['run_name'] = {}
-        detector = self.metadata['detector'][0]
-        if detector.name is None:
+        if self.metadata['detector'][0].name is None:
             self.metadata['detector'][0].name = ''