EHN: namespace updated according to the OpenIGTLinkIO library

leochan2009 · Mar 12, 2017 · a2d4744 · a2d4744
1 parent c894676
commit a2d4744
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 23 deletions.
diff --git a/MRML/vtkIGTLToMRMLBase.h b/MRML/vtkIGTLToMRMLBase.h
@@ -22,7 +22,7 @@
 #include <igtlMessageBase.h>
 
 // OpenIGTLinkIO include
-#include "igtlBaseConverter.h"
+#include "igtlioBaseConverter.h"
 
 
 // MRML includes

diff --git a/MRML/vtkIGTLToMRMLCommand.h b/MRML/vtkIGTLToMRMLCommand.h
@@ -20,7 +20,7 @@
 
 #include "igtlCommandMessage.h"
 // OpenIGTLinkIO include
-#include "igtlImageConverter.h"
+#include "igtlioCommandConverter.h"
 
 class VTK_SLICER_OPENIGTLINKIF_MODULE_MRML_EXPORT vtkIGTLToMRMLCommand : public vtkIGTLToMRMLBase
 {

diff --git a/MRML/vtkIGTLToMRMLImage.cxx b/MRML/vtkIGTLToMRMLImage.cxx
@@ -47,13 +47,14 @@ vtkStandardNewMacro(vtkIGTLToMRMLImage);
 //---------------------------------------------------------------------------
 vtkIGTLToMRMLImage::vtkIGTLToMRMLImage()
 {
-  converter = igtl::ImageConverter::New();
-  vtkContent = new igtl::ImageConverter::ContentData();
+  converter = new igtlio::ImageConverter();
+  vtkContent = new igtlio::ImageConverter::ContentData();
 }
 
 //---------------------------------------------------------------------------
 vtkIGTLToMRMLImage::~vtkIGTLToMRMLImage()
 {
+  delete converter;
   delete vtkContent;
 }
 
@@ -218,7 +219,7 @@ int vtkIGTLToMRMLImage::IGTLToMRML(igtl::MessageBase::Pointer buffer, vtkMRMLNod
     vtkErrorMacro("vtkIGTLToMRMLImage::IGTLToMRML failed: invalid node");
     return 0;
     }
-  igtl::BaseConverter::HeaderData header;
+  igtlio::BaseConverter::HeaderData header;
   vtkContent->image = volumeNode->GetImageData();
   vtkContent->transform = vtkMatrix4x4::New();
 
@@ -255,7 +256,7 @@ int vtkIGTLToMRMLImage::MRMLToIGTL(unsigned long event, vtkMRMLNode* mrmlNode, i
       }
 
     vtkImageData* imageData = volumeNode->GetImageData();
-    igtl::BaseConverter::HeaderData header;
+    igtlio::BaseConverter::HeaderData header;
 
     vtkContent->image = imageData;
     vtkMatrix4x4 *mat = vtkMatrix4x4::New();

diff --git a/MRML/vtkIGTLToMRMLImage.h b/MRML/vtkIGTLToMRMLImage.h
@@ -23,7 +23,7 @@
 #include <igtlImageMessage.h>
 
 // OpenIGTLinkIO include
-#include "igtlImageConverter.h"
+#include "igtlioImageConverter.h"
 
 // MRML includes
 #include <vtkMRMLNode.h>
@@ -64,9 +64,9 @@ class VTK_SLICER_OPENIGTLINKIF_MODULE_MRML_EXPORT vtkIGTLToMRMLImage : public vt
 
   igtl::GetImageMessage::Pointer GetImageMessage;
 
-  igtl::ImageConverter::Pointer  converter;
+  igtlio::ImageConverter*  converter;
 
-  igtl::ImageConverter::ContentData* vtkContent;
+  igtlio::ImageConverter::ContentData* vtkContent;
 
 };
 

diff --git a/MRML/vtkIGTLToMRMLLinearTransform.cxx b/MRML/vtkIGTLToMRMLLinearTransform.cxx
@@ -50,13 +50,14 @@ vtkStandardNewMacro(vtkIGTLToMRMLLinearTransform);
 //---------------------------------------------------------------------------
 vtkIGTLToMRMLLinearTransform::vtkIGTLToMRMLLinearTransform()
 {
-  converter = igtl::TransformConverter::New();
-  vtkContent = new igtl::TransformConverter::ContentData();
+  converter = new igtlio::TransformConverter();
+  vtkContent = new igtlio::TransformConverter::ContentData();
 }
 
 //---------------------------------------------------------------------------
 vtkIGTLToMRMLLinearTransform::~vtkIGTLToMRMLLinearTransform()
 {
+  delete converter;
   delete vtkContent;
 }
 
