Merge 373d1d4 into bbd473b

opencor · Nov 27, 2019 · 6b7407a · 6b7407a
2 parents bbd473b + 373d1d4
commit 6b7407a
Show file tree

Hide file tree

Showing 33 changed files with 1,191 additions and 1,159 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -400,8 +400,8 @@ if(USE_PREBUILT_PYTHON_AND_QTWEBKIT_PACKAGES)
     if(WIN32)
         set(ICU_VERSION 57)
     elseif(NOT APPLE)
-        add_subdirectory(${PLATFORM_DISTRIB_DIR}/icu)
-        add_subdirectory(${PLATFORM_DISTRIB_DIR}/mesa)
+        add_subdirectory(src/3rdparty/linux/icu)
+        add_subdirectory(src/3rdparty/linux/mesa)
     endif()
 endif()
 
@@ -1278,8 +1278,6 @@ endif()
 
 # Package OpenCOR
 
-set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME ${CMAKE_PROJECT_NAME})
-
 set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
 set(CPACK_PACKAGE_CONTACT "Team OpenCOR (team@opencor.ws)")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
@@ -1430,6 +1428,8 @@ if(WIN32)
 elseif(APPLE)
     # Select productbuild and ZIP as the packagers on macOS
 
+    set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME ${CMAKE_PROJECT_NAME})
+
     set(CPACK_GENERATOR productbuild ZIP)
     set(CPACK_SYSTEM_NAME "macOS")
     set(CPACK_PROJECT_CONFIG_FILE ${PLATFORM_DISTRIB_DIR}/package.cmake)

