Changeset 50a77df in sasview for src/sas/sasgui/perspectives/fitting/models.py

Timestamp:

Mar 15, 2016 11:18:39 AM (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:

f66d9d1

Parents:

02098e3 (diff), 0b63c6e (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.

Message:

Merge branch 'master' into sasmodels-integration

File:

• src/sas/sasgui/perspectives/fitting/models.py (moved) (moved from src/sas/perspectives/fitting/models.py) (2 diffs)

src/sas/sasgui/perspectives/fitting/models.py

@@ -19 +19 @@
 from sas.models.pluginmodel import Model1DPlugin
 from sas.models.BaseComponent import BaseComponent
-from sas.guiframe.CategoryInstaller import CategoryInstaller
+from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
 
 from sasmodels.sasview_model import make_class
@@ -550 +550 @@
         except:
             logging.error(base_message.format(EllipticalCylinderModel.__name__))
+
+        try:
+            from sas.models.BarBellModel import BarBellModel
+
+            self.model_dictionary[BarBellModel.__name__] = BarBellModel
+            #       self.shape_list.append(BarBellModel)
+            self.model_name_list.append(BarBellModel.__name__)
+        except:
+            logging.error(base_message.format(BarBellModel.__name__))
 
         try: