Merge 6f3e549 into 04e6628

doc/downloads/index.js

@@ -38,7 +38,7 @@ var jsonData = { "versions": [
                      ],
                      "changes": [
                        { "change": "<strong>General:</strong> added (initial) support for <a href=\"https://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>). A selectable plugin cannot be needed by another plugin (see issue <a href=\"https://github.com/opencor/opencor/issues/2247\">#2247</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>). Don't make our JupyterKernel and PythonShell plugins selectable (see issue <a href=\"https://github.com/opencor/opencor/issues/2245\">#2245</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>). Don't make our JupyterKernel and PythonShell plugins selectable (see issue <a href=\"https://github.com/opencor/opencor/issues/2245\">#2245</a>). Make sure that \"implementation\" and \"implementation_version\" are properly set in the JupyterKernel plugin (see issue <a href=\"https://github.com/opencor/opencor/issues/2250\">#2250</a>)." },
                        { "change": "<strong>CellML support:</strong> fixed an issue with the CellML API wrongly allowing code generation for non-runnable models (see issue <a href=\"https://github.com/opencor/opencor/issues/2240\">#2240</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 support:</strong> don't require all our solvers to be installed anymore (see issue <a href=\"https://github.com/opencor/opencor/issues/2234\">#2234</a>)." },

src/plugins/miscellaneous/JupyterKernel/kernels/OpenCOR/kernel.json.in

@@ -1,5 +1,5 @@
 {
     "argv": [ "@OPENCOR_COMMAND@", "-c", "JupyterKernel::kernel", "{connection_file}" ],
-    "display_name": "OpenCOR",
+    "display_name": "@CMAKE_PROJECT_NAME@",
     "language": "python"
 }

src/plugins/miscellaneous/JupyterKernel/src/jupyterkernelplugin.cpp

@@ -26,6 +26,10 @@ along with this program. If not, see <https://gnu.org/licenses>.
 
 //==============================================================================
 
+#include <QCoreApplication>
+
+//==============================================================================
+
 namespace OpenCOR {
 namespace JupyterKernel {
 
@@ -133,18 +137,20 @@ matplotlib.rcParamsOrig['backend'] = matplotlib.rcParams['backend']
 # Minimal customisation of the standard IPython kernel
 
 class OpenCORKernel(IPythonKernel):
-    implementation = 'OpenCOR'
-    implementation_version = '0.6'
+    implementation = '%1'
+    implementation_version = '%2'
     banner = "Jupyter kernel for OpenCOR"
 
 if __name__ == '__main__':
     from ipykernel.kernelapp import IPKernelApp
 
-    IPKernelApp.connection_file = '%1'
+    IPKernelApp.connection_file = '%3'
     IPKernelApp.launch_instance(kernel_class=OpenCORKernel)
 )PYTHON";
 
-    PythonQtSupport::evaluateScript(JupyterKernel.arg(QString(pArguments[0]).replace("\\", "\\\\")));
+    PythonQtSupport::evaluateScript(JupyterKernel.arg(qApp->applicationName(),
+                                                      qApp->applicationVersion(),
+                                                      QString(pArguments[0]).replace("\\", "\\\\")));
 
     return true;
 }