diff --git a/Modules/Bundles/org.mitk.gui.qt.igttutorial/CMakeLists.txt b/Modules/Bundles/org.mitk.gui.qt.igttutorial/CMakeLists.txt index fea1925b36..7a7e70bc82 100644 --- a/Modules/Bundles/org.mitk.gui.qt.igttutorial/CMakeLists.txt +++ b/Modules/Bundles/org.mitk.gui.qt.igttutorial/CMakeLists.txt @@ -1,9 +1,9 @@ -# The project name must correspond to the directory name of your plug-in -# and must not contain periods. -PROJECT(org_mitk_gui_qt_igttutorial) - -MACRO_CREATE_MITK_CTK_PLUGIN( - EXPORT_DIRECTIVE IGTTUTORIAL_EXPORT - EXPORTED_INCLUDE_SUFFIXES src - MODULE_DEPENDENCIES QmitkExt MitkIGT +# The project name must correspond to the directory name of your plug-in +# and must not contain periods. +PROJECT(org_mitk_gui_qt_igttutorial) + +MACRO_CREATE_MITK_CTK_PLUGIN( + EXPORT_DIRECTIVE IGTTUTORIAL_EXPORT + EXPORTED_INCLUDE_SUFFIXES src + MODULE_DEPENDENCIES QmitkExt MitkIGT ) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.igttutorial/manifest_headers.cmake b/Modules/Bundles/org.mitk.gui.qt.igttutorial/manifest_headers.cmake index 1ffbfabd10..fb0aae7bc3 100644 --- a/Modules/Bundles/org.mitk.gui.qt.igttutorial/manifest_headers.cmake +++ b/Modules/Bundles/org.mitk.gui.qt.igttutorial/manifest_headers.cmake @@ -1,5 +1,5 @@ -set(Plugin-Name "MITK-IGT Tutorial") -set(Plugin-Version "0.1") -set(Plugin-Vendor "DKFZ, Medical and Biological Informatics") -set(Plugin-ContactAddress "http://www.mitk.org") +set(Plugin-Name "MITK-IGT Tutorial") +set(Plugin-Version "0.1") +set(Plugin-Vendor "DKFZ, Medical and Biological Informatics") +set(Plugin-ContactAddress "http://www.mitk.org") set(Require-Plugin org.mitk.gui.qt.common) \ No newline at end of file diff --git a/Modules/CameraCalibration/mitkCvMatCompare.h b/Modules/CameraCalibration/mitkCvMatCompare.h index a29f6e87da..e6cf602574 100644 --- a/Modules/CameraCalibration/mitkCvMatCompare.h +++ b/Modules/CameraCalibration/mitkCvMatCompare.h @@ -1,96 +1,95 @@ #ifndef mitkCvMatCompare_h #define mitkCvMatCompare_h #include -#include #include #include #include namespace mitk { /// /// compare two matrices with a given epsilon /// class CvMatCompare: virtual public Algorithm { public: /// /// init default values and save references /// CvMatCompare( const Epsilon* _Epsilon, bool* _Equals): m_CvMat1(0), m_CvMat2(0), m_Epsilon(_Epsilon), m_Equals(_Equals) { } /// /// init default values and save references /// CvMatCompare( const cv::Mat* _CvMat1, const cv::Mat* _CvMat2, const Epsilon* _Epsilon, bool* _Equals): m_CvMat1(_CvMat1), m_CvMat2(_CvMat2), m_Epsilon(_Epsilon), m_Equals(_Equals) { } void SetMatrices( const cv::Mat* _CvMat1, const cv::Mat* _CvMat2 ) { m_CvMat1 = _CvMat1; m_CvMat2 = _CvMat2; } void SetMatrix1( const cv::Mat* _CvMat1 ) { m_CvMat1 = _CvMat1; } void SetMatrix2( const cv::Mat* _CvMat2 ) { m_CvMat2 = _CvMat2; } /// /// executes the Algorithm /// void Update() { assert( m_CvMat1 && m_CvMat2 ); cv::Mat dst; cv::absdiff( (*m_CvMat1), (*m_CvMat2), dst); double max = 0; cv::minMaxLoc( dst, 0, &max ); endodebugvar( max ) (*m_Equals) = max <= *m_Epsilon; } private: /// /// CvMatCompare input member variable /// const cv::Mat* m_CvMat1; /// /// CvMatCompare input member variable /// const cv::Mat* m_CvMat2; /// /// CvMatCompare input member variable /// const Epsilon* m_Epsilon; /// /// CvMatCompare output member variable /// bool* m_Equals; }; } // namespace mitk #endif // mitkCvMatCompare_h