EHN: improving the handling of version 2 igtlmessage without meta information

Author: leochan2009

MRML/vtkIGTLToMRMLImage.cxx

@@ -139,8 +139,17 @@ int vtkIGTLToMRMLImage::UnpackIGTLMessage(igtl::MessageBase::Pointer message)
     {
     this->InImageMessage->GetMetaDataElement(MEMLNodeNameKey, this->mrmlNodeTagName);
     }
-  else if(this->InImageMessage->GetHeaderVersion()==IGTL_HEADER_VERSION_1)
+  if(!(this->mrmlNodeTagName.compare("")==0))
     {
+    // The user specified mrmlnode is not supported by the converter.
+    if(!this->CheckIfMRMLSupported(this->mrmlNodeTagName.c_str()))
+      {
+      return 0;
+      }
+    }
+  else
+    {
+    //The message is version1 or version 2 without meta information.
     int numberOfComponents=this->InImageMessage->GetNumComponents();
     if (numberOfComponents == 1)
       {

MRML/vtkIGTLToMRMLPoints.cxx

@@ -83,7 +83,16 @@ int vtkIGTLToMRMLPoints::UnpackIGTLMessage(igtl::MessageBase::Pointer message)
     {
     this->InPointMsg->GetMetaDataElement(MEMLNodeNameKey, this->mrmlNodeTagName);
     }
-  else if(this->InPointMsg->GetHeaderVersion()==IGTL_HEADER_VERSION_1)
+  if(!(this->mrmlNodeTagName.compare("")==0))
+    {
+    // The user specified mrmlnode is not supported by the converter.
+    if(!this->CheckIfMRMLSupported(this->mrmlNodeTagName.c_str()))
+      {
+      return 0;
+      }
+    }
+  else
+    //The message is version1 or version 2 without meta information.
     {
     this->mrmlNodeTagName = "MarkupsFiducial";
     }

MRML/vtkIGTLToMRMLPolyData.cxx

@@ -154,8 +154,17 @@ int vtkIGTLToMRMLPolyData::UnpackIGTLMessage(igtl::MessageBase::Pointer message)
     {
     this->InPolyDataMessage->GetMetaDataElement(MEMLNodeNameKey, this->mrmlNodeTagName);
     }
-  else if(this->InPolyDataMessage->GetHeaderVersion()==IGTL_HEADER_VERSION_1)
+  if(!(this->mrmlNodeTagName.compare("")==0))
     {
+    // The user specified mrmlnode is not supported by the converter.
+    if(!this->CheckIfMRMLSupported(this->mrmlNodeTagName.c_str()))
+      {
+      return 0;
+      }
+    }
+  else
+    {
+    //The message is version1 or version 2 without meta information.
     this->mrmlNodeTagName = "Model";
     }
   return 1;