Changes in src/sas/qtgui/Perspectives/Fitting/FittingWidget.py [060413c:97df8a9] in sasview

File:

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

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

@@ -373 +373 @@
         self.cbCategory.addItem(CATEGORY_DEFAULT)
         self.cbCategory.addItems(category_list)
-        if CATEGORY_STRUCTURE not in category_list:
-            self.cbCategory.addItem(CATEGORY_STRUCTURE)
+        self.cbCategory.addItem(CATEGORY_STRUCTURE)
         self.cbCategory.setCurrentIndex(0)
 
@@ -524 +523 @@
         self.communicate.copyFitParamsSignal.connect(self.onParameterCopy)
         self.communicate.pasteFitParamsSignal.connect(self.onParameterPaste)
-
-        # Communicator signal
-        self.communicate.updateModelCategoriesSignal.connect(self.onCategoriesChanged)
 
     def modelName(self):
@@ -1935 +1931 @@
             # custom kernel load requires full path
             name = os.path.join(ModelUtilities.find_plugins_dir(), model_name+".py")
-        try:
-            kernel_module = generate.load_kernel_module(name)
-        except ModuleNotFoundError:
-            # maybe it's a recategorised custom model?
-            name = os.path.join(ModelUtilities.find_plugins_dir(), model_name+".py")
-            # If this rises, it's a valid problem.
-            kernel_module = generate.load_kernel_module(name)
+        kernel_module = generate.load_kernel_module(name)
 
         if hasattr(kernel_module, 'parameters'):
@@ -2258 +2248 @@
         self.createNewIndex(residuals_plot)
 
-    def onCategoriesChanged(self):
-            """
-            Reload the category/model comboboxes
-            """
-            # Store the current combo indices
-            current_cat = self.cbCategory.currentText()
-            current_model = self.cbModel.currentText()
-
-            # reread the category file and repopulate the combo
-            self.cbCategory.blockSignals(True)
-            self.cbCategory.clear()
-            self.readCategoryInfo()
-            self.initializeCategoryCombo()
-
-            # Scroll back to the original index in Categories
-            new_index = self.cbCategory.findText(current_cat)
-            if new_index != -1:
-                self.cbCategory.setCurrentIndex(new_index)
-            self.cbCategory.blockSignals(False)
-            # ...and in the Models
-            self.cbModel.blockSignals(True)
-            new_index = self.cbModel.findText(current_model)
-            if new_index != -1:
-                self.cbModel.setCurrentIndex(new_index)
-            self.cbModel.blockSignals(False)
-
-            return
-
     def calcException(self, etype, value, tb):
         """