Commit 6135dea9 authored by Matt Clarkson's avatar Matt Clarkson

Issue #61: Move Tsai stuff to Internal/Tsai.

parent b85e77ea
......@@ -16,7 +16,7 @@ set(NIFTYCAL_SRCS
Internal/niftkIterativeCalibrationUtilities.cxx
Internal/niftkTriangulationUtilities.cxx
Internal/niftkCalibrationUtilities.cxx
Internal/niftkTsaiUtilities.cxx
Internal/Tsai/niftkTsaiUtilities.cxx
Detectors/niftkPointDetector.cxx
Detectors/niftkChessboardPointDetector.cxx
Detectors/niftkCirclesPointDetector.cxx
......@@ -53,7 +53,7 @@ if(ITK_FOUND)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearNoIntrinsicsCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearMonoCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsaiCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsaiCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearMaltiHandEyeCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearMaltiHandEyeOptimiser.cxx)
......@@ -61,23 +61,23 @@ if(ITK_FOUND)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearNDOFHandEyeCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearNDOFHandEyeOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsai3ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsai3ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai3ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai3ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsai2ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsai2ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai2ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai2ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsai5ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsai5ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai5ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai5ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsai8ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsai8ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai8ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai8ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsai10ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsai10ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai10ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai10ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsai11ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearTsai11ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai11ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai11ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereoCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereo2DCostFunction.cxx)
......
......@@ -13,7 +13,7 @@
=============================================================================*/
#include "niftkNonLinearTsai10ParamCostFunction.h"
#include "niftkCalibrationUtilities_p.h"
#include <Internal/niftkCalibrationUtilities_p.h>
namespace niftk
{
......
......@@ -13,7 +13,7 @@
=============================================================================*/
#include "niftkNonLinearTsai11ParamCostFunction.h"
#include "niftkCalibrationUtilities_p.h"
#include <Internal/niftkCalibrationUtilities_p.h>
namespace niftk
{
......
......@@ -13,7 +13,7 @@
=============================================================================*/
#include "niftkNonLinearTsai2ParamCostFunction.h"
#include "niftkCalibrationUtilities_p.h"
#include <Internal/niftkCalibrationUtilities_p.h>
#include <niftkMatrixUtilities.h>
namespace niftk
......
......@@ -13,7 +13,7 @@
=============================================================================*/
#include "niftkNonLinearTsai3ParamCostFunction.h"
#include "niftkCalibrationUtilities_p.h"
#include <Internal/niftkCalibrationUtilities_p.h>
#include <niftkMatrixUtilities.h>
namespace niftk
......
......@@ -13,8 +13,8 @@
=============================================================================*/
#include "niftkNonLinearTsai5ParamCostFunction.h"
#include "niftkCalibrationUtilities_p.h"
#include "niftkTsaiUtilities_p.h"
#include <Internal/niftkCalibrationUtilities_p.h>
#include <Internal/Tsai/niftkTsaiUtilities_p.h>
#include <niftkMatrixUtilities.h>
namespace niftk
......
......@@ -13,7 +13,7 @@
=============================================================================*/
#include "niftkNonLinearTsai8ParamCostFunction.h"
#include "niftkCalibrationUtilities_p.h"
#include <Internal/niftkCalibrationUtilities_p.h>
namespace niftk
{
......
......@@ -13,7 +13,7 @@
=============================================================================*/
#include "niftkNonLinearTsaiCostFunction.h"
#include "niftkCalibrationUtilities_p.h"
#include <Internal/niftkCalibrationUtilities_p.h>
#include <niftkMatrixUtilities.h>
namespace niftk
......
......@@ -15,7 +15,7 @@
#ifndef niftkNonLinearTsaiCostFunction_h
#define niftkNonLinearTsaiCostFunction_h
#include "niftkNonLinearMonoCostFunction.h"
#include <Internal/niftkNonLinearMonoCostFunction.h>
namespace niftk
{
......
......@@ -13,7 +13,7 @@
=============================================================================*/
#include "niftkTsaiUtilities_p.h"
#include "niftkCalibrationUtilities_p.h"
#include "Internal/niftkCalibrationUtilities_p.h"
#include <niftkNiftyCalExceptionMacro.h>
namespace niftk
......
......@@ -17,14 +17,14 @@
#include "niftkNiftyCalExceptionMacro.h"
#include "niftkMatrixUtilities.h"
#include "niftkPointUtilities.h"
#include <Internal/niftkTsaiUtilities_p.h>
#include <Internal/Tsai/niftkTsaiUtilities_p.h>
#ifdef NIFTYCAL_WITH_ITK
#include <Internal/niftkNonLinearTsai3ParamOptimiser.h>
#include <Internal/niftkNonLinearTsai2ParamOptimiser.h>
#include <Internal/niftkNonLinearTsai5ParamOptimiser.h>
#include <Internal/niftkNonLinearTsai8ParamOptimiser.h>
#include <Internal/niftkNonLinearTsai10ParamOptimiser.h>
#include <Internal/niftkNonLinearTsai11ParamOptimiser.h>
#include <Internal/Tsai/niftkNonLinearTsai3ParamOptimiser.h>
#include <Internal/Tsai/niftkNonLinearTsai2ParamOptimiser.h>
#include <Internal/Tsai/niftkNonLinearTsai5ParamOptimiser.h>
#include <Internal/Tsai/niftkNonLinearTsai8ParamOptimiser.h>
#include <Internal/Tsai/niftkNonLinearTsai10ParamOptimiser.h>
#include <Internal/Tsai/niftkNonLinearTsai11ParamOptimiser.h>
#endif
#include <vector>
......
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