Changeset 6a9559d in sasview

Timestamp:

Feb 16, 2017 9:41:02 AM (8 years ago)

Author:

wojciech

Branches:

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

Children:

1228007

Parents:

d84bc69 (diff), 2bb20a5 (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 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI_sasmodels_dictionary

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• UI/FittingUI.ui (modified) (2 diffs)
• FittingPerspective.py (modified) (3 diffs)

src/sas/qtgui/Perspectives/Fitting/UI/FittingUI.ui

@@ -15 +15 @@
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../UI/main_resources.qrc">
+   <iconset>
     <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset>
   </property>
@@ -646 +646 @@
   </layout>
  </widget>
- <resources>
-  <include location="../../../UI/main_resources.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -1 +1 @@
 import sys
+import json
+import  os
 from PyQt4 import QtGui
 from PyQt4 import QtCore
 
 from UI.FittingUI import Ui_FittingUI
+
+from sasmodels import generate
+from sasmodels import modelinfo
+
+from collections import defaultdict
+from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
 
 class FittingWindow(QtGui.QDialog, Ui_FittingUI):
@@ -13 +21 @@
         self.setupUi(self)
 
+        self._readCategoryInfo()
+        cat_list = sorted(self.master_category_dict.keys())
+        self.comboBox.addItems(cat_list)
         self.tableView.setModel(self._model_model)
-        self.setModelModel()
+
+        model_list = self.master_category_dict['Cylinder']
+        for (model, enabled) in model_list:
+            self.comboBox_2.addItem(model)
+        self.setModelModel('barbell')
 
         self.pushButton.setEnabled(False)
@@ -35 +50 @@
             self.tableView_2.setIndexWidget(i,c)
 
+    def _readCategoryInfo(self):
+        """
+        Reads the categories in from file
+        """
+        self.master_category_dict = defaultdict(list)
+        self.by_model_dict = defaultdict(list)
+        self.model_enabled_dict = defaultdict(bool)
+
+        try:
+            categorization_file = CategoryInstaller.get_user_file()
+            if not os.path.isfile(categorization_file):
+                categorization_file = CategoryInstaller.get_default_file()
+            cat_file = open(categorization_file, 'rb')
+            self.master_category_dict = json.load(cat_file)
+            self._regenerate_model_dict()
+            cat_file.close()
+        except IOError:
+            raise
+            print 'Problem reading in category file.'
+            print 'We even looked for it, made sure it was there.'
+            print 'An existential crisis if there ever was one.'
+
+    def _regenerate_model_dict(self):
+        """
+        regenerates self.by_model_dict which has each model name as the
+        key and the list of categories belonging to that model
+        along with the enabled mapping
+        """
+        self.by_model_dict = defaultdict(list)
+        for category in self.master_category_dict:
+            for (model, enabled) in self.master_category_dict[category]:
+                self.by_model_dict[model].append(category)
+                self.model_enabled_dict[model] = enabled
+
         
-    def setModelModel(self):
+    def setModelModel(self, model_name):
         # Crete/overwrite model items
 
-        parameters=[]
-        p=["scale", "1", "0", "inf", ""]
-        for i in xrange(1):
-            #for parameter in parameters.keys():
-            item1 = QtGui.QStandardItem("background")
+        model_name = str(model_name)
+        kernel_module = generate.load_kernel_module(model_name)
+        parameters = modelinfo.make_parameter_table(getattr(kernel_module, 'parameters', []))
+
+        #TODO: scaale and background are implicit in sasmodels and needs to be added
+        item1 = QtGui.QStandardItem('scale')
+        item1.setCheckable(True)
+        item2 = QtGui.QStandardItem('1.0')
+        item3 = QtGui.QStandardItem('0.0')
+        item4 = QtGui.QStandardItem('inf')
+        item5 = QtGui.QStandardItem('')
+        self._model_model.appendRow([item1, item2, item3, item4, item5])
+
+        item1 = QtGui.QStandardItem('background')
+        item1.setCheckable(True)
+        item2 = QtGui.QStandardItem('0.001')
+        item3 = QtGui.QStandardItem('-inf')
+        item4 = QtGui.QStandardItem('inf')
+        item5 = QtGui.QStandardItem('1/cm')
+        self._model_model.appendRow([item1, item2, item3, item4, item5])
+
+        #TODO: iq_parameters are used here. If orientation paramateres or magnetic are needed kernel_paramters should be used instead
+        #For orientation and magentic parameters param.type needs to be checked
+        for param in parameters.iq_parameters:
+            item1 = QtGui.QStandardItem(param.name)
             item1.setCheckable(True)
-            item2 = QtGui.QStandardItem("0.001")
-            item3 = QtGui.QStandardItem("-inf")
-            item4 = QtGui.QStandardItem("inf")
-            item5 = QtGui.QStandardItem("1/cm")
-            self._model_model.appendRow([item1, item2, item3, item4, item5])
-
-            item1 = QtGui.QStandardItem("l_radius")
-            item1.setCheckable(True)
-            item2 = QtGui.QStandardItem("100")
-            item3 = QtGui.QStandardItem("0")
-            item4 = QtGui.QStandardItem("inf")
-            item5 = QtGui.QStandardItem("A")
-            self._model_model.appendRow([item1, item2, item3, item4, item5])
-
-            item1 = QtGui.QStandardItem("ls_sld")
-            item1.setCheckable(True)
-            item2 = QtGui.QStandardItem("3.5e-06")
-            item3 = QtGui.QStandardItem("0")
-            item4 = QtGui.QStandardItem("inf")
-            item5 = QtGui.QStandardItem("1/A^2")
-            self._model_model.appendRow([item1, item2, item3, item4, item5])
-
-            item1 = QtGui.QStandardItem("s_radius")
-            item1.setCheckable(True)
-            item2 = QtGui.QStandardItem("25")
-            item3 = QtGui.QStandardItem("0")
-            item4 = QtGui.QStandardItem("inf")
-            item5 = QtGui.QStandardItem("A")
-            self._model_model.appendRow([item1, item2, item3, item4, item5])
-
-            item1 = QtGui.QStandardItem("solvent_sld")
-            item1.setCheckable(True)
-            item2 = QtGui.QStandardItem("6.36e-06")
-            item3 = QtGui.QStandardItem("0")
-            item4 = QtGui.QStandardItem("inf")
-            item5 = QtGui.QStandardItem("1/A^2")
-            self._model_model.appendRow([item1, item2, item3, item4, item5])
-
-            item1 = QtGui.QStandardItem("vol_frac_ls")
-            item1.setCheckable(True)
-            item2 = QtGui.QStandardItem("0.1")
-            item3 = QtGui.QStandardItem("0")
-            item4 = QtGui.QStandardItem("inf")
-            item5 = QtGui.QStandardItem("")
+            item2 = QtGui.QStandardItem(str(param.default))
+            item3 = QtGui.QStandardItem(str(param.limits[0]))
+            item4 = QtGui.QStandardItem(str(param.limits[1]))
+            item5 = QtGui.QStandardItem(param.units)
             self._model_model.appendRow([item1, item2, item3, item4, item5])