@@ -105,7 +106,7 @@ int vtkIGTLToMRMLLinearTransform::IGTLToMRML(igtl::MessageBase::Pointer buffer,
 
   vtkMRMLLinearTransformNode* transformNode =
     vtkMRMLLinearTransformNode::SafeDownCast(node);
-  igtl::BaseConverter::HeaderData header;
+  igtlio::BaseConverter::HeaderData header;
   vtkContent->transform = transformNode->GetMatrixTransformToParent();
   converter->fromIGTL(buffer, &header, vtkContent, 1);
   transformNode->SetMatrixTransformToParent(vtkContent->transform.GetPointer());
@@ -123,7 +124,7 @@ int vtkIGTLToMRMLLinearTransform::MRMLToIGTL(unsigned long event, vtkMRMLNode* m
       vtkMRMLLinearTransformNode::SafeDownCast(mrmlNode);
     vtkNew<vtkMatrix4x4> matrix;
     transformNode->GetMatrixTransformToParent(matrix.GetPointer());
-    igtl::BaseConverter::HeaderData header;
+    igtlio::BaseConverter::HeaderData header;
     converter->toIGTL(header, *vtkContent, &this->OutTransformMsg);
 
     *size = this->OutTransformMsg->GetPackSize();

diff --git a/MRML/vtkIGTLToMRMLLinearTransform.h b/MRML/vtkIGTLToMRMLLinearTransform.h
@@ -23,7 +23,7 @@
 #include <igtlTransformMessage.h>
 
 // OpenIGTLinkIO includes
-#include "igtlTransformConverter.h"
+#include "igtlioTransformConverter.h"
 
 // MRML includes
 #include <vtkMRMLNode.h>
@@ -63,8 +63,8 @@ class VTK_SLICER_OPENIGTLINKIF_MODULE_MRML_EXPORT vtkIGTLToMRMLLinearTransform :
 
  protected:
   igtl::TransformMessage::Pointer OutTransformMsg;
-  igtl::TransformConverter::ContentData* vtkContent;
-  igtl::TransformConverter::Pointer converter;
+  igtlio::TransformConverter::ContentData* vtkContent;
+  igtlio::TransformConverter* converter;
 };
 
 

diff --git a/MRML/vtkIGTLToMRMLPolyData.cxx b/MRML/vtkIGTLToMRMLPolyData.cxx
@@ -55,13 +55,14 @@ vtkStandardNewMacro(vtkIGTLToMRMLPolyData);
 //---------------------------------------------------------------------------
 vtkIGTLToMRMLPolyData::vtkIGTLToMRMLPolyData()
 {
-  converter  = igtl::PolyDataConverter::New();
-  vtkContent = new igtl::PolyDataConverter::MessageContent();
+  converter  = new igtlio::PolyDataConverter();
+  vtkContent = new igtlio::PolyDataConverter::MessageContent();
 }
 
 //---------------------------------------------------------------------------
 vtkIGTLToMRMLPolyData::~vtkIGTLToMRMLPolyData()
 {
+  delete converter;
   delete vtkContent;
 }
 
@@ -143,7 +144,7 @@ int vtkIGTLToMRMLPolyData::IGTLToMRML(igtl::MessageBase::Pointer buffer, vtkMRML
     }
 
 
-  igtl::BaseConverter::HeaderData header;
+  igtlio::BaseConverter::HeaderData header;
   vtkContent->polydata = modelNode->GetPolyData();
 
   converter->IGTLToVTK(buffer, vtkContent, 1);
@@ -179,7 +180,7 @@ int vtkIGTLToMRMLPolyData::MRMLToIGTL(unsigned long event, vtkMRMLNode* mrmlNode
       }
 
       vtkPolyData* poly = modelNode->GetPolyData();
-      igtl::BaseConverter::HeaderData header;
+      igtlio::BaseConverter::HeaderData header;
 
       vtkContent->polydata = poly;
       converter->VTKToIGTL(*vtkContent, &this->OutPolyDataMessage);

diff --git a/MRML/vtkIGTLToMRMLPolyData.h b/MRML/vtkIGTLToMRMLPolyData.h
@@ -21,7 +21,7 @@
 #include <igtlPolyDataMessage.h>
 
 // OpenIGTLinkIO include
-#include "igtlPolyDataConverter.h"
+#include "igtlioPolyDataConverter.h"
 
 // MRML includes
 #include <vtkMRMLNode.h>
@@ -58,9 +58,9 @@ class VTK_SLICER_OPENIGTLINKIF_MODULE_MRML_EXPORT vtkIGTLToMRMLPolyData : public
   igtl::PolyDataMessage::Pointer OutPolyDataMessage;
   igtl::GetPolyDataMessage::Pointer GetPolyDataMessage;
 
-  igtl::PolyDataConverter::Pointer  converter;
+  igtlio::PolyDataConverter*  converter;
 
-  igtl::PolyDataConverter::MessageContent* vtkContent;
+  igtlio::PolyDataConverter::MessageContent* vtkContent;
 
 };