Rendering/Measure package.

src/src/Rendering/Measure/MeasureFactory.cpp

@@ -4,12 +4,12 @@
 
 #include "MeasureFactory.h"
 
-#include "RulerAnnotationActor.h"
-#include "AngleAnnotationActor.h"
-#include "OpenPolyAnnotationActor.h"
-#include "TextAnnotationActor.h"
-#include "ArrowAnnotationActor.h"
-#include "EllipseAnnotationActor.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"
 
 Measure *MeasureFactory::getMeasure(AnnotationActorType type) {
     switch (type) {

src/src/Rendering/infinitiViewer.cxx

@@ -18,7 +18,7 @@
 #include "vtkPiecewiseFunction.h"
 #include "vector"
 #include "vtkCornerAnnotation.h"
-#include "measure/MeasureStore.h"
+#include "Rendering/Measure/MeasureStore.h"
 #include "vtkTextActor.h"
 #include "vtkTextProperty.h"
 #include "IO/General/ColorMapReader.h"

src/src/UI/Widget/viewcontainerwidget.cpp

@@ -13,7 +13,7 @@
 #include "cine/pqVCRToolbar.h"
 #include <QMessageBox>
 #include "Interaction/ActorDraggableInteractorStyle.h"
-#include "measure/MeasureFactory.h"
+#include "Rendering/Measure/MeasureFactory.h"
 //-------------------------------------------------------
 
 

src/src/measure/AngleAnnotationActor.h

@@ -7,7 +7,7 @@
 
 
 #include "DraggableActor.h"
-#include "Measure.h"
+#include "Rendering/Measure/Measure.h"
 
 class ControlPointActor;
 

src/src/measure/DraggableActor.h

@@ -9,7 +9,7 @@
 #include <vtkProp.h>
 #include <vtkCommand.h>
 
-#include "Measure.h"
+#include "Rendering/Measure/Measure.h"
 
 class vtkPolyData;
 

src/src/measure/EllipseAnnotationActor.h

@@ -6,7 +6,7 @@
 #define OMEGAV_EllipseANNOTATIONACTOR_H
 
 #include "DraggableActor.h"
-#include "Measure.h"
+#include "Rendering/Measure/Measure.h"
 
 class vtkTextProperty;
 

src/src/measure/LineAnnotationActor.h

@@ -6,7 +6,7 @@
 #define OMEGAV_LINEANNOTATIONACTOR_H
 
 #include "DraggableActor.h"
-#include "Measure.h"
+#include "Rendering/Measure/Measure.h"
 
 class ControlPointActor;
 

src/src/measure/OpenPolyAnnotationActor.h

@@ -6,7 +6,7 @@
 #define OMEGAV_OPENPOLYANNOTATIONACTOR_H
 
 #include "DraggableActor.h"
-#include "Measure.h"
+#include "Rendering/Measure/Measure.h"
 
 class ControlPointRActor;
 

src/src/measure/TextAnnotationActor.h

@@ -10,7 +10,7 @@
 #include <vtkTextProperty.h>
 
 #include "DraggableActor.h"
-#include "Measure.h"
+#include "Rendering/Measure/Measure.h"
 
 class ControlPointActor;