Merge branch 'master' of https://github.com/scqubits/qfit into ztp_debug

Author: ZhaoTianPu

qfit/controllers/fit_ctrl.py

@@ -114,20 +114,22 @@ def dynamicalInit(self):
         reinitialize the all relevant models and views. In particular, the
         fitting parameters are initialized with the prefit parameters.
         """
-        # build paramset
+        # model: build paramset 
+        self.fitHSParams.clear()
         self.fitHSParams.setAttrByParamSet(
             self.prefitHSParams.toFitParams(),
             insertMissing=True,
         )
         # change this later to make it more safe
         self.fitHSParams.parentNameByObj = self.prefitHSParams.parentNameByObj
         self.fitHSParams.parentObjByName = self.prefitHSParams.parentObjByName
-
+        self.fitCaliParams.clear()
         self.fitCaliParams.setAttrByParamSet(
             self.caliParamModel.toFitParams(),
             insertMissing=True,
         )
-        # insert parameters
+        
+        # view: insert parameters
         self.fitParamView.fitTableInserts(
             self.fitHSParams.paramNamesDict(),
             self.fitCaliParams.paramNamesDict(),

qfit/controllers/io_ctrl.py

@@ -27,6 +27,7 @@
     List,
     Callable,
     Tuple,
+    Literal,
 )
 
 if TYPE_CHECKING:
@@ -272,19 +273,11 @@ def _saveAndCloseApp(self, save_as: bool = False):
         if not success:
             return
         self._closeApp()
-
-    def closeAppAfterSaving(self) -> bool:
+        
+    def _unsavedChangesExist(self) -> bool:
         """
-        Close the app after asking the user whether to save the changes.
-
-        Returns
-        -------
-        bool
-            whether the app is closed
+        Check if there are any unsaved changes.
         """
-        # first, if the project is open from a file, check the registry dict of the old file
-        # with that obtained from the current session, if something changed, ask the user
-        # whether to save the changes
         if self.mainWindow.projectFile is not None:
             registryDict = copy.deepcopy(self.registry.exportDict())
             registryDictFromFile = copy.deepcopy(
@@ -312,8 +305,36 @@ def closeAppAfterSaving(self) -> bool:
 
         else:
             self.mainWindow.unsavedChanges = True
+            
+        return self.mainWindow.unsavedChanges
+        
+    def _saveCheckWithDialog(
+        self,
+    ) -> Literal[
+        "SAVE_AND_CLOSE",
+        "CLOSE",
+        "CANCEL",
+    ]:
+        """
+        Before closing the app or moving to a new opened file, check if there
+        are any unsaved changes.
 
-        if self.mainWindow.unsavedChanges and self.measDataSet.importFinished:
+        Returns
+        -------
+        Literal[
+            "SAVE_AND_CLOSE",
+            "CLOSE",
+            "CANCEL",
+        ]
+            The action to take before closing the app.
+        """
+        # first, if the project is open from a file, check the registry dict of the old file
+        # with that obtained from the current session, if something changed, ask the user
+        # whether to save the changes
+        unsavedChangesExist = self._unsavedChangesExist()
+        
+        # if there are unsaved changes, ask the user whether to save the changes
+        if unsavedChangesExist and self.measDataSet.importFinished:
             msgBox = QMessageBox()
             msgBox.setWindowTitle("qfit")
             msgBox.setIcon(QMessageBox.Question)
@@ -327,17 +348,34 @@ def closeAppAfterSaving(self) -> bool:
             reply = msgBox.exec_()
 
             if reply == QMessageBox.Save:
-                self._saveAndCloseApp(save_as=self.mainWindow.projectFile is None)
-                return True
+                return "SAVE_AND_CLOSE"
             elif reply == QMessageBox.Discard:
-                self._closeApp()
-                return True
+                return "CLOSE"
             else:  # reply == QMessageBox.Cancel
-                return False
+                return "CANCEL"
 
         else:
+            return "CLOSE"
+
+    def closeAppAfterSaving(self) -> bool:
+        """
+        Close the app after asking the user whether to save the changes.
+
+        Returns
+        -------
+        bool
+            whether the app is closed
+        """
+        status = self._saveCheckWithDialog()
+        if status == "SAVE_AND_CLOSE":
+            self._saveAndCloseApp(save_as=self.mainWindow.projectFile is None)
+            return True
+        elif status == "CLOSE":
             self._closeApp()
             return True
+        else:  # status == "CANCEL"
+            return False
+
 
     # slots ###################################################################
     @Slot()
@@ -418,9 +456,20 @@ def openFile(
             cause correlated updates to the original HilbertSpace object / other
             HilbertSpace objects.
         """
-        if fromMenu and self.menu.isVisible():
-            self.menu.toggle()
-
+        # check if there are unsaved changes in the current project
+        if fromMenu:
+            if self.menu.isVisible():
+                self.menu.toggle()
+                
+            savingStatus = self._saveCheckWithDialog()
+            print(savingStatus)
+            if savingStatus == "SAVE_AND_CLOSE":
+                self._saveProject()
+            elif savingStatus == "CLOSE":
+                pass
+            else:  # savingStatus == "CANCEL"
+                return
+        
         # check if file exists
         if fileName is not None:
             if not os.path.isfile(fileName):

qfit/controllers/meas_data_ctrl.py

@@ -105,5 +105,5 @@ def dataLoadConnects(self) -> None:
         """
         Establish connections for reading .qfit file.
         """
