Changes in src/sas/qtgui/Perspectives/Fitting/FittingWidget.py [53c771e:3e8dee3] in sasview

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (6 diffs)

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

@@ -18 +18 @@
 #from PyQt5 import QtWebEngineWidgets
 
-from sasmodels import product
 from sasmodels import generate
 from sasmodels import modelinfo
@@ -152 +151 @@
     def data(self, value):
         """ data setter """
-        # Value is either a list of indices for batch fitting or a simple index
-        # for standard fitting. Assure we have a list, regardless.
         if isinstance(value, list):
             self.is_batch_fitting = True
@@ -167 +164 @@
 
         # Update logics with data items
-        # Logics.data contains only a single Data1D/Data2D object
         self.logic.data = GuiUtils.dataFromItem(value[0])
 
@@ -173 +169 @@
         self.is2D = True if isinstance(self.logic.data, Data2D) else False
 
-        # Let others know we're full of data now
         self.data_is_loaded = True
 
@@ -353 +348 @@
         self.chk2DView.setVisible(False)
         self.chkMagnetism.setEnabled(self.is2D)
-        self.tabFitting.setTabEnabled(TAB_MAGNETISM, self.is2D)
         # Combo box or label for file name"
         if self.is_batch_fitting:
@@ -1288 +1282 @@
         structure_module = generate.load_kernel_module(structure_factor)
         structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', []))
-        structure_kernel = self.models[structure_factor]()
-
-        self.kernel_module._model_info = product.make_product_info(self.kernel_module._model_info, structure_kernel._model_info)
 
         new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D)