Changeset acde566 in sasview

Timestamp:

Nov 1, 2017 5:42:32 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:

8e5c36d

Parents:

eabdddf (diff), df4af9b (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:

Jeff Krzywon <krzywon@…> (11/01/17 05:42:32)

git-committer:

GitHub <noreply@…> (11/01/17 05:42:32)

Message:

Merge pull request #117 from SasView?/ticket1025

Fixes #1025

Files:

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

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

@@ -332 +332 @@
             msg = ("%s is not a valid Python name. Only alphanumeric \n" \
                    "and underscore allowed" % self.name)
-
+        
         #Now check if the name already exists
         if not self.overwrite_name and self.good_name:
@@ -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:

setup.py

@@ -428 +428 @@
     entry_points={
         'console_scripts': [
-            "sasview = sas.sasview.sasview:run",
+            "sasview = sas.sasview.sasview:run_gui",
         ]
     },