Changeset 060413c in sasview

Timestamp:

Aug 6, 2018 7:48:06 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

03e04a4

Parents:

3d18691

Message:

More CR and merge fixes.

Location:

src/sas/qtgui

Files:

• MainWindow/GuiManager.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• Utilities/PluginDefinition.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -140 +140 @@
         self._workspace.toolBar.setVisible(LocalConfig.TOOLBAR_SHOW)
         self._workspace.actionHide_Toolbar.setText("Show Toolbar")
-        self.categoryManagerWidget = CategoryManager()
 
         # Add calculators - floating for usability

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

@@ -1935 +1935 @@
             # custom kernel load requires full path
             name = os.path.join(ModelUtilities.find_plugins_dir(), model_name+".py")
-        kernel_module = generate.load_kernel_module(name)
+        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)
 
         if hasattr(kernel_module, 'parameters'):

src/sas/qtgui/Utilities/PluginDefinition.py

@@ -30 +30 @@
         self.pd_parameter_dict = {}
 
+        # Initialize widgets
+        self.addWidgets()
+
+        # Wait for all widgets to finish processing
+        QtWidgets.QApplication.processEvents()
+
         # Initialize signals
         self.addSignals()
-
-        # Initialize widgets
-        self.addWidgets()
 
     def addTooltip(self):
@@ -160 +163 @@
         # keep in mind that this is called every time the text changes.
         # mind the performance!
-        self.addTooltip()
-        self.model['text'] = self.txtFunction.toPlainText().lstrip().rstrip()
-        self.modelModified.emit()
+        #self.addTooltip()
+        new_text = self.txtFunction.toPlainText().lstrip().rstrip()
+        if new_text != self.model['text']:
+            self.model['text'] = new_text
+            self.modelModified.emit()
 
     def onOverwrite(self):