Changeset 94667e27 in sasview for src/sas/sasgui/perspectives/file_converter

Timestamp:

Aug 9, 2016 9:36:23 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:

785fa53

Parents:

0e11ec7

Message:

Fix error when loading in converted CanSAS files

File:

• src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) (3 diffs)

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

@@ -69 +69 @@
 
         # Metadata values
-        self.title = None
-        self.run = None
-        self.run_name = None
-        self.instrument = None
+        self.title = ''
+        self.run = ''
+        self.run_name = ''
+        self.instrument = ''
         self.detector = Detector()
         self.sample = Sample()
@@ -99 +99 @@
         writer = CansasWriter()
         entry_attrs = None
-        if self.run_name is not None:
+        if self.run_name != '':
             entry_attrs = { 'name': self.run_name }
 
@@ -504 +504 @@
         value = textbox.GetValue().strip()
 
-        if value == '': value = None
-
         setattr(self, attr, value)