Merge pull request SimVascular#1032 from ktbolt/Add-writing-XML-svFSI…

…-Tool_1016 Add writing xml sv fsi tool 1016
mrp089 · Aug 3, 2023 · edd1fc7 · edd1fc7
2 parents 60094d1 + e70b499
commit edd1fc7
Show file tree

Hide file tree

Showing 18 changed files with 6,263 additions and 37 deletions.
diff --git a/Code/CMake/SimVascularInternals.cmake b/Code/CMake/SimVascularInternals.cmake
@@ -70,6 +70,7 @@ set(SV_LIBS ${SV_LIBS}
  THIRDPARTY_VMTK
  THIRDPARTY_ZLIB
  THIRDPARTY_TINYXML
+ THIRDPARTY_TINYXML2
  THIRDPARTY_SOLVERIO)
 
 # Module libs

diff --git a/Code/CMake/SimVascularOptions.cmake b/Code/CMake/SimVascularOptions.cmake
@@ -145,6 +145,7 @@ option(SV_USE_TETGEN "Enable Tetgen Meshing Plugin" ON)
 option(SV_USE_TETGEN_ADAPTOR "Option to use open source mesh adaption" ON)
 
 option(SV_USE_TINYXML "Use TinyXML" ON)
+option(SV_USE_TINYXML2 "Use TinyXML2" ON)
 
 option(SV_USE_PYTHON "Use Python" ON)
 

diff --git a/Code/CMake/SimVascularThirdParty.cmake b/Code/CMake/SimVascularThirdParty.cmake
@@ -82,6 +82,10 @@ if(SV_USE_TINYXML)
 else()
  unset(TINYXML_LIBRARY CACHE)
 endif()
+
+simvascular_third_party(tinyxml2)
+set(TINYXML2_LIBRARY ${SV_LIB_THIRDPARTY_TINYXML2_NAME})
+
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------

diff --git a/Code/Source/sv4gui/Modules/svFSI/CMakeLists.txt b/Code/Source/sv4gui/Modules/svFSI/CMakeLists.txt
@@ -39,10 +39,12 @@ simvascular_create_module(
  LIBRARY_DEPENDS
  ${MITK_LIBRARIES}
  ${ITK_LIBRARIES}
+ ${TINYXML2_LIBRARY_NAME}
  ${QT_LIBRARIES})
 #-----------------------------------------------------------------------------
 
 include_directories(${TINYXML_INCLUDE_DIR})
+include_directories(${SV_SOURCE_DIR}/ThirdParty/tinyxml2/simvascular_tinyxml2)
 
 if(SV_INSTALL_LIBS)
  install(TARGETS ${lib}

diff --git a/Code/Source/sv4gui/Modules/svFSI/files.cmake b/Code/Source/sv4gui/Modules/svFSI/files.cmake
@@ -36,6 +36,7 @@ set(H_FILES
  sv4gui_MitksvFSIJob.h
  sv4gui_MitksvFSIJobIO.h
  sv4gui_MitksvFSIObjectFactory.h
+ sv4gui_XmlWriter.h
 )
 
 set(CPP_FILES
@@ -46,6 +47,7 @@ set(CPP_FILES
  sv4gui_MitksvFSIJob.cxx
  sv4gui_MitksvFSIJobIO.cxx
  sv4gui_MitksvFSIObjectFactory.cxx
+ sv4gui_XmlWriter.cxx
 )
 
 set(RESOURCE_FILES