Changeset 59732573 in sasview for src/sas/sasgui/perspectives/calculator

Timestamp:

Mar 18, 2018 2:08:09 PM (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:

85d98e2

Parents:

943e17a (diff), 0f0fe42 (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:

Paul Butler <butlerpd@…> (03/18/18 14:08:09)

git-committer:

GitHub <noreply@…> (03/18/18 14:08:09)

Message:

Merge pull request #146 from SasView?/ticket-1052

Ticket 1052: Allow custom models to be used in sum|multi models

closes #1052

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)