Changeset 26d5aa5 in sasview for src/sas/sasgui/perspectives/calculator

Timestamp:

Mar 17, 2016 12:41:47 PM (9 years ago)

Author:

ajj

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:

ec36e48

Parents:

1c628f0

Message:

Making easy sum model work with sasmodels

File:

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

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

@@ -589 +589 @@
                     else:
                         out_f.write(line + "\n")
+                elif line.count("P1 = make_class"):
+                    out_f.write(line % (name1) + "\n")
+                elif line.count("P2 = make_class"):
+                    out_f.write(line % (name2) + "\n")
+
                 elif line.count("self.description = '%s'"):
                     out_f.write(line % description + "\n")
@@ -1263 +1268 @@
 import copy
 from sas.models.pluginmodel import Model1DPlugin
+from sasmodels.sasview_model import make_class
+from sasmodels.core import load_model_info
 # User can change the name of the model (only with single functional model)
 #P1_model:
-#from sasmodels.models import %s as P1
 #from %s import Model as P1
 
 #P2_model:
-#from sasmodels.models import %s as P2
 #from %s import Model as P2
 import os
@@ -1278 +1283 @@
     def __init__(self):
         Model1DPlugin.__init__(self, name='')
+        P1 = make_class(load_model_info('%s'))
+        P2 = make_class(load_model_info('%s'))
         p_model1 = P1()
         p_model2 = P2()