diff --git a/Modules/Overlays/include/mitkVtkOverlay2D.h b/Modules/Overlays/include/mitkVtkOverlay2D.h index 9f6eda19ce..4cf4d9ee9e 100644 --- a/Modules/Overlays/include/mitkVtkOverlay2D.h +++ b/Modules/Overlays/include/mitkVtkOverlay2D.h @@ -1,69 +1,69 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef VTKOVERLAY2D_H #define VTKOVERLAY2D_H #include "mitkVtkOverlay.h" #include #include class vtkActor2D; class vtkProperty2D; namespace mitk { /** * @brief The VtkOverlay2D class is the basis for all VTK based Overlays which create * a vtkActor2D element that will be drawn on the renderer. */ class MITKCORE_EXPORT VtkOverlay2D : public VtkOverlay { public: mitkClassMacro(VtkOverlay2D, VtkOverlay); virtual Overlay::Bounds GetBoundsOnDisplay(BaseRenderer *renderer) const override; virtual void SetBoundsOnDisplay(BaseRenderer *renderer, const Bounds &bounds) override; - void SetPosition2D(const Point2D& position2D); + void SetPosition2D(const Point2D &position2D); - Point2D GetPosition2D() const; + Point2D GetPosition2D() const; - void SetOffsetVector(const Point2D& OffsetVector); + void SetOffsetVector(const Point2D &OffsetVector); - Point2D GetOffsetVector() const; + Point2D GetOffsetVector() const; protected: virtual vtkProp *GetVtkProp(BaseRenderer *renderer) const override; virtual void UpdateVtkOverlay(BaseRenderer *renderer) override; virtual void UpdateVtkOverlay2D(BaseRenderer *renderer) = 0; virtual vtkActor2D *GetVtkActor2D(BaseRenderer *renderer) const = 0; /** \brief explicit constructor which disallows implicit conversions */ explicit VtkOverlay2D(); /** \brief virtual destructor in order to derive from this class */ virtual ~VtkOverlay2D(); private: /** \brief copy constructor */ VtkOverlay2D(const VtkOverlay2D &); /** \brief assignment operator */ VtkOverlay2D &operator=(const VtkOverlay2D &); }; } // namespace mitk #endif // VTKOVERLAY2D_H diff --git a/Modules/Overlays/src/mitkVtkOverlay.cpp b/Modules/Overlays/src/mitkVtkOverlay.cpp index 4b0619043c..9ceede2f84 100644 --- a/Modules/Overlays/src/mitkVtkOverlay.cpp +++ b/Modules/Overlays/src/mitkVtkOverlay.cpp @@ -1,87 +1,87 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "mitkVtkOverlay.h" #include #include mitk::VtkOverlay::VtkOverlay() { } mitk::VtkOverlay::~VtkOverlay() { } void mitk::VtkOverlay::Update(mitk::BaseRenderer *renderer) { vtkSmartPointer prop = GetVtkProp(renderer); - if(!IsVisible()) + if (!IsVisible()) { prop->SetVisibility(false); return; } else { prop->SetVisibility(true); UpdateVtkOverlay(renderer); } } void mitk::VtkOverlay::AddToBaseRenderer(mitk::BaseRenderer *renderer) { if (!renderer) return; AddToRenderer(renderer, renderer->GetVtkRenderer()); } void mitk::VtkOverlay::AddToRenderer(mitk::BaseRenderer *renderer, vtkRenderer *vtkrenderer) { if (!renderer || !vtkrenderer) return; Update(renderer); vtkSmartPointer vtkProp = GetVtkProp(renderer); if (renderer && vtkrenderer && !vtkrenderer->HasViewProp(vtkProp)) { vtkrenderer->AddViewProp(vtkProp); mitk::RenderingManager::GetInstance()->RequestUpdate(vtkrenderer->GetRenderWindow()); } } void mitk::VtkOverlay::RemoveFromBaseRenderer(mitk::BaseRenderer *renderer) { if (!renderer) return; RemoveFromRenderer(renderer, renderer->GetVtkRenderer()); } void mitk::VtkOverlay::RemoveFromRenderer(mitk::BaseRenderer *renderer, vtkRenderer *vtkrenderer) { if (!renderer || !vtkrenderer) return; vtkSmartPointer vtkProp = GetVtkProp(renderer); if (vtkrenderer->HasViewProp(vtkProp)) { vtkrenderer->RemoveViewProp(vtkProp); mitk::RenderingManager::GetInstance()->RequestUpdate(vtkrenderer->GetRenderWindow()); } } void mitk::VtkOverlay::Paint(BaseRenderer *renderer) { GetVtkProp(renderer)->RenderOpaqueGeometry(renderer->GetVtkRenderer()); GetVtkProp(renderer)->RenderOverlay(renderer->GetVtkRenderer()); } diff --git a/Modules/Overlays/src/mitkVtkOverlay3D.cpp b/Modules/Overlays/src/mitkVtkOverlay3D.cpp index e116dab39d..08f581272e 100644 --- a/Modules/Overlays/src/mitkVtkOverlay3D.cpp +++ b/Modules/Overlays/src/mitkVtkOverlay3D.cpp @@ -1,56 +1,56 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "mitkVtkOverlay3D.h" mitk::VtkOverlay3D::VtkOverlay3D() { mitk::Point3D offsetVector; offsetVector.Fill(0); SetOffsetVector(offsetVector); } mitk::VtkOverlay3D::~VtkOverlay3D() { } -void mitk::VtkOverlay3D::SetPosition3D(const Point3D& position3D) +void mitk::VtkOverlay3D::SetPosition3D(const Point3D &position3D) { mitk::Point3dProperty::Pointer position3dProperty = mitk::Point3dProperty::New(position3D); SetProperty("VtkOverlay3D.Position3D", position3dProperty.GetPointer()); } mitk::Point3D mitk::VtkOverlay3D::GetPosition3D() const { mitk::Point3D position3D; position3D.Fill(0); GetPropertyValue("VtkOverlay3D.Position3D", position3D); return position3D; } -void mitk::VtkOverlay3D::SetOffsetVector(const Point3D& OffsetVector) +void mitk::VtkOverlay3D::SetOffsetVector(const Point3D &OffsetVector) { mitk::Point3dProperty::Pointer OffsetVectorProperty = mitk::Point3dProperty::New(OffsetVector); SetProperty("VtkOverlay3D.OffsetVector", OffsetVectorProperty.GetPointer()); } mitk::Point3D mitk::VtkOverlay3D::GetOffsetVector() const { mitk::Point3D OffsetVector; OffsetVector.Fill(0); GetPropertyValue("VtkOverlay3D.OffsetVector", OffsetVector); return OffsetVector; } diff --git a/Modules/Overlays/test/mitkOverlaysTest.cpp b/Modules/Overlays/test/mitkOverlaysTest.cpp index 8de2211c62..7bc0fabec3 100644 --- a/Modules/Overlays/test/mitkOverlaysTest.cpp +++ b/Modules/Overlays/test/mitkOverlaysTest.cpp @@ -1,68 +1,59 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include +#include +#include +#include +#include #include #include -#include -#include -#include -#include #include "mitkAnnotationPlacer.h" #include "mitkOverlayLayouter2D.h" - class mitkOverlaysTestSuite : public mitk::TestFixture { - CPPUNIT_TEST_SUITE(mitkOverlaysTestSuite); - MITK_TEST(AnnotationServiceTest); - CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE(mitkOverlaysTestSuite); + MITK_TEST(AnnotationServiceTest); + CPPUNIT_TEST_SUITE_END(); private: - public: - - void setUp() override - { - } - + void setUp() override {} void AnnotationServiceTest() { - mitk::AnnotationPlacer* ap1_test1 = mitk::AnnotationPlacer::GetAnnotationRenderer("test1"); + mitk::AnnotationPlacer *ap1_test1 = mitk::AnnotationPlacer::GetAnnotationRenderer("test1"); CPPUNIT_ASSERT_MESSAGE("Testing availability of AnnotationPlacer service", ap1_test1); - mitk::AnnotationPlacer* ap2_test1 = mitk::AnnotationPlacer::GetAnnotationRenderer("test1"); + mitk::AnnotationPlacer *ap2_test1 = mitk::AnnotationPlacer::GetAnnotationRenderer("test1"); CPPUNIT_ASSERT_MESSAGE("Testing if AnnotationPlacer of same kind stays avaliable", ap1_test1 == ap2_test1); - mitk::AnnotationPlacer* ap1_test2 = mitk::AnnotationPlacer::GetAnnotationRenderer("test2"); + mitk::AnnotationPlacer *ap1_test2 = mitk::AnnotationPlacer::GetAnnotationRenderer("test2"); CPPUNIT_ASSERT_MESSAGE("Testing if new instance can be created by using different ID", ap1_test2 != ap1_test1); - mitk::OverlayLayouter2D* ol1_test1 = mitk::OverlayLayouter2D::GetAnnotationRenderer("test1"); + mitk::OverlayLayouter2D *ol1_test1 = mitk::OverlayLayouter2D::GetAnnotationRenderer("test1"); CPPUNIT_ASSERT_MESSAGE("Testing availability of OverlayLayouter2D service", ol1_test1); - mitk::OverlayLayouter2D* ol2_test1 = mitk::OverlayLayouter2D::GetAnnotationRenderer("test1"); + mitk::OverlayLayouter2D *ol2_test1 = mitk::OverlayLayouter2D::GetAnnotationRenderer("test1"); CPPUNIT_ASSERT_MESSAGE("Testing if OverlayLayouter2D of same kind stays avaliable", ol2_test1 == ol1_test1); - mitk::OverlayLayouter2D* ol1_test2 = mitk::OverlayLayouter2D::GetAnnotationRenderer("test2"); + mitk::OverlayLayouter2D *ol1_test2 = mitk::OverlayLayouter2D::GetAnnotationRenderer("test2"); CPPUNIT_ASSERT_MESSAGE("Testing if new instance can be created by using different ID", ol1_test2 != ol1_test1); - CPPUNIT_ASSERT_MESSAGE("Testing if OverlayLayouter2D and AnnotationPlacer services are different", - (mitk::AbstractAnnotationRenderer*)ol1_test1 != (mitk::AbstractAnnotationRenderer*)ap1_test1); - + CPPUNIT_ASSERT_MESSAGE( + "Testing if OverlayLayouter2D and AnnotationPlacer services are different", + (mitk::AbstractAnnotationRenderer *)ol1_test1 != (mitk::AbstractAnnotationRenderer *)ap1_test1); } - void OverlayTest() - { - - } + void OverlayTest() {} }; MITK_TEST_SUITE_REGISTRATION(mitkOverlays)