Changeset 03e04a4 in sasview

Timestamp:

Aug 6, 2018 9:49:45 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:

c0de493, ebfe223

Parents:

060413c (diff), 4bddb9ca (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

Files:

• installers/sasview_qt5_osx.spec (modified) (3 diffs)
• src/sas/qtgui/MainWindow/CategoryManager.py (added)
• src/sas/qtgui/MainWindow/GuiManager.py (modified) (4 diffs)
• src/sas/qtgui/MainWindow/MainWindow.py (modified) (1 diff)
• src/sas/qtgui/MainWindow/UI/CategoryManagerUI.ui (added)
• src/sas/qtgui/MainWindow/UI/ChangeCategoryUI.ui (added)
• src/sas/qtgui/MainWindow/UI/MainWindowUI.ui (modified) (2 diffs)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (4 diffs)
• src/sas/qtgui/Utilities/GuiUtils.py (modified) (1 diff)
• src/sas/qtgui/Utilities/PluginDefinition.py (modified) (2 diffs)

installers/sasview_qt5_osx.spec

@@ -44 +44 @@
 # ADDITIONAL DATA ############################################################
 datas = [('../src/sas/sasview/images', 'images')]
-
-datas = [('../src/sas/sasview/images/ball.ico', '.')]
-
 datas.append(('../src/sas/sasview/media','media'))
 datas.append(('../src/sas/sasview/test','test'))
@@ -173 +170 @@
           debug=False,
           upx=UPX,
-          icon=os.path.join("../src/sas/sasview/images","ball.ico"),
+          icon=os.path.join("../src/sas/sasview/images","ball.icns"),
           version="version.txt",
           console=False )
@@ -189 +186 @@
     app = BUNDLE(coll,
         name='sasview.app',
-        icon='../src/sas/sasview/images/ball.ico',
+        icon='../src/sas/sasview/images/ball.icns',
         bundle_identifier=None)
 

src/sas/qtgui/MainWindow/GuiManager.py

@@ -27 +27 @@
 from sas.qtgui.MainWindow.AboutBox import AboutBox
 from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel
+from sas.qtgui.MainWindow.CategoryManager import CategoryManager
 
 from sas.qtgui.MainWindow.DataManager import DataManager
@@ -134 +135 @@
         self.ackWidget = Acknowledgements()
         self.aboutWidget = AboutBox()
+        self.categoryManagerWidget = CategoryManager(self._parent, manager=self)
         self.welcomePanel = WelcomePanel()
         self.grid_window = None
@@ -419 +421 @@
         self._workspace.actionHide_Toolbar.triggered.connect(self.actionHide_Toolbar)
         self._workspace.actionStartup_Settings.triggered.connect(self.actionStartup_Settings)
-        self._workspace.actionCategry_Manager.triggered.connect(self.actionCategry_Manager)
+        self._workspace.actionCategory_Manager.triggered.connect(self.actionCategory_Manager)
         # Tools
         self._workspace.actionData_Operation.triggered.connect(self.actionData_Operation)
@@ -611 +613 @@
         pass
 
-    def actionCategry_Manager(self):
-        """
-        """
-        print("actionCategry_Manager TRIGGERED")
-        pass
+    def actionCategory_Manager(self):
+        """
+        """
+        self.categoryManagerWidget.show()
 
     #============ TOOLS =================

src/sas/qtgui/MainWindow/MainWindow.py

@@ -27 +27 @@
         except Exception as ex:
             import logging
-            logging.error("Application failed with: " + str(ex))
-            print("Application failed with: ", ex)
+            logging.error("Application failed with: "+str(ex))
+            print("Application failed with: ", str(ex))
 
     def closeEvent(self, event):

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -75 +75 @@
     <addaction name="actionStartup_Settings"/>
     <addaction name="separator"/>
-    <addaction name="actionCategry_Manager"/>
+    <addaction name="actionCategory_Manager"/>
    </widget>
    <widget class="QMenu" name="menuTool">
@@ -324 +324 @@
    </property>
   </action>
-  <action name="actionCategry_Manager">
+  <action name="actionCategory_Manager">
    <property name="text">
     <string>Category Manager</string>

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

@@ -373 +373 @@
         self.cbCategory.addItem(CATEGORY_DEFAULT)
         self.cbCategory.addItems(category_list)
-        self.cbCategory.addItem(CATEGORY_STRUCTURE)
+        if CATEGORY_STRUCTURE not in category_list:
+            self.cbCategory.addItem(CATEGORY_STRUCTURE)
         self.cbCategory.setCurrentIndex(0)
 
@@ -523 +524 @@
         self.communicate.copyFitParamsSignal.connect(self.onParameterCopy)
         self.communicate.pasteFitParamsSignal.connect(self.onParameterPaste)
+
+        # Communicator signal
+        self.communicate.updateModelCategoriesSignal.connect(self.onCategoriesChanged)
 
     def modelName(self):
@@ -1931 +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'):
@@ -2248 +2258 @@
         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):
         """

src/sas/qtgui/Utilities/GuiUtils.py

@@ -260 +260 @@
     # Fitting parameter paste from clipboard
     pasteFitParamsSignal = QtCore.pyqtSignal()
+    # Notify about new categories/models from category manager
+    updateModelCategoriesSignal = QtCore.pyqtSignal()
 
 def updateModelItemWithPlot(item, update_data, name=""):

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):