Commit 95249998 authored by jcfr's avatar jcfr
Browse files

COMP: Rename Slicer3_USE_NAVITRACK into Slicer_USE_NAVITRACK

Note that there is no associated Option

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15102 3bd1e089-480b-0410-8dfb-8563597acbee
parent a8159f69
......@@ -114,7 +114,7 @@ Slicer3_BUILD_WIN32_CONSOLE:BOOL=@Slicer3_BUILD_WIN32_CONSOLE@
Slicer_USE_BatchMake:BOOL=@Slicer_USE_BatchMake@
Slicer3_USE_IGSTK:BOOL=@Slicer3_USE_IGSTK@
Slicer_USE_MIDAS:BOOL=@Slicer_USE_MIDAS@
Slicer3_USE_NAVITRACK:BOOL=@Slicer3_USE_NAVITRACK@
Slicer_USE_NAVITRACK:BOOL=@Slicer_USE_NAVITRACK@
Slicer_USE_PYTHON:BOOL=@Slicer_USE_PYTHON@
Teem_DIR:PATH=@Teem_DIR@
......
......@@ -83,7 +83,7 @@ set(libs)
set(LoadableModule_USE_PYTHON ${Slicer_USE_PYTHON})
set(IGT_USE_IGSTK ${Slicer3_USE_IGSTK})
set(IGT_USE_NAVITRACK ${Slicer3_USE_NAVITRACK})
set(IGT_USE_NAVITRACK ${Slicer_USE_NAVITRACK})
set(ITKCommandIO_INSTALL_ITKFACTORIES_DIR ${Slicer_INSTALL_ITKFACTORIES_DIR})
set(MGHImageIO_INSTALL_ITKFACTORIES_DIR ${Slicer_INSTALL_ITKFACTORIES_DIR})
set(MRMLIDImageIO_INSTALL_ITKFACTORIES_DIR ${Slicer_INSTALL_ITKFACTORIES_DIR})
......
......@@ -57,7 +57,7 @@ vtkRealTimeImagingLogic::vtkRealTimeImagingLogic()
this->LocatorNormalTransform = vtkTransform::New();
#ifdef Slicer3_USE_NAVITRACK
#ifdef Slicer_USE_NAVITRACK
Event::registerGenericTypeName((Image*)NULL,"MedScanImage");
cout << "Using NaviTrack" << endl;
#endif
......@@ -178,7 +178,7 @@ void vtkRealTimeImagingLogic::SetNumberOfPoints(int no)
void vtkRealTimeImagingLogic::Init(const char *configfile)
{
#ifdef Slicer3_USE_NAVITRACK
#ifdef Slicer_USE_NAVITRACK
fprintf(stderr,"config file: %s\n",configfile);
this->context = new Context(1);
// get callback module from the context
......@@ -222,7 +222,7 @@ void vtkRealTimeImagingLogic::Init(const char *configfile)
void vtkRealTimeImagingLogic::CloseConnection()
{
#ifdef Slicer3_USE_NAVITRACK
#ifdef Slicer_USE_NAVITRACK
context->close();
#endif
......@@ -252,7 +252,7 @@ void vtkRealTimeImagingLogic::quaternion2xyz(float* orientation, float *normal,
void vtkRealTimeImagingLogic::PollRealtime()
{
#ifdef Slicer3_USE_NAVITRACK
#ifdef Slicer_USE_NAVITRACK
context->pushEvents(); // push event and
context->pullEvents(); // pull event
context->stop();
......@@ -260,7 +260,7 @@ void vtkRealTimeImagingLogic::PollRealtime()
}
#ifdef Slicer3_USE_NAVITRACK
#ifdef Slicer_USE_NAVITRACK
void vtkRealTimeImagingLogic::callbackF(const Node&, const Event &event, void *data)
{
float position[3];
......@@ -316,7 +316,7 @@ void vtkRealTimeImagingLogic::callbackF(const Node&, const Event &event, void *d
VOT->LocatorMatrix->SetElement(3,3,1);
#ifdef Slicer3_USE_NAVITRACK
#ifdef Slicer_USE_NAVITRACK
// Check for an image attribute
if(event.hasAttribute("image"))
{
......@@ -604,7 +604,7 @@ void vtkRealTimeImagingLogic::PrintSelf(ostream& os, vtkIndent indent)
}
#ifdef Slicer3_USE_NAVITRACK
#ifdef Slicer_USE_NAVITRACK
//simond: Everything from here on down should be in Image.cxx.
//simond: There were build errors with a separate file - need to figure out why.
Image::Image(){
......
......@@ -40,7 +40,7 @@
#include "vtkSlicerConfigure.h" /* Slicer3_USE_* */
#ifdef Slicer3_USE_NAVITRACK
#ifdef Slicer_USE_NAVITRACK
#include "OpenTracker/OpenTracker.h"
#include "OpenTracker/common/CallbackModule.h"
......@@ -82,7 +82,7 @@ public:
void CloseConnection();
void PollRealtime();
#ifdef Slicer3_USE_NAVITRACK
#ifdef Slicer_USE_NAVITRACK
static void callbackF(const Node&, const Event &event, void *data);
#endif
......@@ -114,7 +114,7 @@ protected:
vtkRealTimeImagingLogic(const vtkRealTimeImagingLogic&);
void operator=(const vtkRealTimeImagingLogic&);
#ifdef Slicer3_USE_NAVITRACK
#ifdef Slicer_USE_NAVITRACK
Context *context;
#endif
......
......@@ -31,7 +31,7 @@ set(Slicer3_BUILD_SHARED "@BUILD_SHARED_LIBS@")
set(Slicer_USE_BatchMake "@Slicer_USE_BatchMake@")
set(Slicer3_USE_IGSTK "@Slicer3_USE_IGSTK@")
set(Slicer_USE_MIDAS "@Slicer_USE_MIDAS@")
set(Slicer3_USE_NAVITRACK "@Slicer3_USE_NAVITRACK@")
set(Slicer_USE_NAVITRACK "@Slicer_USE_NAVITRACK@")
set(Slicer_USE_NUMPY "@Slicer_USE_NUMPY@")
set(Slicer_USE_PYTHON "@Slicer_USE_PYTHON@")
set(Slicer_USE_OPENTRACKER "@Slicer_USE_OPENTRACKER@")
......
......@@ -22,7 +22,7 @@
#cmakedefine Slicer_USE_BatchMake
#cmakedefine Slicer3_USE_IGSTK
#cmakedefine Slicer_USE_MIDAS
#cmakedefine Slicer3_USE_NAVITRACK
#cmakedefine Slicer_USE_NAVITRACK
#cmakedefine Slicer_USE_NUMPY
#cmakedefine Slicer_USE_PYTHON
#cmakedefine Slicer_USE_PYTHONQT
......
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