X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCalc%2Fgui%2FXmedConsoleDriver.cxx;h=c744310651fd4a91741059014b312c0bb280548f;hb=HEAD;hp=bef4ef3751dbe93d14d71b4160533e8b832b9bfb;hpb=e417eb14540b5836898a72890f924ca575af3b3b;p=modules%2Fmed.git

diff --git a/src/MEDCalc/gui/XmedConsoleDriver.cxx b/src/MEDCalc/gui/XmedConsoleDriver.cxx
index bef4ef375..c74431065 100644
--- a/src/MEDCalc/gui/XmedConsoleDriver.cxx
+++ b/src/MEDCalc/gui/XmedConsoleDriver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2011-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -18,13 +18,20 @@
 //
 // Author : Guillaume Boulant (EDF)
 
+#include "MEDModule.hxx"
 #include "XmedConsoleDriver.hxx"
 #include "Utils_SALOME_Exception.hxx"
+#include "MEDCommandsHistoryManager_i.hxx"
+#include "MEDFactoryClient.hxx"
+#include CORBA_CLIENT_HEADER(MED_Gen)
+#include CORBA_CLIENT_HEADER(MEDCommandsHistoryManager)
+#include <iostream>
 
-XmedConsoleDriver::XmedConsoleDriver(SalomeApp_Application * application) {
-
+XmedConsoleDriver::XmedConsoleDriver(MEDModule* salomeModule)
+{
+  _salomeModule = salomeModule;
   bool forcePythonConsole = true;
-  _pyConsole = application->pythonConsole(forcePythonConsole);
+  _pyConsole = _salomeModule->getApp()->pythonConsole(forcePythonConsole);
   if ( !_pyConsole ) {
     const char * msg = "The python console can't be obtained from the SALOME application";
     throw SALOME_Exception(msg);
@@ -42,17 +49,6 @@ void XmedConsoleDriver::setup() {
 
   if ( !_importXmedDone ) {
     QStringList commands;
-    /*
-    // First import xmed to initialize the main objects, in particular
-    // the corba pointer to the event listener.
-    commands+="import xmed";
-    // Set the globals dictionnary so that the fields tools work properly.
-    commands+="xmed.setConsoleGlobals(globals())";
-    // Import the tools required for field operations
-    commands+="from xmed import load, get, put, dup, ls, la, save, view, doc, wipe, remove, clean";
-    // A last one to clear the console screen
-    //commands+="wipe";
-    */
 #ifndef DISABLE_PVVIEWER
     // start PVServer and show render view
     commands+="import pvsimple as pvs";
@@ -65,7 +61,7 @@ void XmedConsoleDriver::setup() {
     commands += "";
     commands += "from medcalc.medconsole import saveWorkspace, cleanWorkspace";
     commands += "from medcalc.medconsole import putInWorkspace, removeFromWorkspace";
-    commands += "from medcalc.medconsole import accessField";
+    commands += "from medcalc.medconsole import accessField, view";
     commands += "from medcalc.medconsole import getEnvironment, ls, la";
     commands += "";
     this->exec(commands);
@@ -77,9 +73,13 @@ void XmedConsoleDriver::setup() {
  * This function sends the specified list of commands to the console.
  */
 void XmedConsoleDriver::exec(const QStringList& commands) {
+  MEDCALC::MEDCommandsHistoryManager_ptr history = MEDFactoryClient::getCommandsHistoryManager();
+
   QStringListIterator it(commands);
   while (it.hasNext()) {
-    _pyConsole->exec(it.next());
+    const QString& command = it.next();
+    _pyConsole->exec(command);
+    // store command in history
+    history->addCommand(command.toStdString().c_str());
   }
-  this->_history.append(commands);
 }