Fixed some issues with reloading a changed CellML file.

Author: agarny

.github/workflows/cd.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         include:
           - name: Windows
-            os: windows-2019
+            os: windows-2022
           - name: Linux
             os: ubuntu-22.04
           - name: macOS
@@ -40,6 +40,9 @@ jobs:
         run: echo -n $EV_CERTIFICATE_BASE64 | base64 -d > EVCertificate.pfx
       - name: Install CMake and Ninja
         uses: lukka/get-cmake@latest
+      - name: Configure MSVC
+        if: ${{ runner.os == 'Windows' }}
+        uses: ilammy/msvc-dev-cmd@v1
       - name: Install Python
         uses: actions/setup-python@v5
         with:

.github/workflows/ci.yml

@@ -14,10 +14,10 @@ jobs:
       matrix:
         include:
           - name: Build and test (Windows release)
-            os: windows-2019
+            os: windows-2022
             mode: Release
           - name: Build (Windows debug)
-            os: windows-2019
+            os: windows-2022
             mode: Debug
           - name: Build and test (Linux release)
             os: ubuntu-22.04
@@ -41,6 +41,9 @@ jobs:
         uses: actions/checkout@v4
       - name: Install CMake and Ninja
         uses: lukka/get-cmake@latest
+      - name: Configure MSVC
+        if: ${{ runner.os == 'Windows' }}
+        uses: ilammy/msvc-dev-cmd@v1
       - name: Install Python
         uses: actions/setup-python@v5
         with:
@@ -73,7 +76,7 @@ jobs:
       matrix:
         include:
           - name: Documentation (Windows)
-            os: windows-2019
+            os: windows-2022
           - name: Documentation (Linux)
             os: ubuntu-22.04
           - name: Documentation (macOS)

CMakeLists.txt