diff --git a/cmake/common.cmake b/cmake/common.cmake
@@ -99,6 +99,7 @@ macro(update_language_files TARGET_NAME)
         if(EXISTS ${PROJECT_SOURCE_DIR}/${TS_FILE})
             execute_process(COMMAND ${QT_BINARY_DIR}/lupdate -no-obsolete ${INPUT_FILES}
                                                              -ts ${TS_FILE}
+                                                             -I ${CMAKE_SOURCE_DIR}/src/misc
                             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
                             OUTPUT_QUIET)
             execute_process(COMMAND ${QT_BINARY_DIR}/lrelease ${PROJECT_SOURCE_DIR}/${TS_FILE}

diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -38,7 +38,7 @@ var jsonData = { "versions": [
                      ],
                      "changes": [
                        { "change": "<strong>General:</strong> added (initial) support for <a href=\"https://www.python.org/\">Python</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/1255\">#1255</a>). Replaced our use of <a href=\"https://developer.apple.com/library/archive/documentation/DeveloperTools/Conceptual/PackageMakerUserGuide/Introduction/Introduction.html\">PackageMaker</a> with that of productbuild on <a href=\"https://en.wikipedia.org/wiki/MacOS\">macOS</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/2210\">#2210</a>)." },
-                       { "change": "<strong>Python support:</strong> update the PATH using <code>\\</code> rather than <code>/</code> on Windows (see issue <a href=\"https://github.com/opencor/opencor/issues/2219\">#2219</a>)." },
+                       { "change": "<strong>Python support:</strong> now update the environment variable <code>PATH</code> using <code>\\</code> rather than <code>/</code> on Windows (see issue <a href=\"https://github.com/opencor/opencor/issues/2219\">#2219</a>). Merged our duplicated code (see issue <a href=\"https://github.com/opencor/opencor/issues/2225\">#2225</a>)." },
                        { "change": "<strong>SED-ML support:</strong> added support left and right triangle symbols (see issue <a href=\"https://github.com/opencor/opencor/issues/2173\">#2173</a>)." },
                        { "change": "<strong>Simulation Experiment view:</strong> properly handle the Graph Panel properties (see issue <a href=\"https://github.com/opencor/opencor/issues/2171\">#2171</a>). Make sure that curves are plotted with all of their original settings when reloading a SED-ML file (see issue <a href=\"https://github.com/opencor/opencor/issues/2176\">#2176</a>). Make sure that all of a solver's properties get saved to a SED-ML file (see issue <a href=\"https://github.com/opencor/opencor/issues/2185\">#2185</a>)." },
                        { "change": "<strong>Third-party libraries:</strong> upgraded the <a href=\"https://www.openssl.org/\">OpenSSL</a> library to version 1.1.1d (see issue <a href=\"https://github.com/opencor/opencor/issues/2157\">#2157</a>). Upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 9.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2161\">#2161</a>). Upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 5.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2198\">#2198</a>). Upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.11.3 (see issue <a href=\"https://github.com/opencor/opencor/issues/2208\">#2208</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 19.2.6 (see issue <a href=\"https://github.com/opencor/opencor/issues/2230\">#2230</a>)." }

diff --git a/i18n/OpenCOR_fr.ts b/i18n/OpenCOR_fr.ts
@@ -361,5 +361,117 @@
         <source>%1 is a cross-platform modelling environment, which can be used to organise, edit, simulate and analyse &lt;a href=&quot;http://www.cellml.org/&quot;&gt;CellML&lt;/a&gt; files.</source>
         <translation>%1 est un environnement de modélisation multiplate-forme, qui peut être utilisé pour organiser, éditer, simuler et analyser des fichiers &lt;a href=&quot;http://www.cellml.org/&quot;&gt;CellML&lt;/a&gt;.</translation>
     </message>
+    <message>
+        <source>Sample</source>
+        <translation>Exemple</translation>
+    </message>
+    <message>
+        <source>Test</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Invalid</source>
+        <translation>Invalide</translation>
+    </message>
+    <message>
+        <source>Data store</source>
+        <translation>Magasin de données</translation>
+    </message>
+    <message>
+        <source>Editing</source>
+        <translation>Édition</translation>
+    </message>
+    <message>
+        <source>Miscellaneous</source>
+        <translation>Divers</translation>
+    </message>
+    <message>
+        <source>Organisation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Simulation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Solver</source>
+        <translation>Solveur</translation>
+    </message>
+    <message>
+        <source>Support</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Third-party</source>
+        <translation>Externe</translation>
+    </message>
+    <message>
+        <source>Tools</source>
+        <translation>Outils</translation>
+    </message>
+    <message>
+        <source>Widget</source>
+        <translation>Gadget</translation>
+    </message>
+    <message>
+        <source>Plugins that illustrate various plugin-related aspects.</source>
+        <translation>Extensions qui illustrent diverses fonctionalités relatives à une extension.</translation>
+    </message>
+    <message>
+        <source>Plugins to test things.</source>
+        <translation>Extensions pour tester des choses.</translation>
+    </message>
+    <message>
+        <source>Plugins that are not valid.</source>
+        <translation>Extensions qui ne sont pas valides.</translation>
+    </message>
+    <message>
+        <source>Plugins to store and manipulate data.</source>
+        <translation>Extensions pour stocker et manipuler des données.</translation>
+    </message>
+    <message>
+        <source>Plugins to edit files.</source>
+        <translation>Extensions pour éditer des fichiers.</translation>
+    </message>
+    <message>
+        <source>Plugins that do not fit in any other category.</source>
+        <translation>Extensions qui n&apos;entrent dans aucune autre catégorie.</translation>
+    </message>
+    <message>
+        <source>Plugins to organise files.</source>
+        <translation>Extensions pour organiser des fichiers.</translation>
+    </message>
+    <message>
+        <source>Plugins to simulate files.</source>
+        <translation>Extensions pour simuler des fichiers.</translation>
+    </message>
+    <message>
+        <source>Plugins to access various solvers.</source>
+        <translation>Extensions pour accéder différents solveurs.</translation>
+    </message>
+    <message>
+        <source>Plugins to support various third-party libraries.</source>
+        <translation>Extensions pour supporter différentes librairies externes.</translation>
+    </message>
+    <message>
+        <source>Plugins to access various third-party libraries.</source>
+        <translation>Extensions pour accéder différentes librairies externes.</translation>
+    </message>
+    <message>
+        <source>Plugins to access various tools.</source>
+        <translation>Extensions pour accéder différents outils.</translation>
+    </message>
+    <message>
+        <source>Plugins to access various &lt;em&gt;ad hoc&lt;/em&gt; widgets.</source>
+        <translation>Extensions pour accéder différents gadgets &lt;em&gt;ad hoc&lt;/em&gt;.</translation>
+    </message>
+    <message>
+        <source>No Internet connection available.</source>
+        <translation>Aucune connexion Internet disponible.</translation>
+    </message>
+    <message>
+        <source>Copyright</source>
+        <translation>Tous droits réservés</translation>
+    </message>
 </context>
 </TS>
diff --git a/distrib/linux/icu/CMakeLists.txt → src/3rdparty/linux/icu/CMakeLists.txt b/distrib/linux/icu/CMakeLists.txt → src/3rdparty/linux/icu/CMakeLists.txt
diff --git a/distrib/linux/mesa/CMakeLists.txt → src/3rdparty/linux/mesa/CMakeLists.txt b/distrib/linux/mesa/CMakeLists.txt → src/3rdparty/linux/mesa/CMakeLists.txt
diff --git a/distrib/linux/mesa/README.rst → src/3rdparty/linux/mesa/README.rst b/distrib/linux/mesa/README.rst → src/3rdparty/linux/mesa/README.rst
diff --git a/src/misc/cliutils.cpp b/src/misc/cliutils.cpp
@@ -45,7 +45,7 @@ namespace OpenCOR {
 
 //==============================================================================
 
-#include "corecliutils.cpp.inl"
+#include "cliutils.cpp.inl"
 
 //==============================================================================
 

diff --git a/...scellaneous/Core/src/corecliutils.cpp.inl → src/misc/cliutils.cpp.inl b/...scellaneous/Core/src/corecliutils.cpp.inl → src/misc/cliutils.cpp.inl
diff --git a/src/misc/cliutils.h b/src/misc/cliutils.h
@@ -44,7 +44,7 @@ namespace OpenCOR {
 
 //==============================================================================
 
-#include "corecliutils.h.inl"
+#include "cliutils.h.inl"
 
 //==============================================================================
 

diff --git a/...miscellaneous/Core/src/corecliutils.h.inl → src/misc/cliutils.h.inl b/...miscellaneous/Core/src/corecliutils.h.inl → src/misc/cliutils.h.inl
diff --git a/src/misc/closesimulation.cpp.inl b/src/misc/closesimulation.cpp.inl
@@ -0,0 +1,40 @@
+static PyObject * closeSimulation(PyObject *pSelf, PyObject *pArgs)
+{
+    Q_UNUSED(pSelf)
+
+    // Close a simulation
+
+    if (PyTuple_Size(pArgs) > 0) {
+#include "pythonbegin.h"
+        PythonQtInstanceWrapper *wrappedSimulation = PythonQtSupport::getInstanceWrapper(PyTuple_GET_ITEM(pArgs, 0)); // NOLINT(cppcoreguidelines-pro-type-cstyle-cast)
+#include "pythonend.h"
+
+        if (wrappedSimulation != nullptr) {
+#ifdef GUI_SUPPORT
+            // Close the simulation by closing its file, raising an exception if
+            // we were unable to do so
+
+            auto simulation = static_cast<SimulationSupport::Simulation *>(wrappedSimulation->_objPointerCopy);
+
+            if (!Core::centralWidget()->closeFile(simulation->fileName())) {
+                PyErr_SetString(PyExc_IOError, qPrintable(QObject::tr("unable to close the simulation")));
+
+                return nullptr;
+            }
+#else
+            // Close the simulation by asking our file and simulation managers
+            // to umanage it
+
+            auto simulation = static_cast<SimulationSupport::Simulation *>(wrappedSimulation->_objPointerCopy);
+            QString fileName = simulation->fileName();
+
+            Core::FileManager::instance()->unmanage(fileName);
+            SimulationManager::instance()->unmanage(fileName);
+#endif
+        }
+    }
+
+#include "pythonbegin.h"
+    Py_RETURN_NONE;
+#include "pythonend.h"
+}