From 1aae083cdc36511653d13971efd1920d6048d9e0 Mon Sep 17 00:00:00 2001 From: Krad Date: Thu, 3 Mar 2022 16:12:28 +0800 Subject: [PATCH] Rearrange files in the project. --- CMakeLists.txt | 17 +++++------------ src/src/QDicomViewer.cpp | 18 +++++++++--------- src/{include => src}/QDicomViewer.h | 4 ++-- src/{form => src}/QDicomViewer.ui | 0 src/{include => src}/base/DicomLoader.h | 0 src/{include => src}/base/SeriesImageSet.h | 2 +- src/{include => src}/base/dicomviewerbase.h | 0 src/{include => src}/base/dicomviewerhelper.h | 0 src/{include => src}/base/dicomviewertype.h | 0 src/src/base/infinitiViewer.cxx | 10 +++++----- src/{include => src}/base/infinitiViewer.h | 8 ++++---- src/{include => src}/callback/callbackhelper.h | 0 src/{include => src}/callback/cfindcallback.h | 0 src/{include => src}/callback/cmovecallback.h | 0 .../callback/cmovestorescpcallback.h | 0 src/{include => src}/cine/pqVCRController.h | 0 src/{include => src}/cine/pqVCRToolbar.h | 0 src/{form => src/cine}/pqVCRToolbar.ui | 0 src/{include => src}/dialog/promptdialog.h | 0 .../dialog/promptdialogtitlebar.h | 0 src/{include => src}/dialog/qxtspanslider.h | 0 src/{include => src}/dialog/qxtspanslider_p.h | 0 src/{include => src}/export/dicomexporter.h | 0 .../export/dicomexporterthread.h | 0 src/{include => src}/export/exportdialog.h | 2 +- src/{form => src/export}/exportdialog.ui | 0 src/{include => src}/export/exportoptions.h | 0 src/{include => src}/global/QGlobals.h | 0 src/{include => src}/global/include_all.h | 0 src/{include => src}/global/include_dcmtk.h | 0 src/{include => src}/global/include_vitk.h | 0 .../measure/ActorDraggableInteractorStyle.h | 0 .../measure/AngleAnnotationActor.h | 0 src/{include => src}/measure/AnnotationActor.h | 0 src/src/measure/ArrowAnnotationActor.cpp | 2 +- .../measure/ArrowAnnotationActor.h | 0 .../measure/ControlPointActor.h | 0 .../measure/ControlPointRActor.h | 0 src/{include => src}/measure/DraggableActor.h | 0 .../measure/EllipseAnnotationActor.h | 0 src/{include => src}/measure/EventsCenter.h | 0 src/{include => src}/measure/HoverButton.h | 0 src/{include => src}/measure/KDicomObjects.h | 0 .../measure/LineAnnotationActor.h | 0 src/{include => src}/measure/Measure.h | 0 src/{include => src}/measure/MeasureStore.h | 0 .../measure/OpenPolyAnnotationActor.h | 0 .../measure/RulerAnnotationActor.h | 0 .../measure/RulerLegendActor.h | 0 src/{include => src}/measure/SeriesItem.h | 0 src/{include => src}/measure/StudyItem.h | 0 .../measure/TextAnnotationActor.h | 0 .../measure/calibrationWidget.h | 0 src/{form => src/measure}/calibrationWidget.ui | 0 .../measure/pqFontPropertyWidget.h | 0 .../measure}/pqFontPropertyWidget.ui | 0 .../measure/vtkArrow2DSource.h | 0 src/{include => src}/measure/vtkSignalRaiser.h | 0 src/{include => src}/util/ColorMapReader.h | 0 src/{include => src}/util/QDicomUtility.h | 0 src/src/view/dicomimageview.cpp | 6 +++--- src/{include => src}/view/dicomimageview.h | 0 .../view/subview/DicomTreeModel.h | 0 .../view/subview/customwindow.h | 0 .../view/subview/gridpopwidget.h | 0 .../view/subview}/gridpopwidget.ui | 0 .../view/subview/importtitlebar.h | 0 .../view/subview/importwidget.h | 0 .../view/subview/metaDataWindow.h | 0 src/src/view/subview/moveworker.cpp | 2 +- src/{include => src}/view/subview/moveworker.h | 8 ++++---- src/{include => src}/view/subview/mytitlebar.h | 0 .../view/subview/pacsconfiguration.h | 0 .../view/subview/pacsconfiguretitlebar.h | 0 src/src/view/subview/queryworker.cpp | 2 +- .../view/subview/queryworker.h | 6 +++--- src/src/view/subview/radiusprogressbar.cpp | 2 +- .../view/subview/radiusprogressbar.h | 0 src/{include => src}/view/thumbnailImage.h | 0 src/{include => src}/view/thumbnailbarwidget.h | 0 src/src/view/viewcontainerwidget.cpp | 2 +- .../view/viewcontainerwidget.h | 0 82 files changed, 42 insertions(+), 49 deletions(-) rename src/{include => src}/QDicomViewer.h (97%) rename src/{form => src}/QDicomViewer.ui (100%) rename src/{include => src}/base/DicomLoader.h (100%) rename src/{include => src}/base/SeriesImageSet.h (96%) rename src/{include => src}/base/dicomviewerbase.h (100%) rename src/{include => src}/base/dicomviewerhelper.h (100%) rename src/{include => src}/base/dicomviewertype.h (100%) rename src/{include => src}/base/infinitiViewer.h (98%) rename src/{include => src}/callback/callbackhelper.h (100%) rename src/{include => src}/callback/cfindcallback.h (100%) rename src/{include => src}/callback/cmovecallback.h (100%) rename src/{include => src}/callback/cmovestorescpcallback.h (100%) rename src/{include => src}/cine/pqVCRController.h (100%) rename src/{include => src}/cine/pqVCRToolbar.h (100%) rename src/{form => src/cine}/pqVCRToolbar.ui (100%) rename src/{include => src}/dialog/promptdialog.h (100%) rename src/{include => src}/dialog/promptdialogtitlebar.h (100%) rename src/{include => src}/dialog/qxtspanslider.h (100%) rename src/{include => src}/dialog/qxtspanslider_p.h (100%) rename src/{include => src}/export/dicomexporter.h (100%) rename src/{include => src}/export/dicomexporterthread.h (100%) rename src/{include => src}/export/exportdialog.h (96%) rename src/{form => src/export}/exportdialog.ui (100%) rename src/{include => src}/export/exportoptions.h (100%) rename src/{include => src}/global/QGlobals.h (100%) rename src/{include => src}/global/include_all.h (100%) rename src/{include => src}/global/include_dcmtk.h (100%) rename src/{include => src}/global/include_vitk.h (100%) rename src/{include => src}/measure/ActorDraggableInteractorStyle.h (100%) rename src/{include => src}/measure/AngleAnnotationActor.h (100%) rename src/{include => src}/measure/AnnotationActor.h (100%) rename src/{include => src}/measure/ArrowAnnotationActor.h (100%) rename src/{include => src}/measure/ControlPointActor.h (100%) rename src/{include => src}/measure/ControlPointRActor.h (100%) rename src/{include => src}/measure/DraggableActor.h (100%) rename src/{include => src}/measure/EllipseAnnotationActor.h (100%) rename src/{include => src}/measure/EventsCenter.h (100%) rename src/{include => src}/measure/HoverButton.h (100%) rename src/{include => src}/measure/KDicomObjects.h (100%) rename src/{include => src}/measure/LineAnnotationActor.h (100%) rename src/{include => src}/measure/Measure.h (100%) rename src/{include => src}/measure/MeasureStore.h (100%) rename src/{include => src}/measure/OpenPolyAnnotationActor.h (100%) rename src/{include => src}/measure/RulerAnnotationActor.h (100%) rename src/{include => src}/measure/RulerLegendActor.h (100%) rename src/{include => src}/measure/SeriesItem.h (100%) rename src/{include => src}/measure/StudyItem.h (100%) rename src/{include => src}/measure/TextAnnotationActor.h (100%) rename src/{include => src}/measure/calibrationWidget.h (100%) rename src/{form => src/measure}/calibrationWidget.ui (100%) rename src/{include => src}/measure/pqFontPropertyWidget.h (100%) rename src/{form => src/measure}/pqFontPropertyWidget.ui (100%) rename src/{include => src}/measure/vtkArrow2DSource.h (100%) rename src/{include => src}/measure/vtkSignalRaiser.h (100%) rename src/{include => src}/util/ColorMapReader.h (100%) rename src/{include => src}/util/QDicomUtility.h (100%) rename src/{include => src}/view/dicomimageview.h (100%) rename src/{include => src}/view/subview/DicomTreeModel.h (100%) rename src/{include => src}/view/subview/customwindow.h (100%) rename src/{include => src}/view/subview/gridpopwidget.h (100%) rename src/{form => src/view/subview}/gridpopwidget.ui (100%) rename src/{include => src}/view/subview/importtitlebar.h (100%) rename src/{include => src}/view/subview/importwidget.h (100%) rename src/{include => src}/view/subview/metaDataWindow.h (100%) rename src/{include => src}/view/subview/moveworker.h (81%) rename src/{include => src}/view/subview/mytitlebar.h (100%) rename src/{include => src}/view/subview/pacsconfiguration.h (100%) rename src/{include => src}/view/subview/pacsconfiguretitlebar.h (100%) rename src/{include => src}/view/subview/queryworker.h (90%) rename src/{include => src}/view/subview/radiusprogressbar.h (100%) rename src/{include => src}/view/thumbnailImage.h (100%) rename src/{include => src}/view/thumbnailbarwidget.h (100%) rename src/{include => src}/view/viewcontainerwidget.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1704cd0..cc2d8e9 100644 --- a/CMakeLists.txt +++ b/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} - ${CMAKE_SOURCE_DIR}/src/include - ${CMAKE_SOURCE_DIR}/src/include/base - ${CMAKE_SOURCE_DIR}/src/include/callback - ${CMAKE_SOURCE_DIR}/src/include/dialog - ${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/ + ./src/src/base + ./src/src/global + ./src/src/view + ./src/src/view/subview ) diff --git a/src/src/QDicomViewer.cpp b/src/src/QDicomViewer.cpp index 6a8bd62..e5cf7e1 100644 --- a/src/src/QDicomViewer.cpp +++ b/src/src/QDicomViewer.cpp @@ -11,15 +11,15 @@ #include #include #include -#include "ControlPointActor.h" -#include "RulerAnnotationActor.h" -#include "AngleAnnotationActor.h" -#include "TextAnnotationActor.h" -#include "EllipseAnnotationActor.h" -#include "OpenPolyAnnotationActor.h" -#include "ArrowAnnotationActor.h" -#include "pqFontPropertyWidget.h" -#include "pqVCRToolbar.h" +#include "measure/ControlPointActor.h" +#include "measure/RulerAnnotationActor.h" +#include "measure/AngleAnnotationActor.h" +#include "measure/TextAnnotationActor.h" +#include "measure/EllipseAnnotationActor.h" +#include "measure/OpenPolyAnnotationActor.h" +#include "measure/ArrowAnnotationActor.h" +#include "measure/pqFontPropertyWidget.h" +#include "cine/pqVCRToolbar.h" #include diff --git a/src/include/QDicomViewer.h b/src/src/QDicomViewer.h similarity index 97% rename from src/include/QDicomViewer.h rename to src/src/QDicomViewer.h index 4866b5b..e3ed4a4 100644 --- a/src/include/QDicomViewer.h +++ b/src/src/QDicomViewer.h @@ -3,9 +3,9 @@ #include "ui_QDicomViewer.h" #include "importwidget.h" #include -#include "exportdialog.h" +#include "export/exportdialog.h" #include "Customwindow.h" -#include "pqFontPropertyWidget.h" +#include "measure/pqFontPropertyWidget.h" /** * @brief 主窗口Class diff --git a/src/form/QDicomViewer.ui b/src/src/QDicomViewer.ui similarity index 100% rename from src/form/QDicomViewer.ui rename to src/src/QDicomViewer.ui diff --git a/src/include/base/DicomLoader.h b/src/src/base/DicomLoader.h similarity index 100% rename from src/include/base/DicomLoader.h rename to src/src/base/DicomLoader.h diff --git a/src/include/base/SeriesImageSet.h b/src/src/base/SeriesImageSet.h similarity index 96% rename from src/include/base/SeriesImageSet.h rename to src/src/base/SeriesImageSet.h index c9bcb61..c32be22 100644 --- a/src/include/base/SeriesImageSet.h +++ b/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 diff --git a/src/include/base/dicomviewerbase.h b/src/src/base/dicomviewerbase.h similarity index 100% rename from src/include/base/dicomviewerbase.h rename to src/src/base/dicomviewerbase.h diff --git a/src/include/base/dicomviewerhelper.h b/src/src/base/dicomviewerhelper.h similarity index 100% rename from src/include/base/dicomviewerhelper.h rename to src/src/base/dicomviewerhelper.h diff --git a/src/include/base/dicomviewertype.h b/src/src/base/dicomviewertype.h similarity index 100% rename from src/include/base/dicomviewertype.h rename to src/src/base/dicomviewertype.h diff --git a/src/src/base/infinitiViewer.cxx b/src/src/base/infinitiViewer.cxx index e6bd722..9114768 100644 --- a/src/src/base/infinitiViewer.cxx +++ b/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 "MeasureStore.h" +#include "measure/Measure.h" +#include "measure/MeasureStore.h" #include "vtkTextActor.h" #include "vtkTextProperty.h" #include "ExtendMedicalImageProperties.h" -#include "RulerLegendActor.h" -#include "ColorMapReader.h" +#include "measure/RulerLegendActor.h" +#include "util/ColorMapReader.h" #include "DicomLoader.h" diff --git a/src/include/base/infinitiViewer.h b/src/src/base/infinitiViewer.h similarity index 98% rename from src/include/base/infinitiViewer.h rename to src/src/base/infinitiViewer.h index 07ca0fa..599b5e4 100644 --- a/src/include/base/infinitiViewer.h +++ b/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 "RulerLegendActor.h" -#include "QGlobals.h" +#include "measure\vtkSignalRaiser.h" +#include "measure\RulerLegendActor.h" +#include "global\QGlobals.h" class vtkAlgorithm; class vtkAlgorithmOutput; diff --git a/src/include/callback/callbackhelper.h b/src/src/callback/callbackhelper.h similarity index 100% rename from src/include/callback/callbackhelper.h rename to src/src/callback/callbackhelper.h diff --git a/src/include/callback/cfindcallback.h b/src/src/callback/cfindcallback.h similarity index 100% rename from src/include/callback/cfindcallback.h rename to src/src/callback/cfindcallback.h diff --git a/src/include/callback/cmovecallback.h b/src/src/callback/cmovecallback.h similarity index 100% rename from src/include/callback/cmovecallback.h rename to src/src/callback/cmovecallback.h diff --git a/src/include/callback/cmovestorescpcallback.h b/src/src/callback/cmovestorescpcallback.h similarity index 100% rename from src/include/callback/cmovestorescpcallback.h rename to src/src/callback/cmovestorescpcallback.h diff --git a/src/include/cine/pqVCRController.h b/src/src/cine/pqVCRController.h similarity index 100% rename from src/include/cine/pqVCRController.h rename to src/src/cine/pqVCRController.h diff --git a/src/include/cine/pqVCRToolbar.h b/src/src/cine/pqVCRToolbar.h similarity index 100% rename from src/include/cine/pqVCRToolbar.h rename to src/src/cine/pqVCRToolbar.h diff --git a/src/form/pqVCRToolbar.ui b/src/src/cine/pqVCRToolbar.ui similarity index 100% rename from src/form/pqVCRToolbar.ui rename to src/src/cine/pqVCRToolbar.ui diff --git a/src/include/dialog/promptdialog.h b/src/src/dialog/promptdialog.h similarity index 100% rename from src/include/dialog/promptdialog.h rename to src/src/dialog/promptdialog.h diff --git a/src/include/dialog/promptdialogtitlebar.h b/src/src/dialog/promptdialogtitlebar.h similarity index 100% rename from src/include/dialog/promptdialogtitlebar.h rename to src/src/dialog/promptdialogtitlebar.h diff --git a/src/include/dialog/qxtspanslider.h b/src/src/dialog/qxtspanslider.h similarity index 100% rename from src/include/dialog/qxtspanslider.h rename to src/src/dialog/qxtspanslider.h diff --git a/src/include/dialog/qxtspanslider_p.h b/src/src/dialog/qxtspanslider_p.h similarity index 100% rename from src/include/dialog/qxtspanslider_p.h rename to src/src/dialog/qxtspanslider_p.h diff --git a/src/include/export/dicomexporter.h b/src/src/export/dicomexporter.h similarity index 100% rename from src/include/export/dicomexporter.h rename to src/src/export/dicomexporter.h diff --git a/src/include/export/dicomexporterthread.h b/src/src/export/dicomexporterthread.h similarity index 100% rename from src/include/export/dicomexporterthread.h rename to src/src/export/dicomexporterthread.h diff --git a/src/include/export/exportdialog.h b/src/src/export/exportdialog.h similarity index 96% rename from src/include/export/exportdialog.h rename to src/src/export/exportdialog.h index d0b96c6..922a50e 100644 --- a/src/include/export/exportdialog.h +++ b/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" diff --git a/src/form/exportdialog.ui b/src/src/export/exportdialog.ui similarity index 100% rename from src/form/exportdialog.ui rename to src/src/export/exportdialog.ui diff --git a/src/include/export/exportoptions.h b/src/src/export/exportoptions.h similarity index 100% rename from src/include/export/exportoptions.h rename to src/src/export/exportoptions.h diff --git a/src/include/global/QGlobals.h b/src/src/global/QGlobals.h similarity index 100% rename from src/include/global/QGlobals.h rename to src/src/global/QGlobals.h diff --git a/src/include/global/include_all.h b/src/src/global/include_all.h similarity index 100% rename from src/include/global/include_all.h rename to src/src/global/include_all.h diff --git a/src/include/global/include_dcmtk.h b/src/src/global/include_dcmtk.h similarity index 100% rename from src/include/global/include_dcmtk.h rename to src/src/global/include_dcmtk.h diff --git a/src/include/global/include_vitk.h b/src/src/global/include_vitk.h similarity index 100% rename from src/include/global/include_vitk.h rename to src/src/global/include_vitk.h diff --git a/src/include/measure/ActorDraggableInteractorStyle.h b/src/src/measure/ActorDraggableInteractorStyle.h similarity index 100% rename from src/include/measure/ActorDraggableInteractorStyle.h rename to src/src/measure/ActorDraggableInteractorStyle.h diff --git a/src/include/measure/AngleAnnotationActor.h b/src/src/measure/AngleAnnotationActor.h similarity index 100% rename from src/include/measure/AngleAnnotationActor.h rename to src/src/measure/AngleAnnotationActor.h diff --git a/src/include/measure/AnnotationActor.h b/src/src/measure/AnnotationActor.h similarity index 100% rename from src/include/measure/AnnotationActor.h rename to src/src/measure/AnnotationActor.h diff --git a/src/src/measure/ArrowAnnotationActor.cpp b/src/src/measure/ArrowAnnotationActor.cpp index 293f167..e15478d 100644 --- a/src/src/measure/ArrowAnnotationActor.cpp +++ b/src/src/measure/ArrowAnnotationActor.cpp @@ -10,7 +10,7 @@ #include "vtkRenderer.h" #include "vtkRenderWindow.h" #include "ControlPointRActor.h" -#include +#include "vtkArrow2DSource.h" diff --git a/src/include/measure/ArrowAnnotationActor.h b/src/src/measure/ArrowAnnotationActor.h similarity index 100% rename from src/include/measure/ArrowAnnotationActor.h rename to src/src/measure/ArrowAnnotationActor.h diff --git a/src/include/measure/ControlPointActor.h b/src/src/measure/ControlPointActor.h similarity index 100% rename from src/include/measure/ControlPointActor.h rename to src/src/measure/ControlPointActor.h diff --git a/src/include/measure/ControlPointRActor.h b/src/src/measure/ControlPointRActor.h similarity index 100% rename from src/include/measure/ControlPointRActor.h rename to src/src/measure/ControlPointRActor.h diff --git a/src/include/measure/DraggableActor.h b/src/src/measure/DraggableActor.h similarity index 100% rename from src/include/measure/DraggableActor.h rename to src/src/measure/DraggableActor.h diff --git a/src/include/measure/EllipseAnnotationActor.h b/src/src/measure/EllipseAnnotationActor.h similarity index 100% rename from src/include/measure/EllipseAnnotationActor.h rename to src/src/measure/EllipseAnnotationActor.h diff --git a/src/include/measure/EventsCenter.h b/src/src/measure/EventsCenter.h similarity index 100% rename from src/include/measure/EventsCenter.h rename to src/src/measure/EventsCenter.h diff --git a/src/include/measure/HoverButton.h b/src/src/measure/HoverButton.h similarity index 100% rename from src/include/measure/HoverButton.h rename to src/src/measure/HoverButton.h diff --git a/src/include/measure/KDicomObjects.h b/src/src/measure/KDicomObjects.h similarity index 100% rename from src/include/measure/KDicomObjects.h rename to src/src/measure/KDicomObjects.h diff --git a/src/include/measure/LineAnnotationActor.h b/src/src/measure/LineAnnotationActor.h similarity index 100% rename from src/include/measure/LineAnnotationActor.h rename to src/src/measure/LineAnnotationActor.h diff --git a/src/include/measure/Measure.h b/src/src/measure/Measure.h similarity index 100% rename from src/include/measure/Measure.h rename to src/src/measure/Measure.h diff --git a/src/include/measure/MeasureStore.h b/src/src/measure/MeasureStore.h similarity index 100% rename from src/include/measure/MeasureStore.h rename to src/src/measure/MeasureStore.h diff --git a/src/include/measure/OpenPolyAnnotationActor.h b/src/src/measure/OpenPolyAnnotationActor.h similarity index 100% rename from src/include/measure/OpenPolyAnnotationActor.h rename to src/src/measure/OpenPolyAnnotationActor.h diff --git a/src/include/measure/RulerAnnotationActor.h b/src/src/measure/RulerAnnotationActor.h similarity index 100% rename from src/include/measure/RulerAnnotationActor.h rename to src/src/measure/RulerAnnotationActor.h diff --git a/src/include/measure/RulerLegendActor.h b/src/src/measure/RulerLegendActor.h similarity index 100% rename from src/include/measure/RulerLegendActor.h rename to src/src/measure/RulerLegendActor.h diff --git a/src/include/measure/SeriesItem.h b/src/src/measure/SeriesItem.h similarity index 100% rename from src/include/measure/SeriesItem.h rename to src/src/measure/SeriesItem.h diff --git a/src/include/measure/StudyItem.h b/src/src/measure/StudyItem.h similarity index 100% rename from src/include/measure/StudyItem.h rename to src/src/measure/StudyItem.h diff --git a/src/include/measure/TextAnnotationActor.h b/src/src/measure/TextAnnotationActor.h similarity index 100% rename from src/include/measure/TextAnnotationActor.h rename to src/src/measure/TextAnnotationActor.h diff --git a/src/include/measure/calibrationWidget.h b/src/src/measure/calibrationWidget.h similarity index 100% rename from src/include/measure/calibrationWidget.h rename to src/src/measure/calibrationWidget.h diff --git a/src/form/calibrationWidget.ui b/src/src/measure/calibrationWidget.ui similarity index 100% rename from src/form/calibrationWidget.ui rename to src/src/measure/calibrationWidget.ui diff --git a/src/include/measure/pqFontPropertyWidget.h b/src/src/measure/pqFontPropertyWidget.h similarity index 100% rename from src/include/measure/pqFontPropertyWidget.h rename to src/src/measure/pqFontPropertyWidget.h diff --git a/src/form/pqFontPropertyWidget.ui b/src/src/measure/pqFontPropertyWidget.ui similarity index 100% rename from src/form/pqFontPropertyWidget.ui rename to src/src/measure/pqFontPropertyWidget.ui diff --git a/src/include/measure/vtkArrow2DSource.h b/src/src/measure/vtkArrow2DSource.h similarity index 100% rename from src/include/measure/vtkArrow2DSource.h rename to src/src/measure/vtkArrow2DSource.h diff --git a/src/include/measure/vtkSignalRaiser.h b/src/src/measure/vtkSignalRaiser.h similarity index 100% rename from src/include/measure/vtkSignalRaiser.h rename to src/src/measure/vtkSignalRaiser.h diff --git a/src/include/util/ColorMapReader.h b/src/src/util/ColorMapReader.h similarity index 100% rename from src/include/util/ColorMapReader.h rename to src/src/util/ColorMapReader.h diff --git a/src/include/util/QDicomUtility.h b/src/src/util/QDicomUtility.h similarity index 100% rename from src/include/util/QDicomUtility.h rename to src/src/util/QDicomUtility.h diff --git a/src/src/view/dicomimageview.cpp b/src/src/view/dicomimageview.cpp index 175f1f2..43bdf9a 100644 --- a/src/src/view/dicomimageview.cpp +++ b/src/src/view/dicomimageview.cpp @@ -10,9 +10,9 @@ #include "vtkImageProperty.h" #include "view/subview/mytitlebar.h" -#include "ActorDraggableInteractorStyle.h" -#include "pqVCRController.h" -#include "pqVCRToolbar.h" +#include "measure/ActorDraggableInteractorStyle.h" +#include "cine/pqVCRController.h" +#include "cine/pqVCRToolbar.h" #include "vtkDiscretizableColorTransferFunction.h" #include "metaDataWindow.h" diff --git a/src/include/view/dicomimageview.h b/src/src/view/dicomimageview.h similarity index 100% rename from src/include/view/dicomimageview.h rename to src/src/view/dicomimageview.h diff --git a/src/include/view/subview/DicomTreeModel.h b/src/src/view/subview/DicomTreeModel.h similarity index 100% rename from src/include/view/subview/DicomTreeModel.h rename to src/src/view/subview/DicomTreeModel.h diff --git a/src/include/view/subview/customwindow.h b/src/src/view/subview/customwindow.h similarity index 100% rename from src/include/view/subview/customwindow.h rename to src/src/view/subview/customwindow.h diff --git a/src/include/view/subview/gridpopwidget.h b/src/src/view/subview/gridpopwidget.h similarity index 100% rename from src/include/view/subview/gridpopwidget.h rename to src/src/view/subview/gridpopwidget.h diff --git a/src/form/gridpopwidget.ui b/src/src/view/subview/gridpopwidget.ui similarity index 100% rename from src/form/gridpopwidget.ui rename to src/src/view/subview/gridpopwidget.ui diff --git a/src/include/view/subview/importtitlebar.h b/src/src/view/subview/importtitlebar.h similarity index 100% rename from src/include/view/subview/importtitlebar.h rename to src/src/view/subview/importtitlebar.h diff --git a/src/include/view/subview/importwidget.h b/src/src/view/subview/importwidget.h similarity index 100% rename from src/include/view/subview/importwidget.h rename to src/src/view/subview/importwidget.h diff --git a/src/include/view/subview/metaDataWindow.h b/src/src/view/subview/metaDataWindow.h similarity index 100% rename from src/include/view/subview/metaDataWindow.h rename to src/src/view/subview/metaDataWindow.h diff --git a/src/src/view/subview/moveworker.cpp b/src/src/view/subview/moveworker.cpp index aba6a0e..5657b98 100644 --- a/src/src/view/subview/moveworker.cpp +++ b/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) diff --git a/src/include/view/subview/moveworker.h b/src/src/view/subview/moveworker.h similarity index 81% rename from src/include/view/subview/moveworker.h rename to src/src/view/subview/moveworker.h index f5908b4..9a08ea2 100644 --- a/src/include/view/subview/moveworker.h +++ b/src/src/view/subview/moveworker.h @@ -2,10 +2,10 @@ #define _MOVEWORKER_H_ #include -#include "../../../include/base/dicomviewertype.h" -#include "../../../include/callback/callbackhelper.h" -#include "../../../include/callback/cmovecallback.h" -#include "../../../include/callback/cmovestorescpcallback.h" +#include "base/dicomviewertype.h" +#include "callback/callbackhelper.h" +#include "callback/cmovecallback.h" +#include "callback/cmovestorescpcallback.h" class MoveWorker : public QObject diff --git a/src/include/view/subview/mytitlebar.h b/src/src/view/subview/mytitlebar.h similarity index 100% rename from src/include/view/subview/mytitlebar.h rename to src/src/view/subview/mytitlebar.h diff --git a/src/include/view/subview/pacsconfiguration.h b/src/src/view/subview/pacsconfiguration.h similarity index 100% rename from src/include/view/subview/pacsconfiguration.h rename to src/src/view/subview/pacsconfiguration.h diff --git a/src/include/view/subview/pacsconfiguretitlebar.h b/src/src/view/subview/pacsconfiguretitlebar.h similarity index 100% rename from src/include/view/subview/pacsconfiguretitlebar.h rename to src/src/view/subview/pacsconfiguretitlebar.h diff --git a/src/src/view/subview/queryworker.cpp b/src/src/view/subview/queryworker.cpp index acf6b37..ca34ea2 100644 --- a/src/src/view/subview/queryworker.cpp +++ b/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) diff --git a/src/include/view/subview/queryworker.h b/src/src/view/subview/queryworker.h similarity index 90% rename from src/include/view/subview/queryworker.h rename to src/src/view/subview/queryworker.h index f1966e3..175588c 100644 --- a/src/include/view/subview/queryworker.h +++ b/src/src/view/subview/queryworker.h @@ -2,9 +2,9 @@ #define _QUERYWORKER_H_ #include -#include "../../../include/callback/callbackhelper.h" -#include "../../../include/callback/cfindcallback.h" -#include "../../../include/base/dicomviewertype.h" +#include "callback/callbackhelper.h" +#include "callback/cfindcallback.h" +#include "base/dicomviewertype.h" class DcmDataset; diff --git a/src/src/view/subview/radiusprogressbar.cpp b/src/src/view/subview/radiusprogressbar.cpp index 5311342..7dfcdef 100644 --- a/src/src/view/subview/radiusprogressbar.cpp +++ b/src/src/view/subview/radiusprogressbar.cpp @@ -1,4 +1,4 @@ -#include "../../../include/view/subview/radiusprogressbar.h" +#include "view/subview/radiusprogressbar.h" #include RadiusProgressBar::RadiusProgressBar(QWidget *parent) diff --git a/src/include/view/subview/radiusprogressbar.h b/src/src/view/subview/radiusprogressbar.h similarity index 100% rename from src/include/view/subview/radiusprogressbar.h rename to src/src/view/subview/radiusprogressbar.h diff --git a/src/include/view/thumbnailImage.h b/src/src/view/thumbnailImage.h similarity index 100% rename from src/include/view/thumbnailImage.h rename to src/src/view/thumbnailImage.h diff --git a/src/include/view/thumbnailbarwidget.h b/src/src/view/thumbnailbarwidget.h similarity index 100% rename from src/include/view/thumbnailbarwidget.h rename to src/src/view/thumbnailbarwidget.h diff --git a/src/src/view/viewcontainerwidget.cpp b/src/src/view/viewcontainerwidget.cpp index a90295f..d417cd3 100644 --- a/src/src/view/viewcontainerwidget.cpp +++ b/src/src/view/viewcontainerwidget.cpp @@ -9,7 +9,7 @@ #include #include "qstyleoption.h" #include "qpainter.h" -#include "pqVCRToolbar.h" +#include "cine/pqVCRToolbar.h" #include //------------------------------------------------------- diff --git a/src/include/view/viewcontainerwidget.h b/src/src/view/viewcontainerwidget.h similarity index 100% rename from src/include/view/viewcontainerwidget.h rename to src/src/view/viewcontainerwidget.h