Changeset db5294e in sasview for src/sas/sasgui/perspectives/invariant/invariant_state.py

Timestamp:

Nov 18, 2016 11:49:36 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, 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:

406644a

Parents:

8898558b

Message:

#795: Small fix to invariant to check for None type when loading values. Working toward loading rpa and coreshellellipsoid integration.

File:

• src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) (2 diffs)

src/sas/sasgui/perspectives/invariant/invariant_state.py

@@ -423 +423 @@
                     for item in DEFAULT_STATE:
                         input_field = get_content('ns:%s' % item, entry)
-                        val = str(input_field.text.strip())
+                        if input_field.text is not None:
+                            val = str(input_field.text.strip())
+                        else:
+                            val = ''
                         if input_field is not None:
                             temp_state[item] = val
@@ -433 +436 @@
                 for item in DEFAULT_STATE:
                     input_field = get_content('ns:%s' % item, entry)
-                    val = str(input_field.text.strip())
+                    if input_field.text is not None:
+                        val = str(input_field.text.strip())
+                    else:
+                        val = ''
                     if input_field is not None:
                         self.set_saved_state(name=item, value=val)