From 5d4a75c899fa28ca0363444cf58fd42463b59c47 Mon Sep 17 00:00:00 2001 From: Krad Date: Thu, 30 Jun 2022 17:17:19 +0800 Subject: [PATCH] Rendering/Core package. --- src/src/Interaction/ActorDraggableInteractorStyle.cpp | 2 +- src/src/{measure => Rendering/Core}/AnnotationActor.cpp | 0 src/src/{measure => Rendering/Core}/AnnotationActor.h | 0 src/src/{measure => Rendering/Core}/ControlPointActor.cpp | 0 src/src/{measure => Rendering/Core}/ControlPointActor.h | 0 src/src/{measure => Rendering/Core}/ControlPointRActor.cpp | 0 src/src/{measure => Rendering/Core}/ControlPointRActor.h | 0 src/src/{measure => Rendering/Core}/DraggableActor.cpp | 0 src/src/{measure => Rendering/Core}/DraggableActor.h | 0 src/src/Rendering/infinitiViewer.h | 2 +- src/src/measure/AngleAnnotationActor.cpp | 2 +- src/src/measure/AngleAnnotationActor.h | 2 +- src/src/measure/ArrowAnnotationActor.cpp | 2 +- src/src/measure/EllipseAnnotationActor.cpp | 2 +- src/src/measure/EllipseAnnotationActor.h | 2 +- src/src/measure/LineAnnotationActor.cpp | 2 +- src/src/measure/LineAnnotationActor.h | 2 +- src/src/measure/OpenPolyAnnotationActor.cpp | 2 +- src/src/measure/OpenPolyAnnotationActor.h | 2 +- src/src/measure/RulerAnnotationActor.cpp | 2 +- src/src/measure/TextAnnotationActor.h | 2 +- 21 files changed, 13 insertions(+), 13 deletions(-) rename src/src/{measure => Rendering/Core}/AnnotationActor.cpp (100%) rename src/src/{measure => Rendering/Core}/AnnotationActor.h (100%) rename src/src/{measure => Rendering/Core}/ControlPointActor.cpp (100%) rename src/src/{measure => Rendering/Core}/ControlPointActor.h (100%) rename src/src/{measure => Rendering/Core}/ControlPointRActor.cpp (100%) rename src/src/{measure => Rendering/Core}/ControlPointRActor.h (100%) rename src/src/{measure => Rendering/Core}/DraggableActor.cpp (100%) rename src/src/{measure => Rendering/Core}/DraggableActor.h (100%) diff --git a/src/src/Interaction/ActorDraggableInteractorStyle.cpp b/src/src/Interaction/ActorDraggableInteractorStyle.cpp index 5562a0e..ed8bc59 100644 --- a/src/src/Interaction/ActorDraggableInteractorStyle.cpp +++ b/src/src/Interaction/ActorDraggableInteractorStyle.cpp @@ -21,7 +21,7 @@ #include #include -#include "measure/DraggableActor.h" +#include "Rendering/Core/DraggableActor.h" #include "Common/QGlobals.h" vtkStandardNewMacro(ActorDraggableInteractorStyle) diff --git a/src/src/measure/AnnotationActor.cpp b/src/src/Rendering/Core/AnnotationActor.cpp similarity index 100% rename from src/src/measure/AnnotationActor.cpp rename to src/src/Rendering/Core/AnnotationActor.cpp diff --git a/src/src/measure/AnnotationActor.h b/src/src/Rendering/Core/AnnotationActor.h similarity index 100% rename from src/src/measure/AnnotationActor.h rename to src/src/Rendering/Core/AnnotationActor.h diff --git a/src/src/measure/ControlPointActor.cpp b/src/src/Rendering/Core/ControlPointActor.cpp similarity index 100% rename from src/src/measure/ControlPointActor.cpp rename to src/src/Rendering/Core/ControlPointActor.cpp diff --git a/src/src/measure/ControlPointActor.h b/src/src/Rendering/Core/ControlPointActor.h similarity index 100% rename from src/src/measure/ControlPointActor.h rename to src/src/Rendering/Core/ControlPointActor.h diff --git a/src/src/measure/ControlPointRActor.cpp b/src/src/Rendering/Core/ControlPointRActor.cpp similarity index 100% rename from src/src/measure/ControlPointRActor.cpp rename to src/src/Rendering/Core/ControlPointRActor.cpp diff --git a/src/src/measure/ControlPointRActor.h b/src/src/Rendering/Core/ControlPointRActor.h similarity index 100% rename from src/src/measure/ControlPointRActor.h rename to src/src/Rendering/Core/ControlPointRActor.h diff --git a/src/src/measure/DraggableActor.cpp b/src/src/Rendering/Core/DraggableActor.cpp similarity index 100% rename from src/src/measure/DraggableActor.cpp rename to src/src/Rendering/Core/DraggableActor.cpp diff --git a/src/src/measure/DraggableActor.h b/src/src/Rendering/Core/DraggableActor.h similarity index 100% rename from src/src/measure/DraggableActor.h rename to src/src/Rendering/Core/DraggableActor.h diff --git a/src/src/Rendering/infinitiViewer.h b/src/src/Rendering/infinitiViewer.h index 35a4a83..cec9ca8 100644 --- a/src/src/Rendering/infinitiViewer.h +++ b/src/src/Rendering/infinitiViewer.h @@ -5,7 +5,7 @@ #include "vtkObject.h" #include "vector" #include "QList" -#include "measure\DraggableActor.h" +#include "Rendering/Core/DraggableActor.h" #include "vtkMatrix4x4.h" //for convert vtkEvent to Qt signal diff --git a/src/src/measure/AngleAnnotationActor.cpp b/src/src/measure/AngleAnnotationActor.cpp index 65eff19..69718eb 100644 --- a/src/src/measure/AngleAnnotationActor.cpp +++ b/src/src/measure/AngleAnnotationActor.cpp @@ -14,7 +14,7 @@ #include #include -#include "ControlPointActor.h" +#include "Rendering/Core/ControlPointActor.h" vtkStandardNewMacro(AngleAnnotationActor) diff --git a/src/src/measure/AngleAnnotationActor.h b/src/src/measure/AngleAnnotationActor.h index 73725b3..ec17236 100644 --- a/src/src/measure/AngleAnnotationActor.h +++ b/src/src/measure/AngleAnnotationActor.h @@ -6,7 +6,7 @@ #define OMEGAV_ANGLEANNOTATIONACTOR_H -#include "DraggableActor.h" +#include "Rendering/Core/DraggableActor.h" #include "Rendering/Measure/Measure.h" class ControlPointActor; diff --git a/src/src/measure/ArrowAnnotationActor.cpp b/src/src/measure/ArrowAnnotationActor.cpp index 9fbe0bd..7e01677 100644 --- a/src/src/measure/ArrowAnnotationActor.cpp +++ b/src/src/measure/ArrowAnnotationActor.cpp @@ -12,7 +12,7 @@ #include #include -#include "ControlPointRActor.h" +#include "Rendering/Core/ControlPointRActor.h" #include "vtkArrow2DSource.h" vtkStandardNewMacro(ArrowAnnotationActor) diff --git a/src/src/measure/EllipseAnnotationActor.cpp b/src/src/measure/EllipseAnnotationActor.cpp index a97d1d2..5e2da3c 100644 --- a/src/src/measure/EllipseAnnotationActor.cpp +++ b/src/src/measure/EllipseAnnotationActor.cpp @@ -16,7 +16,7 @@ #include #include -#include "ControlPointActor.h" +#include "Rendering/Core/ControlPointActor.h" vtkStandardNewMacro(EllipseAnnotationActor) diff --git a/src/src/measure/EllipseAnnotationActor.h b/src/src/measure/EllipseAnnotationActor.h index 93a1171..9f9079c 100644 --- a/src/src/measure/EllipseAnnotationActor.h +++ b/src/src/measure/EllipseAnnotationActor.h @@ -5,7 +5,7 @@ #ifndef OMEGAV_EllipseANNOTATIONACTOR_H #define OMEGAV_EllipseANNOTATIONACTOR_H -#include "DraggableActor.h" +#include "Rendering/Core/DraggableActor.h" #include "Rendering/Measure/Measure.h" class vtkTextProperty; diff --git a/src/src/measure/LineAnnotationActor.cpp b/src/src/measure/LineAnnotationActor.cpp index 6dde041..5e3c405 100644 --- a/src/src/measure/LineAnnotationActor.cpp +++ b/src/src/measure/LineAnnotationActor.cpp @@ -9,7 +9,7 @@ #include #include -#include "ControlPointActor.h" +#include "Rendering/Core/ControlPointActor.h" vtkStandardNewMacro(LineAnnotationActor) diff --git a/src/src/measure/LineAnnotationActor.h b/src/src/measure/LineAnnotationActor.h index 7597ffc..75f348d 100644 --- a/src/src/measure/LineAnnotationActor.h +++ b/src/src/measure/LineAnnotationActor.h @@ -5,7 +5,7 @@ #ifndef OMEGAV_LINEANNOTATIONACTOR_H #define OMEGAV_LINEANNOTATIONACTOR_H -#include "DraggableActor.h" +#include "Rendering/Core/DraggableActor.h" #include "Rendering/Measure/Measure.h" class ControlPointActor; diff --git a/src/src/measure/OpenPolyAnnotationActor.cpp b/src/src/measure/OpenPolyAnnotationActor.cpp index 8534fcb..6ac865d 100644 --- a/src/src/measure/OpenPolyAnnotationActor.cpp +++ b/src/src/measure/OpenPolyAnnotationActor.cpp @@ -8,7 +8,7 @@ #include #include -#include "ControlPointRActor.h" +#include "Rendering/Core/ControlPointRActor.h" vtkStandardNewMacro(OpenPolyAnnotationActor) diff --git a/src/src/measure/OpenPolyAnnotationActor.h b/src/src/measure/OpenPolyAnnotationActor.h index c9ff03e..9db21c1 100644 --- a/src/src/measure/OpenPolyAnnotationActor.h +++ b/src/src/measure/OpenPolyAnnotationActor.h @@ -5,7 +5,7 @@ #ifndef OMEGAV_OPENPOLYANNOTATIONACTOR_H #define OMEGAV_OPENPOLYANNOTATIONACTOR_H -#include "DraggableActor.h" +#include "Rendering/Core/DraggableActor.h" #include "Rendering/Measure/Measure.h" class ControlPointRActor; diff --git a/src/src/measure/RulerAnnotationActor.cpp b/src/src/measure/RulerAnnotationActor.cpp index 37e2ee5..3b819d1 100644 --- a/src/src/measure/RulerAnnotationActor.cpp +++ b/src/src/measure/RulerAnnotationActor.cpp @@ -14,7 +14,7 @@ #include #include "Interaction/ActorDraggableInteractorStyle.h" -#include "ControlPointActor.h" +#include "Rendering/Core/ControlPointActor.h" #include "calibrationWidget.h" vtkStandardNewMacro(RulerAnnotationActor) diff --git a/src/src/measure/TextAnnotationActor.h b/src/src/measure/TextAnnotationActor.h index 1dec53c..34b5843 100644 --- a/src/src/measure/TextAnnotationActor.h +++ b/src/src/measure/TextAnnotationActor.h @@ -9,7 +9,7 @@ #include #include -#include "DraggableActor.h" +#include "Rendering/Core/DraggableActor.h" #include "Rendering/Measure/Measure.h" class ControlPointActor;