Changeset b09aee8 in sasview for src/sas/sasgui/perspectives/calculator/model_editor.py

Timestamp:

Mar 20, 2018 10:13:51 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

2a24d55, 0863065, fc25457, c16172d, 3b37edc

Parents:

85d98e2 (diff), 39a018b (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@…> (03/20/18 10:13:51)

git-committer:

GitHub <noreply@…> (03/20/18 10:13:51)

Message:

Merge pull request #147 from llimeht/tmp/missing-test-resource

Fix finding of test resource

File:

• src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (2 diffs)

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -391 +391 @@
         self._msg_box.SetLabel(msg)
         self._msg_box.SetForegroundColour(color)
+        self._set_model_list()
         if self.parent.parent is not None:
             from sas.sasgui.guiframe.events import StatusEvent
@@ -432 +433 @@
         if len(main_list) > 1:
             main_list.sort()
+        self.model1.Clear()
+        self.model2.Clear()
         for idx in range(len(main_list)):
             self.model1.Append(str(main_list[idx]), idx)