Changeset eb38181 in sasview

Timestamp:

Aug 24, 2016 12:12:33 PM (8 years ago)

Author:

GitHub <noreply@…>

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

Children:

a756755

Parents:

e9f8208 (diff), cb93b40 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Andrew Jackson <andrew.jackson@…> (08/24/16 12:12:33)

git-committer:

GitHub <noreply@…> (08/24/16 12:12:33)

Message:

Merge pull request #9 from lewisodriscoll/master

Load invariant state correctly (fixes #615)

Location:

src/sas/sasgui/perspectives/invariant

Files:

• invariant_panel.py (modified) (3 diffs)
• invariant_state.py (modified) (2 diffs)

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

@@ -250 +250 @@
 
             num = self.state.saved_state['state_num']
-            if num > 0:
+            if int(num) > 0:
                 self._set_undo_flag(True)
-            if num < len(state.state_list) - 1:
+            if int(num) < len(state.state_list) - 1:
                 self._set_redo_flag(True)
 
@@ -1860 +1860 @@
                                    (self.button_calculate, 0,
                                     wx.RIGHT | wx.TOP | wx.BOTTOM, 10),
-                                   (self.button_help, 0, 
+                                   (self.button_help, 0,
                                     wx.RIGHT | wx.TOP | wx.BOTTOM, 10),])
     def _do_layout(self):
@@ -1882 +1882 @@
         self.SetSizer(self.main_sizer)
         self.SetAutoLayout(True)
-        
+
     def on_help(self, event):
         """
-        Bring up the Invariant Documentation whenever the HELP button is 
+        Bring up the Invariant Documentation whenever the HELP button is
         clicked.
 

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

@@ -426 +426 @@
                         if input_field is not None:
                             temp_state[item] = val
-                            self.state_list[ind] = temp_state
+                            self.state_list[str(ind)] = temp_state
 
             # Parse current state (ie, saved_state)
@@ -790 +790 @@
             doc = state.toXML(datainfo.name, doc=doc, entry_node=sasentry)
         return doc
-