Refactor paths regarding new SOFA Standard

sofa-framework · Mar 25, 2024 · ca30479 · ca30479
1 parent 58034a4
commit ca30479
Show file tree

Hide file tree

Showing 24 changed files with 52 additions and 57 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,7 @@ add_compile_options(-Wall -Wextra -Wpedantic)
 find_package(Sofa.Framework REQUIRED) # Needed to use SofaCore, SofaHelper and SofaDefaultType
 find_package(Sofa.Component.Topology REQUIRED) # Needed to use SofaCore, SofaHelper and SofaDefaultType
 find_package(Sofa.Component.StateContainer REQUIRED) # Needed to use SofaCore, SofaHelper and SofaDefaultType
+find_package(Sofa.GUI.Component REQUIRED) # Needed to use SofaCore, SofaHelper and SofaDefaultType
 find_package(Threads REQUIRED)
 
 find_package(OpenIGTLink QUIET) # Needed to use SofaCore, SofaHelper and SofaDefaultType
@@ -34,7 +35,7 @@ file(GLOB_RECURSE SOURCE_FILES
 
 # SOFA plugin are basically libraries
 add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES})
-target_link_libraries(${PROJECT_NAME} Sofa.Framework Sofa.Component.Topology Sofa.Component.StateContainer OpenIGTLink Threads::Threads)
+target_link_libraries(${PROJECT_NAME} Sofa.Framework Sofa.Component.Topology Sofa.Component.StateContainer OpenIGTLink Threads::Threads Sofa.GUI.Component)
 include_directories(src)
 
 

diff --git a/src/SofaIGTLink/initSofaIGTLinkPlugin.cpp → src/sofa/igtlink/initSofaIGTLinkPlugin.cpp b/src/SofaIGTLink/initSofaIGTLinkPlugin.cpp → src/sofa/igtlink/initSofaIGTLinkPlugin.cpp
@@ -17,13 +17,13 @@ extern "C"
         }
     }
 
-    const char* getModuleName() { return "SofaSlicer"; }
+    const char* getModuleName() { return "SofaIGTLink"; }
 
     const char* getModuleVersion() { return "0.0"; }
 
     const char* getModuleLicense() { return "Private"; }
 
