Commit 598c5137 authored by saubatn's avatar saubatn
Browse files

FIXED Regarding Rev 1679, missing refactoring for including / linking with SOFA simulator.

NOTE ANSYS and ARTHYSING library monitoring configuration not supported yet. Library monitoring CMakeLists.txt file needs to be redone, quite from scratch!

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@1754 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 208ff605
......@@ -48,16 +48,16 @@ if(MML_SOFA_SUPPORT)
add_definitions(-DSOFA_SVN)
# use Find SOFA script
#set(SOFA_DIR ${SOFA_SOURCE_DIR})
#include(${SOFA_DIR}/cmake/Modules/FindSOFA.cmake)
#list(APPEND CMAKE_MODULE_PATH "${SOFA_DIR}/cmake/Modules")
#find_package(SOFA)
# Check the FindSofa.cmake and "translate" all their variables here
#set(MML_SOFA_INCLUDE_DIR ${SOFA_INCLUDE_DIRS})
# set(MML_SOFA_LIBS ${SOFA_LIB_CORE}
# ${SOFA_LIB_HELPER}
# ${SOFA_LIB_DEFAULT_TYPE})
# # use Find SOFA script
# set(SOFA_DIR ${SOFA_SOURCE_DIR})
# include(${SOFA_DIR}/cmake/Modules/FindSOFA.cmake)
# list(APPEND CMAKE_MODULE_PATH "${SOFA_DIR}/cmake/Modules")
# find_package(SOFA)
# # Check the FindSofa.cmake and "translate" all their variables here
# set(MML_SOFA_INCLUDE_DIR ${SOFA_INCLUDE_DIRS})
# set(MML_SOFA_LIBS ${SOFA_LIB_CORE}
# ${SOFA_LIB_HELPER}
# ${SOFA_LIB_DEFAULT_TYPE})
endif()
if (MML_SOFA_1_0_RC1)
......@@ -474,6 +474,9 @@ if(MML_GENERATE_GUI)
set(monitoring_INCLUDE_DIR ${monitoring_INCLUDE_DIR} ${QT_INCLUDE_DIR})
endif(MML_GENERATE_GUI)
# Add all the include directories
set(monitoring_INCLUDE_DIR ${monitoring_INCLUDE_DIR} ${MML_SOFA_INCLUDE_DIR} ${MML_ANSYS_WORKING_DIR} ${MML_ARTISYNTH_WORKING_DIR})
# add_definitions(-DCOMPILE_MML_TOOL)
# add_definitions(-D_CRT_SECURE_NO_WARNINGS)
......@@ -485,6 +488,8 @@ camitk_library( SHARED
NEEDS_XERCESC
NEEDS_LIBXML2
NEEDS_CEP_LIBRARIES mml pml lml
INCLUDE_DIRECTORIES ${monitoring_INCLUDE_DIR}
LINK_DIRECTORIES ${MML_SOFA_DIR}/lib
EXTERNAL_LIBRARIES ${MML_SOFA_LIBS}
CEP_NAME CEP_MODELING
DESCRIPTION "Tools to monitor a biomechanical deformation."
......
......@@ -23,10 +23,10 @@
* $CAMITK_LICENCE_END$
****************************************************************************/
#include "simulator/simulators/Sofa/SofaSimulator.h"
#include "SofaSimulator.h"
#include "simulator/SimulatorFactory.h"
#include "tools/SurfaceExtractor/SurfaceExtractor.h"
#include "SimulatorFactory.h"
#include "SurfaceExtractor.h"
#include <sofa/simulation/common/xml/initXml.h>
#include <sofa/component/init.h>
......@@ -54,7 +54,7 @@
#include <pml/MultiComponent.h>
#ifdef MML_GENERATE_GUI
#include "simulator/simulators/Sofa/SofaWidget.h"
#include "SofaWidget.h"
#endif
using namespace std;
......
......@@ -27,7 +27,7 @@
#ifndef SIMULATOR_SIMULATORS_SOFA_SOFASIMULATOR_H
#define SIMULATOR_SIMULATORS_SOFA_SOFASIMULATOR_H
#include "simulator/InteractiveSimulator.h"
#include "InteractiveSimulator.h"
#include <sofa/simulation/tree/TreeSimulation.h>
#include <sofa/component/container/MechanicalObject.h>
......@@ -38,7 +38,7 @@
#define SofaVector sofa::helper::vector
// Loads for Sofa
#include "simulator/simulators/Sofa/TranslationConstraint.h"
#include "TranslationConstraint.h"
/// correspondance between an atom index and index of the DOF in a mechanical object
namespace std {
......
......@@ -23,7 +23,7 @@
* $CAMITK_LICENCE_END$
****************************************************************************/
#include "simulator/simulators/Sofa/SofaWidget.h"
#include "SofaWidget.h"
#include <QFile>
#include <QProcess>
......
......@@ -28,9 +28,9 @@
#include <QProcess>
#include "simulator/SimulatorWidget.h"
#include "SimulatorWidget.h"
#include "SofaSimulator.h"
#include "tools/Xmlhighlighter.h"
#include "Xmlhighlighter.h"
#include "ui_SofaWidget.h"
......
......@@ -23,7 +23,7 @@
* $CAMITK_LICENCE_END$
****************************************************************************/
#include "simulator/simulators/Sofa/TranslationConstraint.inl"
#include "TranslationConstraint.inl"
#include <sofa/core/ObjectFactory.h>
#include <sofa/defaulttype/Vec3Types.h>
#include <sofa/defaulttype/RigidTypes.h>
......
......@@ -26,7 +26,7 @@
#ifndef TRANSLATION_CONSTRAINT_INL
#define TRANSLATION_CONSTRAINT_INL
#include "simulator/simulators/Sofa/TranslationConstraint.h"
#include "TranslationConstraint.h"
#include <sofa/helper/system/config.h>
#include <sofa/helper/gl/template.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment