Placing MessageHandlers (Console and PerComponent) in SofaRuntime.init()

Author: marques-bruno

bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp

@@ -29,11 +29,6 @@ along with sofaqtquick. If not, see <http://www.gnu.org/licenses/>.
 #include <sofa/helper/logging/Messaging.h>
 using sofa::helper::logging::Message;
 
-#include <sofa/core/logging/PerComponentLoggingMessageHandler.h>
-using sofa::helper::logging::MessageDispatcher;
-using sofa::helper::logging::MainPerComponentLoggingMessageHandler;
-
-
 #include <sofa/core/objectmodel/BaseNode.h>
 #include <sofa/core/objectmodel/BaseContext.h>
 #include <sofa/core/behavior/BaseForceField.h>
@@ -113,8 +108,6 @@ PYBIND11_MODULE(Core, core)
                #Sofa.Core.WriteAccessor
        )doc";
 
-    MessageDispatcher::addHandler(&MainPerComponentLoggingMessageHandler::getInstance()) ;
-
     moduleAddPythonScriptEvent();
     moduleAddDataDict(core);
     moduleAddDataDictIterator(core);
@@ -132,12 +125,10 @@ PYBIND11_MODULE(Core, core)
     moduleAddDataEngine(core);
     moduleAddForceField(core);
     moduleAddObjectFactory(core);
-
     moduleAddNode(core);
     moduleAddNodeIterator(core);
     moduleAddPrefab(core);
     moduleAddBaseLink(core);
-
 }
 
 } ///namespace sofapython3

bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation.cpp

@@ -41,8 +41,10 @@ using sofa::simulation::Simulation;
 
 #include <sofa/core/visual/VisualParams.h>
 #include <sofa/helper/logging/MessageDispatcher.h>
-using sofa::helper::logging::MessageDispatcher;
 #include <sofa/helper/logging/ConsoleMessageHandler.h>
+#include <sofa/core/logging/PerComponentLoggingMessageHandler.h>
+using sofa::helper::logging::MessageDispatcher;
+using sofa::helper::logging::MainPerComponentLoggingMessageHandler;
 #include "Submodule_Simulation_doc.h"
 
 namespace py = pybind11;
@@ -59,11 +61,7 @@ PYBIND11_MODULE(Simulation, simulation)
 
     simulation.def("print", [](Node* n){ sofa::simulation::getSimulation()->print(n); }, sofapython3::doc::simulation::print);
     simulation.def("animate", [](Node* n, SReal dt=0.0){ sofa::simulation::getSimulation()->animate(n, dt); },sofapython3::doc::simulation::animate);
-    simulation.def("init", [](Node* n){
-	sofa::simulation::getSimulation()->init(n);
-	MessageDispatcher::clearHandlers();
-	MessageDispatcher::addHandler(new sofa::helper::logging::ConsoleMessageHandler());
-      }, sofapython3::doc::simulation::init);
+    simulation.def("init", [](Node* n) { sofa::simulation::getSimulation()->init(n); }, sofapython3::doc::simulation::init);
     simulation.def("initVisual", [](Node* n){ n->getVisualLoop()->initStep(sofa::core::visual::VisualParams::defaultInstance()); });
     simulation.def("reset", [](Node* n){ sofa::simulation::getSimulation()->reset(n); }, sofapython3::doc::simulation::reset);
     simulation.def("load", [](const std::string & name) {

bindings/SofaRuntime/src/SofaPython3/SofaRuntime/Module_SofaRuntime.cpp

@@ -65,6 +65,13 @@ using sofapython3::SceneLoaderPY3;
 
 #include <SofaPython3/DataHelper.h>
 
+#include <sofa/helper/logging/MessageDispatcher.h>
+#include <sofa/helper/logging/ConsoleMessageHandler.h>
+#include <sofa/core/logging/PerComponentLoggingMessageHandler.h>
+using sofa::helper::logging::MessageDispatcher;
+using sofa::helper::logging::MainPerComponentLoggingMessageHandler;
+using sofa::helper::logging::MainConsoleMessageHandler;
+
 namespace sofapython3
 {
 
@@ -130,6 +137,12 @@ PYBIND11_MODULE(SofaRuntime, m) {
         return simpleapi::importPlugin(name);
     }, "import a sofa plugin into the current environment");
 
+    m.def("init", []() {
+        MessageDispatcher::clearHandlers();
+        MessageDispatcher::addHandler(&MainConsoleMessageHandler::getInstance());
+        MessageDispatcher::addHandler(&MainPerComponentLoggingMessageHandler::getInstance());
+    });
+
     m.add_object("DataRepository", py::cast(&sofa::helper::system::DataRepository));
     m.add_object("PluginRepository", py::cast(&sofa::helper::system::PluginRepository));