From 658c19b35294d29773eaca00394c7d91a1e1f586 Mon Sep 17 00:00:00 2001 From: Krad Date: Thu, 30 Jun 2022 17:19:45 +0800 Subject: [PATCH] Add Actor classes to Rendering/Measure package. --- .../Measure}/AngleAnnotationActor.cpp | 0 .../Measure}/AngleAnnotationActor.h | 0 .../Measure}/ArrowAnnotationActor.cpp | 2 +- .../Measure}/ArrowAnnotationActor.h | 0 .../Measure}/EllipseAnnotationActor.cpp | 0 .../Measure}/EllipseAnnotationActor.h | 0 .../Measure}/LineAnnotationActor.cpp | 0 .../Measure}/LineAnnotationActor.h | 0 src/src/Rendering/Measure/MeasureFactory.cpp | 12 ++++++------ .../Measure}/OpenPolyAnnotationActor.cpp | 0 .../Measure}/OpenPolyAnnotationActor.h | 0 .../Measure}/RulerAnnotationActor.cpp | 2 +- .../Measure}/RulerAnnotationActor.h | 0 .../Measure}/TextAnnotationActor.cpp | 2 +- .../Measure}/TextAnnotationActor.h | 0 src/src/measure/calibrationWidget.cpp | 2 +- src/src/measure/calibrationWidget.h | 2 +- src/src/measure/pqFontPropertyWidget.h | 2 +- 18 files changed, 12 insertions(+), 12 deletions(-) rename src/src/{measure => Rendering/Measure}/AngleAnnotationActor.cpp (100%) rename src/src/{measure => Rendering/Measure}/AngleAnnotationActor.h (100%) rename src/src/{measure => Rendering/Measure}/ArrowAnnotationActor.cpp (98%) rename src/src/{measure => Rendering/Measure}/ArrowAnnotationActor.h (100%) rename src/src/{measure => Rendering/Measure}/EllipseAnnotationActor.cpp (100%) rename src/src/{measure => Rendering/Measure}/EllipseAnnotationActor.h (100%) rename src/src/{measure => Rendering/Measure}/LineAnnotationActor.cpp (100%) rename src/src/{measure => Rendering/Measure}/LineAnnotationActor.h (100%) rename src/src/{measure => Rendering/Measure}/OpenPolyAnnotationActor.cpp (100%) rename src/src/{measure => Rendering/Measure}/OpenPolyAnnotationActor.h (100%) rename src/src/{measure => Rendering/Measure}/RulerAnnotationActor.cpp (98%) rename src/src/{measure => Rendering/Measure}/RulerAnnotationActor.h (100%) rename src/src/{measure => Rendering/Measure}/TextAnnotationActor.cpp (99%) rename src/src/{measure => Rendering/Measure}/TextAnnotationActor.h (100%) diff --git a/src/src/measure/AngleAnnotationActor.cpp b/src/src/Rendering/Measure/AngleAnnotationActor.cpp similarity index 100% rename from src/src/measure/AngleAnnotationActor.cpp rename to src/src/Rendering/Measure/AngleAnnotationActor.cpp diff --git a/src/src/measure/AngleAnnotationActor.h b/src/src/Rendering/Measure/AngleAnnotationActor.h similarity index 100% rename from src/src/measure/AngleAnnotationActor.h rename to src/src/Rendering/Measure/AngleAnnotationActor.h diff --git a/src/src/measure/ArrowAnnotationActor.cpp b/src/src/Rendering/Measure/ArrowAnnotationActor.cpp similarity index 98% rename from src/src/measure/ArrowAnnotationActor.cpp rename to src/src/Rendering/Measure/ArrowAnnotationActor.cpp index 7e01677..8292e03 100644 --- a/src/src/measure/ArrowAnnotationActor.cpp +++ b/src/src/Rendering/Measure/ArrowAnnotationActor.cpp @@ -13,7 +13,7 @@ #include #include "Rendering/Core/ControlPointRActor.h" -#include "vtkArrow2DSource.h" +#include "measure/vtkArrow2DSource.h" vtkStandardNewMacro(ArrowAnnotationActor) diff --git a/src/src/measure/ArrowAnnotationActor.h b/src/src/Rendering/Measure/ArrowAnnotationActor.h similarity index 100% rename from src/src/measure/ArrowAnnotationActor.h rename to src/src/Rendering/Measure/ArrowAnnotationActor.h diff --git a/src/src/measure/EllipseAnnotationActor.cpp b/src/src/Rendering/Measure/EllipseAnnotationActor.cpp similarity index 100% rename from src/src/measure/EllipseAnnotationActor.cpp rename to src/src/Rendering/Measure/EllipseAnnotationActor.cpp diff --git a/src/src/measure/EllipseAnnotationActor.h b/src/src/Rendering/Measure/EllipseAnnotationActor.h similarity index 100% rename from src/src/measure/EllipseAnnotationActor.h rename to src/src/Rendering/Measure/EllipseAnnotationActor.h diff --git a/src/src/measure/LineAnnotationActor.cpp b/src/src/Rendering/Measure/LineAnnotationActor.cpp similarity index 100% rename from src/src/measure/LineAnnotationActor.cpp rename to src/src/Rendering/Measure/LineAnnotationActor.cpp diff --git a/src/src/measure/LineAnnotationActor.h b/src/src/Rendering/Measure/LineAnnotationActor.h similarity index 100% rename from src/src/measure/LineAnnotationActor.h rename to src/src/Rendering/Measure/LineAnnotationActor.h diff --git a/src/src/Rendering/Measure/MeasureFactory.cpp b/src/src/Rendering/Measure/MeasureFactory.cpp index 276861f..5f1bf4b 100644 --- a/src/src/Rendering/Measure/MeasureFactory.cpp +++ b/src/src/Rendering/Measure/MeasureFactory.cpp @@ -4,12 +4,12 @@ #include "MeasureFactory.h" -#include "measure/RulerAnnotationActor.h" -#include "measure/AngleAnnotationActor.h" -#include "measure/OpenPolyAnnotationActor.h" -#include "measure/TextAnnotationActor.h" -#include "measure/ArrowAnnotationActor.h" -#include "measure/EllipseAnnotationActor.h" +#include "RulerAnnotationActor.h" +#include "AngleAnnotationActor.h" +#include "OpenPolyAnnotationActor.h" +#include "TextAnnotationActor.h" +#include "ArrowAnnotationActor.h" +#include "EllipseAnnotationActor.h" Measure *MeasureFactory::getMeasure(AnnotationActorType type) { switch (type) { diff --git a/src/src/measure/OpenPolyAnnotationActor.cpp b/src/src/Rendering/Measure/OpenPolyAnnotationActor.cpp similarity index 100% rename from src/src/measure/OpenPolyAnnotationActor.cpp rename to src/src/Rendering/Measure/OpenPolyAnnotationActor.cpp diff --git a/src/src/measure/OpenPolyAnnotationActor.h b/src/src/Rendering/Measure/OpenPolyAnnotationActor.h similarity index 100% rename from src/src/measure/OpenPolyAnnotationActor.h rename to src/src/Rendering/Measure/OpenPolyAnnotationActor.h diff --git a/src/src/measure/RulerAnnotationActor.cpp b/src/src/Rendering/Measure/RulerAnnotationActor.cpp similarity index 98% rename from src/src/measure/RulerAnnotationActor.cpp rename to src/src/Rendering/Measure/RulerAnnotationActor.cpp index 3b819d1..2829abb 100644 --- a/src/src/measure/RulerAnnotationActor.cpp +++ b/src/src/Rendering/Measure/RulerAnnotationActor.cpp @@ -15,7 +15,7 @@ #include "Interaction/ActorDraggableInteractorStyle.h" #include "Rendering/Core/ControlPointActor.h" -#include "calibrationWidget.h" +#include "measure/calibrationWidget.h" vtkStandardNewMacro(RulerAnnotationActor) diff --git a/src/src/measure/RulerAnnotationActor.h b/src/src/Rendering/Measure/RulerAnnotationActor.h similarity index 100% rename from src/src/measure/RulerAnnotationActor.h rename to src/src/Rendering/Measure/RulerAnnotationActor.h diff --git a/src/src/measure/TextAnnotationActor.cpp b/src/src/Rendering/Measure/TextAnnotationActor.cpp similarity index 99% rename from src/src/measure/TextAnnotationActor.cpp rename to src/src/Rendering/Measure/TextAnnotationActor.cpp index 4da52f1..554fc81 100644 --- a/src/src/measure/TextAnnotationActor.cpp +++ b/src/src/Rendering/Measure/TextAnnotationActor.cpp @@ -12,7 +12,7 @@ #include #include -#include "pqFontPropertyWidget.h" +#include "measure/pqFontPropertyWidget.h" #include "Interaction/ActorDraggableInteractorStyle.h" vtkStandardNewMacro(TextAnnotationActor) diff --git a/src/src/measure/TextAnnotationActor.h b/src/src/Rendering/Measure/TextAnnotationActor.h similarity index 100% rename from src/src/measure/TextAnnotationActor.h rename to src/src/Rendering/Measure/TextAnnotationActor.h diff --git a/src/src/measure/calibrationWidget.cpp b/src/src/measure/calibrationWidget.cpp index 1a6a00b..bf2d322 100644 --- a/src/src/measure/calibrationWidget.cpp +++ b/src/src/measure/calibrationWidget.cpp @@ -1,5 +1,5 @@ #include "calibrationWidget.h" -#include "RulerAnnotationActor.h" +#include "Rendering/Measure/RulerAnnotationActor.h" #include "vtkRenderWindowInteractor.h" diff --git a/src/src/measure/calibrationWidget.h b/src/src/measure/calibrationWidget.h index 6dbb7b7..4995c7b 100644 --- a/src/src/measure/calibrationWidget.h +++ b/src/src/measure/calibrationWidget.h @@ -1,7 +1,7 @@ #pragma once #include #include "ui_calibrationWidget.h" -#include "RulerAnnotationActor.h" +#include "Rendering/Measure/RulerAnnotationActor.h" namespace Ui { class calibrationWidget; diff --git a/src/src/measure/pqFontPropertyWidget.h b/src/src/measure/pqFontPropertyWidget.h index 55e0f75..089c41e 100644 --- a/src/src/measure/pqFontPropertyWidget.h +++ b/src/src/measure/pqFontPropertyWidget.h @@ -2,7 +2,7 @@ #include #include "ui_pqFontPropertyWidget.h" -#include "TextAnnotationActor.h" +#include "Rendering/Measure/TextAnnotationActor.h" namespace Ui { class FontPropertyWidget;