Changeset 59b925c1 in sasview for src/sas/qtgui

Timestamp:

Dec 17, 2018 9:05:09 AM (6 years ago)

Author:

piotr

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

04a884a, 44a698c

Parents:

b96d2e1

Message:

Make sure loading of a new model triggers file save check.

File:

• src/sas/qtgui/Utilities/TabbedModelEditor.py (modified) (5 diffs)

src/sas/qtgui/Utilities/TabbedModelEditor.py

@@ -3 +3 @@
 import os
 import datetime
-import numpy as np
 import logging
 import traceback
@@ -87 +86 @@
         self.plugin_widget.setEnabled(is_active)
 
+    def saveClose(self):
+        """
+        Check if file needs saving before closing or model reloading
+        """
+        saveCancelled = False
+        ret = self.onModifiedExit()
+        if ret == QtWidgets.QMessageBox.Cancel:
+            saveCancelled = True
+        elif ret == QtWidgets.QMessageBox.Save:
+            self.updateFromEditor()
+        return saveCancelled
+
     def closeEvent(self, event):
         """
@@ -92 +103 @@
         """
         if self.is_modified:
-            ret = self.onModifiedExit()
-            if ret == QtWidgets.QMessageBox.Cancel:
+            saveCancelled = self.saveClose()
+            if saveCancelled:
                 return
-            elif ret == QtWidgets.QMessageBox.Save:
-                self.updateFromEditor()
         event.accept()
 
@@ -103 +112 @@
         Loads a model plugin file
         """
+        if self.is_modified:
+            saveCancelled = self.saveClose()
+            if saveCancelled:
+                return
+            self.is_modified = False
+        self.buttonBox.button(QtWidgets.QDialogButtonBox.Apply).setEnabled(False)
+
         plugin_location = models.find_plugins_dir()
         filename = QtWidgets.QFileDialog.getOpenFileName(
@@ -164 +180 @@
         """
         if self.is_modified:
-            ret = self.onModifiedExit()
-            if ret == QtWidgets.QMessageBox.Cancel:
+            saveCancelled = self.saveClose()
+            if saveCancelled:
                 return
-            elif ret == QtWidgets.QMessageBox.Save:
-                self.updateFromEditor()
         self.reject()