Rearrange files in the project.

CMakeLists.txt

@@ -11,18 +11,11 @@ file(GLOB_RECURSE project_cxx src/*.cxx)
 file(GLOB_RECURSE project_cc src/*.cc)
 
 include_directories(
-    ${CMAKE_BINARY_DIR}
+    ./src/src/
-    ${CMAKE_SOURCE_DIR}/src/include
+    ./src/src/base
-    ${CMAKE_SOURCE_DIR}/src/include/base
+    ./src/src/global
-    ${CMAKE_SOURCE_DIR}/src/include/callback
+    ./src/src/view
-    ${CMAKE_SOURCE_DIR}/src/include/dialog
+    ./src/src/view/subview
-    ${CMAKE_SOURCE_DIR}/src/include/export
-    ${CMAKE_SOURCE_DIR}/src/include/global
-    ${CMAKE_SOURCE_DIR}/src/include/measure
-    ${CMAKE_SOURCE_DIR}/src/include/view
-    ${CMAKE_SOURCE_DIR}/src/include/view/subview
-	${CMAKE_SOURCE_DIR}/src/include/cine
-	${CMAKE_SOURCE_DIR}/src/include/util
     )
 
 

src/src/QDicomViewer.cpp

@@ -11,15 +11,15 @@
 #include <QMenu>
 #include <QButtonGroup>
 #include <QRect>
-#include "ControlPointActor.h"
+#include "measure/ControlPointActor.h"
-#include "RulerAnnotationActor.h"
+#include "measure/RulerAnnotationActor.h"
-#include "AngleAnnotationActor.h"
+#include "measure/AngleAnnotationActor.h"
-#include "TextAnnotationActor.h"
+#include "measure/TextAnnotationActor.h"
-#include "EllipseAnnotationActor.h"
+#include "measure/EllipseAnnotationActor.h"
-#include "OpenPolyAnnotationActor.h"
+#include "measure/OpenPolyAnnotationActor.h"
-#include "ArrowAnnotationActor.h"
+#include "measure/ArrowAnnotationActor.h"
-#include "pqFontPropertyWidget.h"
+#include "measure/pqFontPropertyWidget.h"
-#include "pqVCRToolbar.h"
+#include "cine/pqVCRToolbar.h"
 
 #include <QMessageBox>
 

src/src/QDicomViewer.h

@@ -3,9 +3,9 @@
 #include "ui_QDicomViewer.h"
 #include "importwidget.h"
 #include <QSettings>
-#include "exportdialog.h"
+#include "export/exportdialog.h"
 #include "Customwindow.h"
-#include "pqFontPropertyWidget.h"
+#include "measure/pqFontPropertyWidget.h"
 
 /**
  * @brief 主窗口Class

src/src/base/SeriesImageSet.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "global/include_all.h"
 #include "global/QGlobals.h"
-#include "ActorDraggableInteractorStyle.h"
+#include "measure/ActorDraggableInteractorStyle.h"
 #include "global/include_vitk.h"
 //#include "QVTKWidget.h"
 #include <memory>

src/src/base/infinitiViewer.cxx

@@ -3,7 +3,7 @@
 #include "vtkCommand.h"
 #include "vtkImageData.h"
 #include "vtkInformation.h"
-#include "ActorDraggableInteractorStyle.h"
+#include "measure/ActorDraggableInteractorStyle.h"
 #include "vtkObjectFactory.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderWindowInteractor.h"
@@ -18,13 +18,13 @@
 #include "vtkPiecewiseFunction.h"
 #include "vector"
 #include "vtkCornerAnnotation.h"
-#include "Measure.h"
+#include "measure/Measure.h"
-#include "MeasureStore.h"
+#include "measure/MeasureStore.h"
 #include "vtkTextActor.h"
 #include "vtkTextProperty.h"
 #include "ExtendMedicalImageProperties.h"
-#include "RulerLegendActor.h"
+#include "measure/RulerLegendActor.h"
-#include "ColorMapReader.h"
+#include "util/ColorMapReader.h"
 
 
 #include "DicomLoader.h"

src/src/base/infinitiViewer.h

@@ -5,12 +5,12 @@
 #include "vtkObject.h"
 #include "vector"
 #include "QList"
-#include "DraggableActor.h"
+#include "measure\DraggableActor.h"
 
 //for convert vtkEvent to Qt signal
-#include "vtkSignalRaiser.h"
+#include "measure\vtkSignalRaiser.h"
-#include "RulerLegendActor.h"
+#include "measure\RulerLegendActor.h"
-#include "QGlobals.h"
+#include "global\QGlobals.h"
 
 class vtkAlgorithm;
 class vtkAlgorithmOutput;

src/src/export/exportdialog.h

@@ -6,7 +6,7 @@
 #include "qdir.h"
 #include "dicomexporterthread.h"
 #include "QFileDialog"
-#include "DicomLoader.h"
+#include "base/DicomLoader.h"
 #include "dicomimageview.h"
 
 

src/src/measure/ArrowAnnotationActor.cpp

@@ -10,7 +10,7 @@
 #include "vtkRenderer.h"
 #include "vtkRenderWindow.h"
 #include "ControlPointRActor.h"
-#include <vtkArrow2DSource.h>
+#include "vtkArrow2DSource.h"
 
 
 

src/src/view/dicomimageview.cpp

@@ -10,9 +10,9 @@
 #include "vtkImageProperty.h"
 #include "view/subview/mytitlebar.h"
 
-#include "ActorDraggableInteractorStyle.h"
+#include "measure/ActorDraggableInteractorStyle.h"
-#include "pqVCRController.h"
+#include "cine/pqVCRController.h"
-#include "pqVCRToolbar.h"
+#include "cine/pqVCRToolbar.h"
 #include "vtkDiscretizableColorTransferFunction.h"
 #include "metaDataWindow.h"
 

src/src/view/subview/moveworker.cpp

@@ -1,4 +1,4 @@
-#include "../../../include/view/subview/moveworker.h"
+#include "view/subview/moveworker.h"
 
 MoveWorker::MoveWorker(const QString& peerIP, unsigned long long peerPort, const QString& peerTitle, unsigned long long ourPort, const QString& ourTitle, const QString& outputDirectory, QObject *parent)
 	: QObject(parent)

src/src/view/subview/moveworker.h

@@ -2,10 +2,10 @@
 #define _MOVEWORKER_H_
 
 #include <QObject>
-#include "../../../include/base/dicomviewertype.h"
+#include "base/dicomviewertype.h"
-#include "../../../include/callback/callbackhelper.h"
+#include "callback/callbackhelper.h"
-#include "../../../include/callback/cmovecallback.h"
+#include "callback/cmovecallback.h"
-#include "../../../include/callback/cmovestorescpcallback.h"
+#include "callback/cmovestorescpcallback.h"
 
 
 class MoveWorker : public QObject

src/src/view/subview/queryworker.cpp

@@ -1,4 +1,4 @@
-#include "../../../include/view/subview/queryworker.h"
+#include "view/subview/queryworker.h"
 #include "dcmtk/dcmdata/dcdatset.h"
 
 QueryWorker::QueryWorker(const QString& peerIP, unsigned long peerPort, const QString& peerTitle, const QString& ourTitle, QObject *parent)

src/src/view/subview/queryworker.h

@@ -2,9 +2,9 @@
 #define _QUERYWORKER_H_
 
 #include <QObject>
-#include "../../../include/callback/callbackhelper.h"
+#include "callback/callbackhelper.h"
-#include "../../../include/callback/cfindcallback.h"
+#include "callback/cfindcallback.h"
-#include "../../../include/base/dicomviewertype.h"
+#include "base/dicomviewertype.h"
 
 class DcmDataset;
 

src/src/view/subview/radiusprogressbar.cpp

@@ -1,4 +1,4 @@
-#include "../../../include/view/subview/radiusprogressbar.h"
+#include "view/subview/radiusprogressbar.h"
 #include <QPainter>
 
 RadiusProgressBar::RadiusProgressBar(QWidget *parent)

src/src/view/viewcontainerwidget.cpp

@@ -9,7 +9,7 @@
 #include <QDebug>
 #include "qstyleoption.h"
 #include "qpainter.h"
-#include "pqVCRToolbar.h"
+#include "cine/pqVCRToolbar.h"
 #include <QMessageBox>
 //-------------------------------------------------------