-        self.measDataSet.dataLoaded.connect(lambda _: self.continueToPostImportStages())
-        self.measDataSet.dataLoaded.connect(self.measDataView.reloadFig)
+        self.measDataSet.dataReloadCompleted.connect(lambda _: self.continueToPostImportStages())
+        self.measDataSet.dataReloadCompleted.connect(self.measDataView.reloadFig)

qfit/controllers/prefit_ctrl.py

@@ -263,6 +263,7 @@ def _inheritCaliParams(
         self,
     ):
         # initialize calibration parameters
+        self.prefitCaliParams.clear()
         self.prefitCaliParams.setAttrByParamSet(
             self.caliParamModel.toPrefitParams(),
             insertMissing=True,

qfit/models/measurement_data.py

@@ -1102,7 +1102,7 @@ class MeasDataSet(QAbstractListModel, Registrable, metaclass=ListModelMeta):
     rawXYConfigChanged = Signal(MeasRawXYConfig)
     updateStatus = Signal(Status)
     newFigAdded = Signal(list)
-    dataLoaded = Signal(list)
+    dataReloadCompleted = Signal(list)
 
     # single data processing
     readyToPlot = Signal(PlotElement)
@@ -1128,8 +1128,10 @@ def __init__(self, parent: QObject | None = None):
     # init & load data list ============================================
     def loadDataSet(self, measDataList: List[MeasDataType]):
         """
-        Replace all the measurement data with the new data. It will emit the
-        signals to update the view and proceed to the next stage.
+        Replace all the measurement data with the new data. It will 
+        1. emit the signals to update the view 
+        2. emit the dataReloadCompleted signal to proceed to the next stage, 
+        including a full dynamical initialization. 
         """
         self.fullData = measDataList
 
@@ -1147,7 +1149,7 @@ def loadDataSet(self, measDataList: List[MeasDataType]):
         dataNames = [measData.name for measData in self.fullData]
 
         # emit to proceed to the next stage
-        self.dataLoaded.emit(dataNames)
+        self.dataReloadCompleted.emit(dataNames)
 
     @staticmethod
     def _rawDataFromFile(fileName) -> MeasDataType | None:

qfit/utils/helpers.py

@@ -24,7 +24,7 @@
 from labellines import labelLines
 
 from PySide6 import QtCore as QtCore
-from PySide6.QtWidgets import QWidget, QPushButton
+from PySide6.QtWidgets import QWidget, QPushButton, QLayout, QLayoutItem, QSpacerItem
 from PySide6.QtCore import QEventLoop, QTimer
 
 from typing import Dict, List, Literal, Optional, Tuple, Union, Callable
@@ -262,22 +262,45 @@ def makeUnique(names: List[str]):
 
 
 # widgets ######################################################################
+def clearLayout(layout: QLayout):
+    """Recursively clear all items from a layout"""
+    if layout is None:
+        return
+        
+    while layout.count():
+        item = layout.takeAt(0)
+        if item is None:
+            continue
+            
+        # If it's a widget, delete it
+        if item.widget():
+            item.widget().setParent(None)
+            item.widget().deleteLater()
+        # If it's a layout, recursively clear it
+        elif item.layout():
+            clearLayout(item.layout())
+        # If it's a spacer item, just delete it
+        elif item.spacerItem():
+            del item
+            
 def clearChildren(widget: QWidget):
     """
-    Clear all children of the given widget.
-
+    Clear all visible content from a widget, including child widgets and layout items like spacers.
+    
     Parameters
     ----------
     widget: QWidget
-    """
-    layout = widget.layout()
-    if layout is None:
-        return
-    for i in reversed(range(layout.count())):
-        widget = layout.itemAt(i).widget()
-        if widget:  # Check if the item is a widget
-            widget.setParent(None)
-            widget.deleteLater()
+        The widget to clear all content from
+    """    
+    # Clear the widget's layout if it has one
+    if widget.layout():
+        clearLayout(widget.layout())
+    
+    # Clear any remaining child widgets that might not be in layouts
+    for child in widget.findChildren(QWidget):
+        child.setParent(None)
+        child.deleteLater()
+
 
 
 def modifyStyleSheet(widget: QWidget, property_name: str, new_value: str):

qfit/views/calibration_view.py

@@ -31,7 +31,7 @@
 from qfit.models.data_structures import QMSweepParam, ParamAttr
 
 from qfit.widgets.custom_table import FoldableTable, CollectionType, WidgetCollection
-from qfit.utils.helpers import modifyStyleSheet
+from qfit.utils.helpers import modifyStyleSheet, clearChildren
 
 
 class CalibrationView(QObject):
@@ -167,10 +167,7 @@ def dynamicalInit(
         the model will reinitialized by this method.
         """
         # delete the calibration table entirely
-        try:
-            self.caliXTable.deleteLater()
-        except AttributeError:
-            pass
+        clearChildren(self.caliXScrollAreaWidget)
 
         # generate the X calibration table
         self.XParamItems = self._generateXParamItems()
@@ -369,8 +366,6 @@ def _generateLineEditSet(self):
 
     def _generateXDataSourceSet(self):
         if self.XDataSourceSet != {}:
-            for XRowIdx in range(self.caliTableXRowNr):
-                self.XDataSourceSet[f"X{XRowIdx+1}"]["DATA<br>SOURCE"].setText("")
             self.XDataSourceSet.clear()
         for XRowIdx in range(self.caliTableXRowNr):
             self.XDataSourceSet[f"X{XRowIdx+1}"] = {}

qfit/views/fit_view.py

@@ -79,7 +79,6 @@ def fitTableInserts(
         removeExisting : bool, optional
             Whether to remove the existing widgets, by default True.
         """
-
         self.HSNames = list(HSParamNames.keys())
         paramNameDict = HSParamNames | caliParamNames