@@ -81,10 +81,12 @@ if(WIN32)
     list(GET CMAKE_CXX_COMPILER_VERSION_LIST 1 CMAKE_CXX_COMPILER_VERSION_MINOR)
 
     if(   NOT(    "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC"
-              AND "${CMAKE_C_COMPILER_VERSION_MAJOR}" STREQUAL "19")
+              AND "${CMAKE_C_COMPILER_VERSION_MAJOR}" STREQUAL "19"
+              AND "${CMAKE_C_COMPILER_VERSION_MINOR}" STREQUAL "44")
        OR NOT(    "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"
-              AND "${CMAKE_CXX_COMPILER_VERSION_MAJOR}" STREQUAL "19"))
-        message(FATAL_ERROR "${CMAKE_PROJECT_NAME} can only be built using MSVC 2017, 2019 or 2022 on Windows...")
+              AND "${CMAKE_CXX_COMPILER_VERSION_MAJOR}" STREQUAL "19"
+              AND "${CMAKE_CXX_COMPILER_VERSION_MINOR}" STREQUAL "44"))
+        message(FATAL_ERROR "${CMAKE_PROJECT_NAME} can only be built using MSVC 2022 on Windows...")
     endif()
 elseif(APPLE)
     if(    NOT(   "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"
@@ -527,7 +529,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "" FORCE)
 
 if(WIN32)
-    set(CMAKE_CXX_FLAGS "/DWIN32 /D_WINDOWS /W3 /WX /GR /EHsc")
+    set(CMAKE_CXX_FLAGS "/DWIN32 /D_WINDOWS /W3 /WX /GR /EHsc /wd4996")
     # Note: MSVC has a /Wall flag, but it results in MSVC being very pedantic,
     #       so instead we use what MSVC recommends for production code, which is
     #       /W3 and which is also what CMake uses by default...
@@ -920,16 +922,16 @@ if(USE_PREBUILT_QTWEBKIT_PACKAGE)
     # Determine the location of the MSVC runtime libraries
 
     if(WIN32)
-        if(EXISTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community")
+        if(EXISTS "C:/Program Files/Microsoft Visual Studio/2022/Community")
             set(MSVC_EDITION Community)
         else()
             set(MSVC_EDITION Enterprise)
         endif()
 
         if(RELEASE_MODE)
-            set(MSVC_DIR "C:/Program Files (x86)/Microsoft Visual Studio/2019/${MSVC_EDITION}/VC/Redist/MSVC/14.29.30133/x64/Microsoft.VC142.CRT")
+            set(MSVC_DIR "C:/Program Files/Microsoft Visual Studio/2022/${MSVC_EDITION}/VC/Redist/MSVC/14.44.35112/x64/Microsoft.VC143.CRT")
         else()
-            set(MSVC_DIR "C:/Program Files (x86)/Microsoft Visual Studio/2019/${MSVC_EDITION}/VC/Redist/MSVC/14.29.30133/debug_nonredist/x64/Microsoft.VC142.DebugCRT")
+            set(MSVC_DIR "C:/Program Files/Microsoft Visual Studio/2022/${MSVC_EDITION}/VC/Redist/MSVC/14.44.35112/debug_nonredist/x64/Microsoft.VC143.DebugCRT")
         endif()
     endif()
 
@@ -1263,10 +1265,10 @@ else()
         add_dependencies(${WINDOWS_CLI_COPY} ${WINDOWS_CLI_PROJECT_NAME})
 
         # Additional files required by OpenCOR
-        # Note #1: these files may or not be needed in order to test OpenCOR
-        #          locally. It all depends on the way the user's computer is set
-        #          up. So, by copying them over, we are sure that the
-        #          release/debug version of OpenCOR will work fine...
+        # Note: these files may or not be needed in order to test OpenCOR
+        #       locally. It all depends on the way the user's computer is set
+        #       up. So, by copying them over, we are sure that the release/debug
+        #       version of OpenCOR will work fine...
         # Note #2: the second set of additional files is needed in case OpenCOR
         #          is to be run on a non-up-to-date copy of Windows 7...
 
@@ -1276,7 +1278,7 @@ else()
             ${MSVC_DIR}/vcruntime140_1${DEBUG_TAG}.dll
         )
 
-        set(REMOTE_DEBUGGER_DIR "C:/Program Files (x86)/Microsoft Visual Studio/2019/${MSVC_EDITION}/Common7/IDE/Remote Debugger/x64")
+        set(REMOTE_DEBUGGER_DIR "C:/Program Files/Microsoft Visual Studio/2022/${MSVC_EDITION}/Common7/IDE/Remote Debugger/x64")
 
         list(APPEND ADDITIONAL_FILES
             ${REMOTE_DEBUGGER_DIR}/api-ms-win-core-file-l1-2-0.dll

package.bat

@@ -21,10 +21,10 @@ IF !ExitCode! EQU 0 (
         set VSCMD_ARG_HOST_ARCH=x64
         set VSCMD_ARG_TGT_ARCH=x64
 
-        IF EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\vsdevcmd\core\winsdk.bat" (
-            CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\vsdevcmd\core\winsdk.bat"
+        IF EXIST "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\vsdevcmd\core\winsdk.bat" (
+            CALL "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\vsdevcmd\core\winsdk.bat"
         ) ELSE (
-            CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\vsdevcmd\core\winsdk.bat"
+            CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\vsdevcmd\core\winsdk.bat"
         )
 
         "!WindowsSdkVerBinPath!\x64\signtool.exe" sign /tr http://timestamp.globalsign.com/tsa/r6advanced1 /fd SHA256 /td SHA256 /f !EvCertificate! !AppDir!build\OpenCOR.com

scripts/genericci.bat

@@ -33,10 +33,10 @@ IF EXIST !AppDir!build (
 
     TITLE Building and testing the !version! version of OpenCOR using !Generator!...
 
-    IF EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" (
-        CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
+    IF EXIST "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" (
+        CALL "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
     ) ELSE (
-        CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
     )
 
     CD !AppDir!build

scripts/genericmake.bat

@@ -37,10 +37,10 @@ IF EXIST !AppDir!build (
 
     TITLE Building OpenCOR!TitleTests! using !Generator!...
 
-    IF EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" (
-        CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
+    IF EXIST "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" (
+        CALL "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
     ) ELSE (
-        CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
     )
 
     SET OrigDir=!CD!

src/plugins/miscellaneous/Core/src/propertyeditorwidget.cpp

@@ -2032,21 +2032,13 @@ void PropertyEditorWidget::checkCheckState(QStandardItem *pItem)
 
 //==============================================================================
 
-void PropertyEditorWidget::updateFocusProxy()
-{
-    // Set our property's editor as our focus proxy
-
-    setFocusProxy(mPropertyEditor);
-}
-
-//==============================================================================
-
 void PropertyEditorWidget::editorOpened(QWidget *pEditor)
 {
     // Keep track of some information about the property
 
     mProperty = currentProperty();
     mPropertyEditor = pEditor;
+    mOldPropertyValue = mProperty->value();
 
     // We are starting the editing of a property, so make sure that if we are to
     // edit a list item, then its original value gets properly set
@@ -2066,19 +2058,13 @@ void PropertyEditorWidget::editorOpened(QWidget *pEditor)
         }
     }
 
-    // Next, we need to use the property's editor as our focus proxy and make
-    // sure that it immediately gets the focus
-    // Note #1: if we were not to immediately give the focus to our editor, then
-    //          the central widget would give the focus to the previously
-    //          focused widget (see CentralWidget::updateGui()), which is
-    //          clearly not what we want...
-    // Note #2: starting with Qt 5.12.5, we can't immediately set the property's
-    //          editor as our focus proxy (!?). This will indeed crash OpenCOR!
-    //          So, instead, we set it through a single shot...
+    // Next, we need to make sure that it immediately gets the focus
+    // Note: if we were not to immediately give the focus to our editor, then
+    //       the central widget would give the focus to the previously focused
+    //       widget (see CentralWidget::updateGui()), which is clearly not what
+    //       we want...
 
     pEditor->setFocus();
-
-    QTimer::singleShot(0, this, &PropertyEditorWidget::updateFocusProxy);
 }
 
 //==============================================================================
@@ -2103,15 +2089,9 @@ void PropertyEditorWidget::editorClosed()
 
     if (   (mProperty->type() != Property::Type::List)
         && (mProperty->type() != Property::Type::Boolean)) {
-        mProperty->setValue(mProperty->value(), true);
+        mProperty->setValue(mProperty->value(), true, mOldPropertyValue != mProperty->value());
     }
 
-    // Reset our focus proxy and make sure that we get the focus (see
-    // editorOpened() above for the reason)
-
-    setFocusProxy(nullptr);
-    setFocus();
-
     // Reset some information about the property
 
     mProperty = nullptr;

src/plugins/miscellaneous/Core/src/propertyeditorwidget.h

@@ -444,6 +444,7 @@ class CORE_EXPORT PropertyEditorWidget : public TreeViewWidget
     Properties mProperties;
     Properties mAllProperties;
 
+    QString mOldPropertyValue;
     Property *mProperty = nullptr;
     QWidget *mPropertyEditor = nullptr;
 
@@ -472,8 +473,6 @@ private slots:
 
     void checkCheckState(QStandardItem *pItem);
 
-    void updateFocusProxy();
-
     void editorOpened(QWidget *pEditor);
     void editorClosed();
 

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp

@@ -900,6 +900,10 @@ static const char *OutputBrLn = "<br/>\n";
 
 void SimulationExperimentViewSimulationWidget::initialize(bool pReloading)
 {
+    // Keep track of the fact that we are reloading ourselves
+
+    mReloading = pReloading;
+
     // In the case of a SED-ML file and of a COMBINE archive, we will need
     // to further initialise ourselves, to customise graph panels, etc. (see
     // furtherInitialize()), so we ask our central widget to show its busy
@@ -2735,6 +2739,10 @@ void SimulationExperimentViewSimulationWidget::finalFurtherInitialize()
     mGraphPanelsWidgetSizes = mContentsWidget->graphPanelsWidget()->sizes();
 
     checkGraphPanelsAndGraphs();
+
+    // If we were reloading ourselves, then we can now reset mReloading to false
+
+    mReloading = false;
 }
 
 //==============================================================================
@@ -3257,11 +3265,13 @@ void SimulationExperimentViewSimulationWidget::simulationResultsReset()
     // Note: see clearSimulationResults() for the reason behind temporarily
     //       disabling updates...
 
-    setUpdatesEnabled(false);
-        updateSimulationMode();
+    QTimer::singleShot(0, this, [this]() {
+        setUpdatesEnabled(false);
+            updateSimulationMode();
 
-        mViewWidget->checkSimulationResults(mSimulation->fileName(), Task::ResetRuns);
-    setUpdatesEnabled(true);
+            mViewWidget->checkSimulationResults(mSimulation->fileName(), Task::ResetRuns);
+        setUpdatesEnabled(true);
+    });
 }
 
 //==============================================================================
@@ -3774,6 +3784,12 @@ void SimulationExperimentViewSimulationWidget::updateSimulationResults(Simulatio
                                                                        int pSimulationRun,
                                                                        Task pTask)
 {
+    // Don't update our simulation results if we are reloading ourselves
+
+    if (mReloading) {
+        return;
+    }
+
     // Update our simulation results
 
     SimulationSupport::Simulation *simulation = pSimulationWidget->simulation();

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.h

@@ -204,6 +204,7 @@ class SimulationExperimentViewSimulationWidget : public Core::Widget
 
     Core::ProgressBarWidget *mProgressBarWidget;
 
+    bool mReloading = false;
     int mProgress = -1;
     bool mLockedDevelopmentMode = false;