-    const char* getModuleDescription() { return "Sofa integration to Slicer"; }
+    const char* getModuleDescription() { return "Bridge from SOFA to IGTLink"; }
 
     const char* getModuleComponentList()
     {

diff --git a/src/SofaIGTLink/messages/iGTLinkMessage.cpp → src/sofa/igtlink/messages/iGTLinkMessage.cpp b/src/SofaIGTLink/messages/iGTLinkMessage.cpp → src/sofa/igtlink/messages/iGTLinkMessage.cpp
@@ -1,9 +1,9 @@
 #pragma once
-#include <SofaIGTLink/messages/iGTLinkMessage.h>
+#include <sofa/igtlink/messages/iGTLinkMessage.h>
 
 
 using namespace sofa::core::objectmodel;
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
 
     iGTLinkMessage::iGTLinkMessage()

diff --git a/src/SofaIGTLink/messages/iGTLinkMessage.h → src/sofa/igtlink/messages/iGTLinkMessage.h b/src/SofaIGTLink/messages/iGTLinkMessage.h → src/sofa/igtlink/messages/iGTLinkMessage.h
@@ -6,11 +6,11 @@
 #include "sofa/core/objectmodel/Link.h"
 #include "sofa/core/objectmodel/DataCallback.h"
 #include <igtlMessageBase.h>
-#include <SofaIGTLink/sockets/iGTLinkBase.h>
+#include <sofa/igtlink/sockets/iGTLinkBase.h>
 
 
 using namespace sofa::core::objectmodel;
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
 
     class iGTLinkMessageBase : public BaseObject

diff --git a/...aIGTLink/messages/iGTLinkPointMessage.cpp → .../igtlink/messages/iGTLinkPointMessage.cpp b/...aIGTLink/messages/iGTLinkPointMessage.cpp → .../igtlink/messages/iGTLinkPointMessage.cpp
@@ -1,11 +1,11 @@
 #pragma once
 
 #include "sofa/core/ObjectFactory.h"
-#include <SofaIGTLink/messages/iGTLinkPointMessage.h>
+#include <sofa/igtlink/messages/iGTLinkPointMessage.h>
 #include <igtlPointMessage.h>
 
 using namespace sofa::core::objectmodel;
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
 template<class DataType>
 iGTLinkPointMessage<DataType>::iGTLinkPointMessage()

diff --git a/...ofaIGTLink/messages/iGTLinkPointMessage.h → ...fa/igtlink/messages/iGTLinkPointMessage.h b/...ofaIGTLink/messages/iGTLinkPointMessage.h → ...fa/igtlink/messages/iGTLinkPointMessage.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <SofaIGTLink/messages/iGTLinkMessage.h>
+#include <sofa/igtlink/messages/iGTLinkMessage.h>
 
 using namespace sofa::core::objectmodel;
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
     template<class DataType>
     class iGTLinkPointMessage : public iGTLinkMessage

diff --git a/...TLink/messages/iGTLinkPolyDataMessage.cpp → ...tlink/messages/iGTLinkPolyDataMessage.cpp b/...TLink/messages/iGTLinkPolyDataMessage.cpp → ...tlink/messages/iGTLinkPolyDataMessage.cpp
@@ -1,11 +1,11 @@
 #pragma once
 
 #include "sofa/core/ObjectFactory.h"
-#include <SofaIGTLink/messages/iGTLinkPolyDataMessage.h>
+#include <sofa/igtlink/messages/iGTLinkPolyDataMessage.h>
 
 
 using namespace sofa::core::objectmodel;
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
 template<class DataType>
 iGTLinkPolyDataMessage<DataType>::iGTLinkPolyDataMessage()

diff --git a/...IGTLink/messages/iGTLinkPolyDataMessage.h → ...igtlink/messages/iGTLinkPolyDataMessage.h b/...IGTLink/messages/iGTLinkPolyDataMessage.h → ...igtlink/messages/iGTLinkPolyDataMessage.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <SofaIGTLink/messages/iGTLinkMessage.h>
+#include <sofa/igtlink/messages/iGTLinkMessage.h>
 #include <sofa/core/topology/BaseMeshTopology.h>
 #include <igtlPolyDataMessage.h>
 
 using namespace sofa::core::objectmodel;
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
     template<class DataType>
     class iGTLinkPolyDataMessage : public iGTLinkMessage

diff --git a/src/SofaIGTLink/sockets/iGTLinkBase.cpp → src/sofa/igtlink/sockets/iGTLinkBase.cpp b/src/SofaIGTLink/sockets/iGTLinkBase.cpp → src/sofa/igtlink/sockets/iGTLinkBase.cpp
@@ -1,9 +1,9 @@
-#include <SofaIGTLink/sockets/iGTLinkBase.h>
-#include <SofaIGTLink/messages/iGTLinkMessage.h>
-#include <SofaIGTLink/sockets/iGTLinkThread.h>
+#include <sofa/igtlink/sockets/iGTLinkBase.h>
+#include <sofa/igtlink/messages/iGTLinkMessage.h>
+#include <sofa/igtlink/sockets/iGTLinkThread.h>
 
 
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
     iGTLinkBase::iGTLinkBase()
     : d_timeout(initData(&d_timeout,-1,"timeout","Timeout in milliseconds"))

diff --git a/src/SofaIGTLink/sockets/iGTLinkBase.h → src/sofa/igtlink/sockets/iGTLinkBase.h b/src/SofaIGTLink/sockets/iGTLinkBase.h → src/sofa/igtlink/sockets/iGTLinkBase.h
@@ -8,7 +8,7 @@
 
 using namespace sofa::core::objectmodel;
 
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
     class iGTLinkMessageBase;
     class iGTLinkReceiverThread;

diff --git a/src/SofaIGTLink/sockets/iGTLinkClient.cpp → src/sofa/igtlink/sockets/iGTLinkClient.cpp b/src/SofaIGTLink/sockets/iGTLinkClient.cpp → src/sofa/igtlink/sockets/iGTLinkClient.cpp
@@ -1,9 +1,9 @@
 #define SOFASLICER_IGTCLIENT_CPP
 
 #include <sofa/core/ObjectFactory.h>
-#include <SofaIGTLink/sockets/iGTLinkClient.inl>
+#include <sofa/igtlink/sockets/iGTLinkClient.inl>
 
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
 
 static int iGTLinkClientClass = sofa::core::RegisterObject("iGTLink client wrapper")

diff --git a/src/SofaIGTLink/sockets/iGTLinkClient.h → src/sofa/igtlink/sockets/iGTLinkClient.h b/src/SofaIGTLink/sockets/iGTLinkClient.h → src/sofa/igtlink/sockets/iGTLinkClient.h
@@ -5,11 +5,11 @@
 
 #include <igtlOSUtil.h>
 #include <igtlPointMessage.h>
-#include <SofaIGTLink/sockets/iGTLinkBase.h>
+#include <sofa/igtlink/sockets/iGTLinkBase.h>
 
 using namespace sofa::core::objectmodel;
 
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
     class iGTLinkClient : public iGTLinkBase
     {

diff --git a/src/SofaIGTLink/sockets/iGTLinkClient.inl → src/sofa/igtlink/sockets/iGTLinkClient.inl b/src/SofaIGTLink/sockets/iGTLinkClient.inl → src/sofa/igtlink/sockets/iGTLinkClient.inl
@@ -1,8 +1,8 @@
 #pragma once
-#include <SofaIGTLink/sockets/iGTLinkClient.h>
+#include <sofa/igtlink/sockets/iGTLinkClient.h>
 
 
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
 
 iGTLinkClient::iGTLinkClient()

diff --git a/src/SofaIGTLink/sockets/iGTLinkServer.cpp → src/sofa/igtlink/sockets/iGTLinkServer.cpp b/src/SofaIGTLink/sockets/iGTLinkServer.cpp → src/sofa/igtlink/sockets/iGTLinkServer.cpp
@@ -1,9 +1,9 @@
 #define SOFASLICER_IGTServer_CPP
 
 #include <sofa/core/ObjectFactory.h>
-#include <SofaIGTLink/sockets/iGTLinkServer.inl>
+#include <sofa/igtlink/sockets/iGTLinkServer.inl>
 
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
 
     static int iGTLinkServerClass = sofa::core::RegisterObject("iGTLink Server wrapper")

diff --git a/src/SofaIGTLink/sockets/iGTLinkServer.h → src/sofa/igtlink/sockets/iGTLinkServer.h b/src/SofaIGTLink/sockets/iGTLinkServer.h → src/sofa/igtlink/sockets/iGTLinkServer.h
@@ -7,12 +7,12 @@
 #include <igtlOSUtil.h>
 #include <igtlPointMessage.h>
 #include <igtlServerSocket.h>
-#include <SofaIGTLink/sockets/iGTLinkBase.h>
-#include <SofaIGTLink/messages/iGTLinkMessage.h>
+#include <sofa/igtlink/sockets/iGTLinkBase.h>
+#include <sofa/igtlink/messages/iGTLinkMessage.h>
 
 using namespace sofa::core::objectmodel;
 
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
     class iGTLinkServer : public iGTLinkBase
     {

diff --git a/src/SofaIGTLink/sockets/iGTLinkServer.inl → src/sofa/igtlink/sockets/iGTLinkServer.inl b/src/SofaIGTLink/sockets/iGTLinkServer.inl → src/sofa/igtlink/sockets/iGTLinkServer.inl
@@ -1,11 +1,11 @@
 #pragma once
-#include <SofaIGTLink/sockets/iGTLinkServer.h>
+#include <sofa/igtlink/sockets/iGTLinkServer.h>
 #include <sofa/simulation/AnimateBeginEvent.h>
-#include <SofaIGTLink/sockets/iGTLinkThread.h>
+#include <sofa/igtlink/sockets/iGTLinkThread.h>
 #include <map>
 
 
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
 
 iGTLinkServer::iGTLinkServer()

diff --git a/src/SofaIGTLink/sockets/iGTLinkThread.cpp → src/sofa/igtlink/sockets/iGTLinkThread.cpp b/src/SofaIGTLink/sockets/iGTLinkThread.cpp → src/sofa/igtlink/sockets/iGTLinkThread.cpp
@@ -1,9 +1,9 @@
-#include <SofaIGTLink/sockets/iGTLinkBase.h>
-#include <SofaIGTLink/sockets/iGTLinkThread.h>
+#include <sofa/igtlink/sockets/iGTLinkBase.h>
+#include <sofa/igtlink/sockets/iGTLinkThread.h>
 #include <igtlPointMessage.h>
 #include <igtlPolyDataMessage.h>
 
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
 
 

diff --git a/src/SofaIGTLink/sockets/iGTLinkThread.h → src/sofa/igtlink/sockets/iGTLinkThread.h b/src/SofaIGTLink/sockets/iGTLinkThread.h → src/sofa/igtlink/sockets/iGTLinkThread.h
@@ -5,13 +5,13 @@
 #include <memory>
 #include <atomic>
 #include <mutex>
-#include <SofaIGTLink/messages/iGTLinkMessage.h>
+#include <sofa/igtlink/messages/iGTLinkMessage.h>
 #include <sofa/core/objectmodel/Data.h>
 
 class iGTLinkBase;
 using namespace sofa::core::objectmodel;
 
-namespace SofaSlicer::openigtlink
+namespace sofa::openigtlink
 {
     class iGTLinkBaseThread
     {

diff --git a/src/SofaIGTLink/utils/EngineToMState.cpp → src/sofa/igtlink/utils/EngineToMState.cpp b/src/SofaIGTLink/utils/EngineToMState.cpp → src/sofa/igtlink/utils/EngineToMState.cpp
@@ -1,9 +1,7 @@
-#include <SofaIGTLink/utils/EngineToMState.inl>
+#include <sofa/igtlink/utils/EngineToMState.inl>
 #include <sofa/core/ObjectFactory.h>
 
-namespace sofa {
-
-namespace registrationcst {
+namespace sofa::openigtlink {
 
 SOFA_DECL_CLASS(EngineToMState)
 
@@ -13,5 +11,4 @@ int EngineToMStateClass = core::RegisterObject("")
 
 }
 
-}
 
diff --git a/src/SofaIGTLink/utils/EngineToMState.h → src/sofa/igtlink/utils/EngineToMState.h b/src/SofaIGTLink/utils/EngineToMState.h → src/sofa/igtlink/utils/EngineToMState.h
@@ -15,9 +15,7 @@
 #include <sofa/core/behavior/MechanicalState.h>
 #include <sofa/core/objectmodel/DataCallback.h>
 
-namespace sofa {
-
-namespace registrationcst {
+namespace sofa::openigtlink {
 
 template<class DataTypes>
 class EngineToMState : public core::objectmodel::BaseObject {
@@ -45,4 +43,3 @@ public :
 
 }
 
-}
diff --git a/src/SofaIGTLink/utils/EngineToMState.inl → src/sofa/igtlink/utils/EngineToMState.inl b/src/SofaIGTLink/utils/EngineToMState.inl → src/sofa/igtlink/utils/EngineToMState.inl
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <SofaIGTLink/utils/EngineToMState.h>
+#include <sofa/igtlink/utils/EngineToMState.h>
 #include <sofa/core/visual/VisualParams.h>
 #include <sofa/type/Quat.h>
 #include <sofa/simulation/AnimateBeginEvent.h>
 #include <sofa/component/statecontainer/MechanicalObject.h>
 
 
-namespace sofa {
 
-namespace registrationcst {
+
+namespace sofa::openigtlink {
 
 using namespace core::behavior;
 using namespace sofa::type;
@@ -80,5 +80,5 @@ void EngineToMState<DataTypes>::handleEvent(sofa::core::objectmodel::Event *even
 
 }
 
-}
+
 }
diff --git a/...TLink/utils/UserInteractionController.cpp → ...tlink/utils/UserInteractionController.cpp b/...TLink/utils/UserInteractionController.cpp → ...tlink/utils/UserInteractionController.cpp
@@ -1,7 +1,7 @@
-#include <SofaIGTLink/utils/UserInteractionController.inl>
+#include <sofa/igtlink/utils/UserInteractionController.inl>
 #include <sofa/core/ObjectFactory.h>
 
-namespace SofaSlicer {
+namespace sofa::openigtlink {
 
 int UserInteractionControllerClass = sofa::core::RegisterObject("")
 .add<UserInteractionController>();

diff --git a/...IGTLink/utils/UserInteractionController.h → ...igtlink/utils/UserInteractionController.h b/...IGTLink/utils/UserInteractionController.h → ...igtlink/utils/UserInteractionController.h
@@ -9,7 +9,7 @@
 
 using namespace sofa::core::objectmodel;
 
-namespace SofaSlicer {
+namespace sofa::openigtlink {
 
 class UserInteractionController : public BaseObject {
 public :

diff --git a/...TLink/utils/UserInteractionController.inl → ...tlink/utils/UserInteractionController.inl b/...TLink/utils/UserInteractionController.inl → ...tlink/utils/UserInteractionController.inl
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <SofaIGTLink/utils/UserInteractionController.h>
+#include <sofa/igtlink/utils/UserInteractionController.h>
 #include <sofa/core/visual/VisualParams.h>
 #include <sofa/type/Quat.h>
 #include <sofa/core/ObjectFactory.h>
@@ -11,7 +11,7 @@
 #include <Eigen/SVD>
 #include <sofa/helper/AdvancedTimer.h>
 
-namespace SofaSlicer {
+namespace sofa::openigtlink {
 
 
 UserInteractionController::UserInteractionController()