Changeset 07d744c in sasview for src/sas/qtgui/MainWindow

Timestamp:

Jan 14, 2019 6:45:33 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

593b536d

Parents:

1c98850 (diff), c3fc919 (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

Location:

src/sas/qtgui/MainWindow

Files:

• AboutBox.py (modified) (2 diffs)
• CategoryManager.py (modified) (2 diffs)
• DataExplorer.py (modified) (2 diffs)
• GuiManager.py (modified) (2 diffs)
• MainWindow.py (modified) (1 diff)
• UI/MainWindowUI.ui (modified) (2 diffs)

src/sas/qtgui/MainWindow/AboutBox.py

@@ -1 +1 @@
 import functools
-from PyQt5 import QtWidgets
+from PyQt5 import QtWidgets, QtCore
 
 import sas.sasview
@@ -14 +14 @@
         super(AboutBox, self).__init__(parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         self.setWindowTitle("About")

src/sas/qtgui/MainWindow/CategoryManager.py

@@ -135 +135 @@
         super(CategoryManager, self).__init__(parent)
         self.setupUi(self)
+
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         self.communicator = manager.communicator()
@@ -327 +330 @@
         super(ChangeCategory, self).__init__(parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         self.model = model

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -640 +640 @@
         # Figure out which rows are checked
         ind = -1
-        # Use 'while' so the row count is forced at every iteration
+
+        deleted_items = []
+        deleted_names = []
         while ind < self.theory_model.rowCount():
             ind += 1
             item = self.theory_model.item(ind)
+
             if item and item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
                 # Delete these rows from the model
+                deleted_names.append(str(self.theory_model.item(ind).text()))
+                deleted_items.append(item)
+
                 self.theory_model.removeRow(ind)
                 # Decrement index since we just deleted it
                 ind -= 1
 
-        # pass temporarily kept as a breakpoint anchor
-        pass
+        # Let others know we deleted data
+        self.communicator.dataDeletedSignal.emit(deleted_items)
+
+        # update stored_data
+        self.manager.update_stored_data(deleted_names)
 
     def sendData(self, event=None):
@@ -1810 +1819 @@
             raise AttributeError(msg)
 
-        # Check if there are any other items for this tab
-        # If so, delete them
+        # Check if there exists an item for this tab
+        # If so, replace it
         current_tab_name = model_item.text()
         for current_index in range(self.theory_model.rowCount()):
-            if current_tab_name == self.theory_model.item(current_index).text():
-                self.theory_model.removeRow(current_index)
-                break
-        # send in the new item
+            current_item = self.theory_model.item(current_index)
+            if current_tab_name == current_item.text():
+                # replace data instead
+                new_data = GuiUtils.dataFromItem(model_item)
+                current_item.child(0).setData(new_data)
+                return current_item
+
+        # add the new item to the model
         self.theory_model.appendRow(model_item)
+        return model_item
 
     def deleteIntermediateTheoryPlotsByModelID(self, model_id):

src/sas/qtgui/MainWindow/GuiManager.py

@@ -59 +59 @@
         QDialog.__init__(self, parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
+
 
 class GuiManager(object):
@@ -1049 +1052 @@
         Send the request to the DataExplorer for updating the theory model.
         """
-        self.filesWidget.updateTheoryFromPerspective(index)
+        item = self.filesWidget.updateTheoryFromPerspective(index)
+        # Now notify the perspective that the item was/wasn't replaced
+        per = self.perspective()
+        if not isinstance(per, FittingWindow):
+            # currently only fitting supports generation of theories.
+            return
+        per.currentTab.setTheoryItem(item)
 
     def deleteIntermediateTheoryPlotsByModelID(self, model_id):

src/sas/qtgui/MainWindow/MainWindow.py

@@ -60 +60 @@
     splash.show()
     app.setAttribute(Qt.AA_EnableHighDpiScaling)
+
     # fix for pyinstaller packages app to avoid ReactorAlreadyInstalledError
     import sys

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

@@ -75 +75 @@
     <addaction name="actionHide_LogExplorer"/>
     <addaction name="separator"/>
-    <addaction name="actionMinimizePlots"/>
-    <addaction name="actionClosePlots"/>
-    <addaction name="separator"/>
     <addaction name="actionStartup_Settings"/>
    </widget>
@@ -129 +126 @@
     <addaction name="actionNext"/>
     <addaction name="actionPrevious"/>
+     <addaction name="separator"/>
+     <addaction name="actionMinimizePlots"/>
+     <addaction name="actionClosePlots"/>
    </widget>
    <widget class="QMenu" name="menuAnalysis">