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

Timestamp:

Nov 28, 2017 9:56:33 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, ticket885, unittest-saveload

Children:

b6b81a3, 19b5c886, fb7c816, 814ee32

Parents:

45bfe3f1 (diff), c926a97 (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 Kienzle <pkienzle@…> (11/28/17 09:56:33)

git-committer:

GitHub <noreply@…> (11/28/17 09:56:33)

Message:

Merge pull request #126 from SasView?/ticket-776-orientation

a

File:

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

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

@@ -338 +338 @@
             list_fnames = os.listdir(self.plugin_dir)
             # fake existing regular model name list
-            m_list = [model.name + ".py" for model in self.model_list]
+            m_list = [model + ".py" for model in self.model_list]
             list_fnames.append(m_list)
             if t_fname in list_fnames and title != mname:
@@ -344 +344 @@
                 msg = "Name exists already."
 
-        if self.good_name == False:
+        if not self.good_name:
             self.name_tcl.SetBackgroundColour('pink')
             info = 'Error'