…w working. Template-based MessageHandler class has been removed.

CMake/OpenIGTLinkCMakeTests.cmake

@@ -1,6 +1,7 @@
 # See if we need to link the socket library 
 INCLUDE(CheckLibraryExists)
 INCLUDE(CheckSymbolExists)
+INCLUDE(CheckFunctionExists)
 
 CHECK_LIBRARY_EXISTS("socket" getsockname "" OpenIGTLink_HAVE_LIBSOCKET)
 
@@ -33,6 +34,10 @@ IF("OpenIGTLink_HAVE_GETSOCKNAME_WITH_SOCKLEN_T" MATCHES "^OpenIGTLink_HAVE_GETS
   ENDIF(OpenIGTLink_HAVE_GETSOCKNAME_WITH_SOCKLEN_T)
 ENDIF("OpenIGTLink_HAVE_GETSOCKNAME_WITH_SOCKLEN_T" MATCHES "^OpenIGTLink_HAVE_GETSOCKNAME_WITH_SOCKLEN_T$")
 
+
+# e.g. Mac OS X Snow Leopard does not have strnlen().
+CHECK_FUNCTION_EXISTS(strnlen OpenIGTLink_HAVE_STRNLEN)
+
 # e.g. IBM BlueGene/L doesn't have SO_REUSEADDR, because "setsockopt is not needed for
 # BlueGene/L applications" according to the BlueGene/L Application Development handbook
 CHECK_SYMBOL_EXISTS(SO_REUSEADDR "sys/types.h;sys/socket.h" OpenIGTLink_HAVE_SO_REUSEADDR)

CMakeLists.txt

@@ -9,8 +9,8 @@ if(COMMAND cmake_policy)
 #-----------------------------------------------------------------------------
 # OpenIGTlink version number.
 SET(OpenIGTLink_VERSION_MAJOR "1")
-SET(OpenIGTLink_VERSION_MINOR "9")
-SET(OpenIGTLink_VERSION_PATCH "8")
+SET(OpenIGTLink_VERSION_MINOR "10")
+SET(OpenIGTLink_VERSION_PATCH "10")
 
 option(OpenIGTLink_PROTOCOL_VERSION_2 "Build Library for Protocol Version 2" ON)
 

Examples/CMakeLists.txt

@@ -24,6 +24,9 @@ if (${OpenIGTLink_PROTOCOL_VERSION} STREQUAL "2")
     String
     Bind
     PolyData
+    Capability
+    Trajectory
+    SessionManager
     )
 endif (${OpenIGTLink_PROTOCOL_VERSION} STREQUAL "2")
 

Examples/Capability/CMakeLists.txt

@@ -0,0 +1,18 @@
+PROJECT(Capability)
+
+cmake_minimum_required(VERSION 2.4)
+if(COMMAND cmake_policy)
+  cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
+
+find_package(OpenIGTLink REQUIRED)
+
+include(${OpenIGTLink_USE_FILE})
+
+ADD_EXECUTABLE(CapabilityClient   CapabilityClient.cxx)
+TARGET_LINK_LIBRARIES(CapabilityClient OpenIGTLink)
+
+ADD_EXECUTABLE(CapabilityServer   CapabilityServer.cxx)
+TARGET_LINK_LIBRARIES(CapabilityServer OpenIGTLink)
+
+

Examples/Capability/CapabilityClient.cxx

