Move SceneCheckerVisitor out of the SceneChecking project into the core

Author: bakpaul

Sofa/framework/Simulation/Core/CMakeLists.txt

@@ -68,6 +68,7 @@ set(HEADER_FILES
     ${SRC_ROOT}/SceneCheckMainRegistry.h
     ${SRC_ROOT}/MappingGraph.h
     ${SRC_ROOT}/MappingGraphMechanicalOperations.h
+    ${SRC_ROOT}/SceneCheckerVisitor.h
 
     ${SRC_ROOT}/events/BuildConstraintSystemEndEvent.h
     ${SRC_ROOT}/events/SimulationInitDoneEvent.h
@@ -215,6 +216,7 @@ set(SOURCE_FILES
     ${SRC_ROOT}/init.cpp
     ${SRC_ROOT}/fwd.cpp
     ${SRC_ROOT}/BaseSimulationExporter.cpp
+    ${SRC_ROOT}/SceneCheckerVisitor.cpp
 
     ${SRC_ROOT}/events/BuildConstraintSystemEndEvent.cpp
     ${SRC_ROOT}/events/SimulationInitDoneEvent.cpp

…rc/SceneChecking/SceneCheckerVisitor.cpp …/sofa/simulation/SceneCheckerVisitor.cppapplications/projects/SceneChecking/src/SceneChecking/SceneCheckerVisitor.cpp renamed to Sofa/framework/Simulation/Core/src/sofa/simulation/SceneCheckerVisitor.cpp applications/projects/SceneChecking/src/SceneChecking/SceneCheckerVisitor.cpp renamed to Sofa/framework/Simulation/Core/src/sofa/simulation/SceneCheckerVisitor.cpp

@@ -19,12 +19,13 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include "SceneCheckerVisitor.h"
+#include <sofa/simulation/SceneCheckerVisitor.h>
 
-#include <algorithm>
 #include <sofa/simulation/Node.h>
 
-namespace sofa::_scenechecking_
+#include <algorithm>
+
+namespace sofa::simulation
 {
 using sofa::core::ExecParams ;
 
@@ -51,7 +52,7 @@ void SceneCheckerVisitor::removeCheck(sofa::simulation::SceneCheck::SPtr check)
     m_checkset.erase( std::remove( m_checkset.begin(), m_checkset.end(), check ), m_checkset.end() );
 }
 
-void SceneCheckerVisitor::validate(sofa::simulation::Node* node, simulation::SceneLoader* sceneLoader)
+void SceneCheckerVisitor::  validate(sofa::simulation::Node* node, simulation::SceneLoader* sceneLoader)
 {
     std::stringstream tmp;
     bool first = true;

…/src/SceneChecking/SceneCheckerVisitor.h …rc/sofa/simulation/SceneCheckerVisitor.happlications/projects/SceneChecking/src/SceneChecking/SceneCheckerVisitor.h renamed to Sofa/framework/Simulation/Core/src/sofa/simulation/SceneCheckerVisitor.h applications/projects/SceneChecking/src/SceneChecking/SceneCheckerVisitor.h renamed to Sofa/framework/Simulation/Core/src/sofa/simulation/SceneCheckerVisitor.h

@@ -21,7 +21,7 @@
 ******************************************************************************/
 #pragma once
 
-#include <SceneChecking/config.h>
+#include <sofa/simulation/config.h>
 #include <sofa/simulation/SceneCheck.h>
 #include <sofa/core/ExecParams.h>
 #include <sofa/simulation/SceneLoaderFactory.h>
@@ -31,10 +31,10 @@
 
 #include <sofa/simulation/Visitor.h>
 
-namespace sofa::_scenechecking_
+namespace sofa::simulation
 {
 
-class SOFA_SCENECHECKING_API SceneCheckerVisitor : public sofa::simulation::Visitor
+class SOFA_SIMULATION_CORE_API SceneCheckerVisitor : public sofa::simulation::Visitor
 {
 public:
     SceneCheckerVisitor(const sofa::core::ExecParams* params = sofa::core::execparams::defaultInstance()) ;
@@ -50,9 +50,4 @@ class SOFA_SCENECHECKING_API SceneCheckerVisitor : public sofa::simulation::Visi
     std::vector<sofa::simulation::SceneCheck::SPtr> m_checkset ;
 };
 
-} // namespace sofa::_scenechecking_
-
-namespace sofa::scenechecking
-{
-    using _scenechecking_::SceneCheckerVisitor;
-} // namespace sofa::scenechecking
+} // namespace sofa::simulation

applications/projects/SceneChecking/CMakeLists.txt

@@ -24,7 +24,6 @@ set(HEADER_FILES
     ${SCENECHECK_SRC_DIR}/SceneCheckSpecialCharacters.h
     ${SCENECHECK_SRC_DIR}/SceneCheckUsingAlias.h
     ${SCENECHECK_SRC_DIR}/SceneCheckerListener.h
-    ${SCENECHECK_SRC_DIR}/SceneCheckerVisitor.h
 )
 
 set(SOURCE_FILES
@@ -40,7 +39,6 @@ set(SOURCE_FILES
     ${SCENECHECK_SRC_DIR}/SceneCheckSpecialCharacters.cpp
     ${SCENECHECK_SRC_DIR}/SceneCheckUsingAlias.cpp
     ${SCENECHECK_SRC_DIR}/SceneCheckerListener.cpp
-    ${SCENECHECK_SRC_DIR}/SceneCheckerVisitor.cpp
 )
 
 add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES})

applications/projects/SceneChecking/src/SceneChecking/SceneCheckerListener.cpp

@@ -21,9 +21,9 @@
 ******************************************************************************/
 #include "SceneCheckerListener.h"
 
+#include <sofa/simulation/SceneCheckerVisitor.h>
 #include <sofa/simulation/Node.h>
 #include <sofa/simulation/SceneCheckMainRegistry.h>
-#include <SceneChecking/SceneCheckerVisitor.h>
 
 namespace sofa::_scenechecking_
 {
@@ -38,7 +38,7 @@ void SceneCheckerListener::rightAfterLoadingScene(sofa::simulation::Node::SPtr n
 {
     if(node.get())
     {
-        sofa::scenechecking::SceneCheckerVisitor sceneCheckerVisitor;
+        sofa::simulation::SceneCheckerVisitor sceneCheckerVisitor;
 
         for (const auto& sceneCheck : sofa::simulation::SceneCheckMainRegistry::getRegisteredSceneChecks())
         {