@@ -0,0 +1,86 @@
+/*=========================================================================
+
+  Program:   OpenIGTLink -- Example for Sending Capability Messasge
+  Module:    $RCSfile: $
+  Language:  C++
+  Date:      $Date: $
+  Version:   $Revision: $
+
+  Copyright (c) Insight Software Consortium. All rights reserved.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
+#include <iostream>
+#include <math.h>
+#include <cstdlib>
+
+#include "igtlOSUtil.h"
+#include "igtlCapabilityMessage.h"
+#include "igtlClientSocket.h"
+
+#include "igtlTransformMessage.h"
+#include "igtlImageMessage.h"
+#include "igtlLabelMetaMessage.h"
+
+//
+// Test comment
+//
+
+
+int main(int argc, char* argv[])
+{
+  //------------------------------------------------------------
+  // Parse Arguments
+
+  if (argc != 3) // check number of arguments
+    {
+    // If not correct, print usage
+    std::cerr << "Usage: " << argv[0] << " <hostname> <port>"    << std::endl;
+    std::cerr << "    <hostname> : IP or host name"                    << std::endl;
+    std::cerr << "    <port>     : Port # (18944 in Slicer default)"   << std::endl;
+    exit(0);
+    }
+
+  char*  hostname = argv[1];
+  int    port     = atoi(argv[2]);
+  int    interval = (int) (1000);
+
+  //------------------------------------------------------------
+  // Establish Connection
+
+  igtl::ClientSocket::Pointer socket;
+  socket = igtl::ClientSocket::New();
+  int r = socket->ConnectToServer(hostname, port);
+
+  if (r != 0)
+    {
+    std::cerr << "Cannot connect to the server." << std::endl;
+    exit(0);
+    }
+
+  //------------------------------------------------------------
+  // Allocate Capability Message Class
+
+  igtl::CapabilityMessage::Pointer capabilityMsg;
+  capabilityMsg = igtl::CapabilityMessage::New();
+  capabilityMsg->SetDeviceName("Device");
+
+  std::vector<std::string> types;
+  types.push_back(std::string("TRANSFORM"));
+  types.push_back(std::string("GET_IMAGE"));
+  types.push_back(std::string("GET_LBMETA"));
+  capabilityMsg->SetTypes(types);
+  capabilityMsg->Pack();
+  socket->Send(capabilityMsg->GetPackPointer(), capabilityMsg->GetPackSize());
+  //------------------------------------------------------------
+  // Close connection
+
+  socket->CloseSocket();
+
+}
+
+

Examples/Capability/CapabilityServer.cxx

@@ -0,0 +1,91 @@
+/*=========================================================================
+
+  Program:   Open IGT Link -- Example for Tracker Server Program
+  Module:    $RCSfile: $
+  Language:  C++
+  Date:      $Date: $
+  Version:   $Revision: $
+
+  Copyright (c) Insight Software Consortium. All rights reserved.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
+#include <iostream>
+#include <math.h>
+#include <cstdlib>
+
+#include "igtlOSUtil.h"
+#include "igtlCapabilityMessage.h"
+#include "igtlServerSocket.h"
+
+int main(int argc, char* argv[])
+{
+  //------------------------------------------------------------
+  // Parse Arguments
+
+  if (argc != 2) // check number of arguments
+    {
+    // If not correct, print usage
+    std::cerr << "Usage: " << argv[0] << " <port>"    << std::endl;
+    std::cerr << "    <port>     : Port # (18944 in Slicer default)"   << std::endl;
+    exit(0);
+    }
+
+  int    port     = atoi(argv[1]);
+  int    interval = (int) 1000;
+
+  //------------------------------------------------------------
+  // Allocate Capability Message Class
+
+  igtl::CapabilityMessage::Pointer capabilityMsg;
+  capabilityMsg = igtl::CapabilityMessage::New();
+  capabilityMsg->SetDeviceName("Device");
+
+  igtl::ServerSocket::Pointer serverSocket;
+  serverSocket = igtl::ServerSocket::New();
+  int r = serverSocket->CreateServer(port);
+
+  if (r < 0)
+    {
+    std::cerr << "Cannot create a server socket." << std::endl;
+    exit(0);
+    }
+
+  igtl::Socket::Pointer socket;
+  
+  while (1)
+    {
+    //------------------------------------------------------------
+    // Waiting for Connection
+    socket = serverSocket->WaitForConnection(1000);
+    
+    if (socket.IsNotNull()) // if client connected
+      {
+      //------------------------------------------------------------
+      // loop
+      for (int i = 0; i < 100; i ++)
+        {
+        std::vector<std::string> types;
+        types.push_back(std::string("TRANSFORM"));
+        types.push_back(std::string("GET_IMAGE"));
+        types.push_back(std::string("GET_LBMETA"));
+        capabilityMsg->SetTypes(types);
+        capabilityMsg->Pack();
+        socket->Send(capabilityMsg->GetPackPointer(), capabilityMsg->GetPackSize());
+        igtl::Sleep(interval); // wait
+        }
+      }
+    }
+    
+  //------------------------------------------------------------
+  // Close connection (The example code never reachs to this section ...)
+  
+  socket->CloseSocket();
+
+}
+
+

Examples/ImageDatabaseServer/ImageDatabaseServer.cxx

@@ -25,10 +25,13 @@
 #include "igtlMessageHeader.h"
 #include "igtlImageMessage.h"
 #include "igtlImageMetaMessage.h"
+#include "igtlLabelMetaMessage.h"
 #include "igtlServerSocket.h"
 
 int SendImageMeta(igtl::Socket::Pointer& socket, const char* name);
+int SendLabelMeta(igtl::Socket::Pointer& socket, const char* name);
 int SendImage(igtl::Socket::Pointer& socket, const char* name, const char* filedir);
+int SendLabel(igtl::Socket::Pointer& socket, const char* name, const char* filedir);
 int GetTestImage(igtl::ImageMessage::Pointer& msg, const char* dir, int i);
 
 int main(int argc, char* argv[])
@@ -107,6 +110,10 @@ int main(int argc, char* argv[])
           //socket->Skip(headerMsg->GetBodySizeToRead(), 0);
           SendImageMeta(socket, headerMsg->GetDeviceName());
           }
+        else if (strcmp(headerMsg->GetDeviceType(), "GET_LBMETA") == 0)
+          {
+          SendLabelMeta(socket, headerMsg->GetDeviceName());
+          }
         else if (strcmp(headerMsg->GetDeviceType(), "GET_IMAGE") == 0)
           {
           SendImage(socket, headerMsg->GetDeviceName(), filedir);
@@ -209,6 +216,62 @@ int SendImageMeta(igtl::Socket::Pointer& socket, const char* name)
 }
 
 
+int SendLabelMeta(igtl::Socket::Pointer& socket, const char* name)
+{
+  //------------------------------------------------------------
+  // Allocate Status Message Class
+
+  igtl::LabelMetaMessage::Pointer lbMetaMsg;
+  lbMetaMsg = igtl::LabelMetaMessage::New();
+  // NOTE: the server should send a message with the same device name
+  // as the received query message.
+  lbMetaMsg->SetDeviceName(name);
+
+  //---------------------------
+  // Create 1st meta data
+  igtl::LabelMetaElement::Pointer lbMeta0;
+  lbMeta0 = igtl::LabelMetaElement::New();
+  lbMeta0->SetName("LABEL_DESCRIPTION_0");
+  lbMeta0->SetDeviceName("LABEL_0");
+  lbMeta0->SetOwner("IMAGE_0");
+  lbMeta0->SetSize(512, 512, 64);
+
+  //---------------------------
+  // Create 2nd meta data
+  igtl::LabelMetaElement::Pointer lbMeta1;
+  lbMeta1 = igtl::LabelMetaElement::New();
+  lbMeta1->SetName("LABEL_DESCRIPTION_1");
+  lbMeta1->SetDeviceName("LABEL_1");
+  lbMeta1->SetOwner("IMAGE_1");
+  
+  lbMeta1->SetSize(256, 128, 32);
+
+  //---------------------------
+  // Create 3rd meta data
+  igtl::LabelMetaElement::Pointer lbMeta2;
+  lbMeta2 = igtl::LabelMetaElement::New();
+  lbMeta2->SetName("LABEL_DESCRIPTION_2");
+  lbMeta2->SetDeviceName("LABEL_2");
+  lbMeta2->SetOwner("IMAGE_2");
+  lbMeta2->SetSize(256, 256, 32);
+
+  lbMetaMsg->AddLabelMetaElement(lbMeta0);
+  lbMetaMsg->AddLabelMetaElement(lbMeta1);
+  lbMetaMsg->AddLabelMetaElement(lbMeta2);
+
+  lbMetaMsg->Pack();
+  std::cerr << "Size of pack: " << lbMetaMsg->GetPackSize() << std::endl;
+  std::cerr << "Name of type: " << lbMetaMsg->GetDeviceType() << std::endl;
+  std::cerr << "Sending a LBMETA message..." << std::endl;
+
+  socket->Send(lbMetaMsg->GetPackPointer(), lbMetaMsg->GetPackSize());
+
+  return 1;
+
+}
+
+
+
 int SendImage(igtl::Socket::Pointer& socket, const char* name, const char* filedir)
 {
   int index = 0;
@@ -225,6 +288,18 @@ int SendImage(igtl::Socket::Pointer& socket, const char* name, const char* filed
     {
     index = 3;
     }
+  if (strcmp(name, "LABEL_0") == 0)
+    {
+    index = 4;
+    }
+  else if (strcmp(name, "LABEL_1") == 0)
+    {
+    index = 5;
+    }
+  else if (strcmp(name, "LABEL_2") == 0)
+    {
+    index = 6;
+    }
 
   if (index > 0)
     {
@@ -268,15 +343,14 @@ int SendImage(igtl::Socket::Pointer& socket, const char* name, const char* filed
 }
 
 
-
 //------------------------------------------------------------
 // Function to read test image data
 int GetTestImage(igtl::ImageMessage::Pointer& msg, const char* dir, int i)
 {
 
   //------------------------------------------------------------
   // Check if image index is in the range
-  if (i < 0 || i >= 5) 
+  if (i < 0 || i >= 7) 
     {
     std::cerr << "Image index is invalid." << std::endl;
     return 0;

Examples/Point/CMakeLists.txt

@@ -15,3 +15,6 @@ TARGET_LINK_LIBRARIES(PointClient OpenIGTLink)
 ADD_EXECUTABLE(PointServer   PointServer.cxx)
 TARGET_LINK_LIBRARIES(PointServer OpenIGTLink)
 
+ADD_EXECUTABLE(PointListServer   PointListServer.cxx)
+TARGET_LINK_LIBRARIES(PointListServer OpenIGTLink)
+