From 9e405b9b7851cf0d099da3baef45806b842e1d2c Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Fri, 29 Jul 2022 18:09:00 +0800
Subject: [PATCH] Rearrange widget files.

---
 src/src/Common/SeriesImageSet.cpp                         | 2 +-
 src/src/UI/Dialog/exportdialog.h                          | 2 +-
 src/src/UI/Manager/ImageViewManager.cpp                   | 4 ++--
 src/src/UI/Manager/ImageViewManager.h                     | 2 +-
 src/src/UI/Widget/{ => Component}/ClickableScrollBar.cpp  | 0
 src/src/UI/Widget/{ => Component}/ClickableScrollBar.h    | 0
 src/src/UI/Widget/{ => Component}/gridpopwidget.cpp       | 0
 src/src/UI/Widget/{ => Component}/gridpopwidget.h         | 0
 src/src/UI/Widget/{ => Component}/gridpopwidget.ui        | 0
 src/src/UI/Widget/{ => Component}/mytitlebar.cpp          | 0
 src/src/UI/Widget/{ => Component}/mytitlebar.h            | 0
 src/src/UI/Widget/{ => ImageView}/ViewContainerWidget.cpp | 4 ++--
 src/src/UI/Widget/{ => ImageView}/ViewContainerWidget.h   | 0
 src/src/UI/Widget/{ => ImageView}/dicomimageview.cpp      | 8 ++++----
 src/src/UI/Widget/{ => ImageView}/dicomimageview.h        | 2 +-
 src/src/UI/Widget/{ => Import}/importtitlebar.cpp         | 0
 src/src/UI/Widget/{ => Import}/importtitlebar.h           | 0
 src/src/UI/Widget/{ => Import}/importwidget.cpp           | 0
 src/src/UI/Widget/{ => Import}/importwidget.h             | 2 +-
 src/src/UI/Widget/{ => Import}/pacsconfiguration.cpp      | 0
 src/src/UI/Widget/{ => Import}/pacsconfiguration.h        | 0
 src/src/UI/Widget/{ => Import}/pacsconfiguretitlebar.cpp  | 0
 src/src/UI/Widget/{ => Import}/pacsconfiguretitlebar.h    | 0
 src/src/UI/Widget/{ => Import}/radiusprogressbar.cpp      | 0
 src/src/UI/Widget/{ => Import}/radiusprogressbar.h        | 0
 src/src/UI/Widget/Measure/pqFontPropertyWidget.cpp        | 2 +-
 src/src/UI/Widget/{ => Thumbnail}/thumbnailImage.cpp      | 0
 src/src/UI/Widget/{ => Thumbnail}/thumbnailImage.h        | 0
 src/src/UI/Widget/{ => Thumbnail}/thumbnailbarwidget.cpp  | 2 +-
 src/src/UI/Widget/{ => Thumbnail}/thumbnailbarwidget.h    | 0
 src/src/UI/Widget/cine/pqVCRController.h                  | 2 +-
 src/src/UI/Widget/cine/pqVCRToolbar.cxx                   | 2 +-
 src/src/UI/Window/QDicomViewer.cpp                        | 3 ++-
 src/src/UI/Window/QDicomViewer.ui                         | 2 +-
 src/src/UI/Window/customwindow.cpp                        | 2 +-
 35 files changed, 21 insertions(+), 20 deletions(-)
 rename src/src/UI/Widget/{ => Component}/ClickableScrollBar.cpp (100%)
 rename src/src/UI/Widget/{ => Component}/ClickableScrollBar.h (100%)
 rename src/src/UI/Widget/{ => Component}/gridpopwidget.cpp (100%)
 rename src/src/UI/Widget/{ => Component}/gridpopwidget.h (100%)
 rename src/src/UI/Widget/{ => Component}/gridpopwidget.ui (100%)
 rename src/src/UI/Widget/{ => Component}/mytitlebar.cpp (100%)
 rename src/src/UI/Widget/{ => Component}/mytitlebar.h (100%)
 rename src/src/UI/Widget/{ => ImageView}/ViewContainerWidget.cpp (97%)
 rename src/src/UI/Widget/{ => ImageView}/ViewContainerWidget.h (100%)
 rename src/src/UI/Widget/{ => ImageView}/dicomimageview.cpp (99%)
 rename src/src/UI/Widget/{ => ImageView}/dicomimageview.h (99%)
 rename src/src/UI/Widget/{ => Import}/importtitlebar.cpp (100%)
 rename src/src/UI/Widget/{ => Import}/importtitlebar.h (100%)
 rename src/src/UI/Widget/{ => Import}/importwidget.cpp (100%)
 rename src/src/UI/Widget/{ => Import}/importwidget.h (99%)
 rename src/src/UI/Widget/{ => Import}/pacsconfiguration.cpp (100%)
 rename src/src/UI/Widget/{ => Import}/pacsconfiguration.h (100%)
 rename src/src/UI/Widget/{ => Import}/pacsconfiguretitlebar.cpp (100%)
 rename src/src/UI/Widget/{ => Import}/pacsconfiguretitlebar.h (100%)
 rename src/src/UI/Widget/{ => Import}/radiusprogressbar.cpp (100%)
 rename src/src/UI/Widget/{ => Import}/radiusprogressbar.h (100%)
 rename src/src/UI/Widget/{ => Thumbnail}/thumbnailImage.cpp (100%)
 rename src/src/UI/Widget/{ => Thumbnail}/thumbnailImage.h (100%)
 rename src/src/UI/Widget/{ => Thumbnail}/thumbnailbarwidget.cpp (99%)
 rename src/src/UI/Widget/{ => Thumbnail}/thumbnailbarwidget.h (100%)

diff --git a/src/src/Common/SeriesImageSet.cpp b/src/src/Common/SeriesImageSet.cpp
index 1b848de..c12b449 100644
--- a/src/src/Common/SeriesImageSet.cpp
+++ b/src/src/Common/SeriesImageSet.cpp
@@ -1,6 +1,6 @@
 #include "SeriesImageSet.h"
 #include <vtkRendererCollection.h>
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 #include "IO/DICOM/DicomLoader.h"
 #include <QPainter>
 #include <QDebug>
diff --git a/src/src/UI/Dialog/exportdialog.h b/src/src/UI/Dialog/exportdialog.h
index d377b3d..2b8b0bc 100644
--- a/src/src/UI/Dialog/exportdialog.h
+++ b/src/src/UI/Dialog/exportdialog.h
@@ -7,7 +7,7 @@
 #include "IO/Export/dicomexporterthread.h"
 #include "QFileDialog"
 #include "IO/DICOM/DicomLoader.h"
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 
 
 
diff --git a/src/src/UI/Manager/ImageViewManager.cpp b/src/src/UI/Manager/ImageViewManager.cpp
index f149523..09d377b 100644
--- a/src/src/UI/Manager/ImageViewManager.cpp
+++ b/src/src/UI/Manager/ImageViewManager.cpp
@@ -12,8 +12,8 @@
 #include "IO/DICOM/DicomLoader.h"
 #include "Interaction/ActorDraggableInteractorStyle.h"
 #include "Rendering/Measure/MeasureFactory.h"
-#include "UI/Widget/ViewContainerWidget.h"
-#include "UI/Widget/thumbnailImage.h"
+#include "UI/Widget/ImageView/ViewContainerWidget.h"
+#include "UI/Widget/Thumbnail/thumbnailImage.h"
 #include "UI/Widget/cine/pqVCRToolbar.h"
 
 ImageViewManager::ImageViewManager(QObject *parent)
diff --git a/src/src/UI/Manager/ImageViewManager.h b/src/src/UI/Manager/ImageViewManager.h
index 678f884..c5ce3f2 100644
--- a/src/src/UI/Manager/ImageViewManager.h
+++ b/src/src/UI/Manager/ImageViewManager.h
@@ -7,7 +7,7 @@
 
 #include <QObject>
 #include <QList>
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 
 
 class ImageViewManager : public QObject {
diff --git a/src/src/UI/Widget/ClickableScrollBar.cpp b/src/src/UI/Widget/Component/ClickableScrollBar.cpp
similarity index 100%
rename from src/src/UI/Widget/ClickableScrollBar.cpp
rename to src/src/UI/Widget/Component/ClickableScrollBar.cpp
diff --git a/src/src/UI/Widget/ClickableScrollBar.h b/src/src/UI/Widget/Component/ClickableScrollBar.h
similarity index 100%
rename from src/src/UI/Widget/ClickableScrollBar.h
rename to src/src/UI/Widget/Component/ClickableScrollBar.h
diff --git a/src/src/UI/Widget/gridpopwidget.cpp b/src/src/UI/Widget/Component/gridpopwidget.cpp
similarity index 100%
rename from src/src/UI/Widget/gridpopwidget.cpp
rename to src/src/UI/Widget/Component/gridpopwidget.cpp
diff --git a/src/src/UI/Widget/gridpopwidget.h b/src/src/UI/Widget/Component/gridpopwidget.h
similarity index 100%
rename from src/src/UI/Widget/gridpopwidget.h
rename to src/src/UI/Widget/Component/gridpopwidget.h
diff --git a/src/src/UI/Widget/gridpopwidget.ui b/src/src/UI/Widget/Component/gridpopwidget.ui
similarity index 100%
rename from src/src/UI/Widget/gridpopwidget.ui
rename to src/src/UI/Widget/Component/gridpopwidget.ui
diff --git a/src/src/UI/Widget/mytitlebar.cpp b/src/src/UI/Widget/Component/mytitlebar.cpp
similarity index 100%
rename from src/src/UI/Widget/mytitlebar.cpp
rename to src/src/UI/Widget/Component/mytitlebar.cpp
diff --git a/src/src/UI/Widget/mytitlebar.h b/src/src/UI/Widget/Component/mytitlebar.h
similarity index 100%
rename from src/src/UI/Widget/mytitlebar.h
rename to src/src/UI/Widget/Component/mytitlebar.h
diff --git a/src/src/UI/Widget/ViewContainerWidget.cpp b/src/src/UI/Widget/ImageView/ViewContainerWidget.cpp
similarity index 97%
rename from src/src/UI/Widget/ViewContainerWidget.cpp
rename to src/src/UI/Widget/ImageView/ViewContainerWidget.cpp
index 6b5f690..5752bb1 100644
--- a/src/src/UI/Widget/ViewContainerWidget.cpp
+++ b/src/src/UI/Widget/ImageView/ViewContainerWidget.cpp
@@ -9,8 +9,8 @@
 #include "Interaction/ActorDraggableInteractorStyle.h"
 #include "IO/DICOM/DicomLoader.h"
 #include "UI/Manager/ImageViewManager.h"
-#include "thumbnailImage.h"
-#include "cine/pqVCRToolbar.h"
+#include "UI/Widget/Thumbnail/thumbnailImage.h"
+#include "UI/Widget/cine/pqVCRToolbar.h"
 
 ViewContainerWidget::ViewContainerWidget(QWidget *parent)
         : QFrame(parent), mViewManager(new ImageViewManager(this)) {
diff --git a/src/src/UI/Widget/ViewContainerWidget.h b/src/src/UI/Widget/ImageView/ViewContainerWidget.h
similarity index 100%
rename from src/src/UI/Widget/ViewContainerWidget.h
rename to src/src/UI/Widget/ImageView/ViewContainerWidget.h
diff --git a/src/src/UI/Widget/dicomimageview.cpp b/src/src/UI/Widget/ImageView/dicomimageview.cpp
similarity index 99%
rename from src/src/UI/Widget/dicomimageview.cpp
rename to src/src/UI/Widget/ImageView/dicomimageview.cpp
index 83fb379..1e34d28 100644
--- a/src/src/UI/Widget/dicomimageview.cpp
+++ b/src/src/UI/Widget/ImageView/dicomimageview.cpp
@@ -12,10 +12,10 @@
 
 #include "Interaction/ActorDraggableInteractorStyle.h"
 #include "UI/Window/metaDataWindow.h"
-#include "UI/Widget/mytitlebar.h"
-#include "cine/pqVCRController.h"
-#include "cine/pqVCRToolbar.h"
-#include "thumbnailImage.h"
+#include "UI/Widget/Component/mytitlebar.h"
+#include "UI/Widget/cine/pqVCRController.h"
+#include "UI/Widget/cine/pqVCRToolbar.h"
+#include "UI/Widget/Thumbnail/thumbnailImage.h"
 #include "dcmtk/dcmdata/dcfilefo.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/src/UI/Widget/dicomimageview.h b/src/src/UI/Widget/ImageView/dicomimageview.h
similarity index 99%
rename from src/src/UI/Widget/dicomimageview.h
rename to src/src/UI/Widget/ImageView/dicomimageview.h
index bd8e5d3..f415729 100644
--- a/src/src/UI/Widget/dicomimageview.h
+++ b/src/src/UI/Widget/ImageView/dicomimageview.h
@@ -7,7 +7,7 @@
 #include <QThread>
 
 #include "Common/SeriesImageSet.h"
-#include "UI/Widget/ClickableScrollBar.h"
+#include "UI/Widget/Component/ClickableScrollBar.h"
 #include "Rendering/infinitiViewer.h"
 
 class vtkCornerAnnotation;
diff --git a/src/src/UI/Widget/importtitlebar.cpp b/src/src/UI/Widget/Import/importtitlebar.cpp
similarity index 100%
rename from src/src/UI/Widget/importtitlebar.cpp
rename to src/src/UI/Widget/Import/importtitlebar.cpp
diff --git a/src/src/UI/Widget/importtitlebar.h b/src/src/UI/Widget/Import/importtitlebar.h
similarity index 100%
rename from src/src/UI/Widget/importtitlebar.h
rename to src/src/UI/Widget/Import/importtitlebar.h
diff --git a/src/src/UI/Widget/importwidget.cpp b/src/src/UI/Widget/Import/importwidget.cpp
similarity index 100%
rename from src/src/UI/Widget/importwidget.cpp
rename to src/src/UI/Widget/Import/importwidget.cpp
diff --git a/src/src/UI/Widget/importwidget.h b/src/src/UI/Widget/Import/importwidget.h
similarity index 99%
rename from src/src/UI/Widget/importwidget.h
rename to src/src/UI/Widget/Import/importwidget.h
index 5804cf8..d2dc33d 100644
--- a/src/src/UI/Widget/importwidget.h
+++ b/src/src/UI/Widget/Import/importwidget.h
@@ -11,7 +11,7 @@
 #include "IO/Network/queryworker.h"
 #include "IO/Network/moveworker.h"
 #include "radiusprogressbar.h"
-//#include "radiusprogressbar.h"
+
 
 class QVBoxLayout;
 class QGridLayout;
diff --git a/src/src/UI/Widget/pacsconfiguration.cpp b/src/src/UI/Widget/Import/pacsconfiguration.cpp
similarity index 100%
rename from src/src/UI/Widget/pacsconfiguration.cpp
rename to src/src/UI/Widget/Import/pacsconfiguration.cpp
diff --git a/src/src/UI/Widget/pacsconfiguration.h b/src/src/UI/Widget/Import/pacsconfiguration.h
similarity index 100%
rename from src/src/UI/Widget/pacsconfiguration.h
rename to src/src/UI/Widget/Import/pacsconfiguration.h
diff --git a/src/src/UI/Widget/pacsconfiguretitlebar.cpp b/src/src/UI/Widget/Import/pacsconfiguretitlebar.cpp
similarity index 100%
rename from src/src/UI/Widget/pacsconfiguretitlebar.cpp
rename to src/src/UI/Widget/Import/pacsconfiguretitlebar.cpp
diff --git a/src/src/UI/Widget/pacsconfiguretitlebar.h b/src/src/UI/Widget/Import/pacsconfiguretitlebar.h
similarity index 100%
rename from src/src/UI/Widget/pacsconfiguretitlebar.h
rename to src/src/UI/Widget/Import/pacsconfiguretitlebar.h
diff --git a/src/src/UI/Widget/radiusprogressbar.cpp b/src/src/UI/Widget/Import/radiusprogressbar.cpp
similarity index 100%
rename from src/src/UI/Widget/radiusprogressbar.cpp
rename to src/src/UI/Widget/Import/radiusprogressbar.cpp
diff --git a/src/src/UI/Widget/radiusprogressbar.h b/src/src/UI/Widget/Import/radiusprogressbar.h
similarity index 100%
rename from src/src/UI/Widget/radiusprogressbar.h
rename to src/src/UI/Widget/Import/radiusprogressbar.h
diff --git a/src/src/UI/Widget/Measure/pqFontPropertyWidget.cpp b/src/src/UI/Widget/Measure/pqFontPropertyWidget.cpp
index f40b908..a045bc4 100644
--- a/src/src/UI/Widget/Measure/pqFontPropertyWidget.cpp
+++ b/src/src/UI/Widget/Measure/pqFontPropertyWidget.cpp
@@ -1,5 +1,5 @@
 #include "pqFontPropertyWidget.h"
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 #include <vtkRenderWindowInteractor.h>
 #include "qcolordialog.h"
 //#include "QFontDialog.h"
diff --git a/src/src/UI/Widget/thumbnailImage.cpp b/src/src/UI/Widget/Thumbnail/thumbnailImage.cpp
similarity index 100%
rename from src/src/UI/Widget/thumbnailImage.cpp
rename to src/src/UI/Widget/Thumbnail/thumbnailImage.cpp
diff --git a/src/src/UI/Widget/thumbnailImage.h b/src/src/UI/Widget/Thumbnail/thumbnailImage.h
similarity index 100%
rename from src/src/UI/Widget/thumbnailImage.h
rename to src/src/UI/Widget/Thumbnail/thumbnailImage.h
diff --git a/src/src/UI/Widget/thumbnailbarwidget.cpp b/src/src/UI/Widget/Thumbnail/thumbnailbarwidget.cpp
similarity index 99%
rename from src/src/UI/Widget/thumbnailbarwidget.cpp
rename to src/src/UI/Widget/Thumbnail/thumbnailbarwidget.cpp
index a2043a9..6ece8b6 100644
--- a/src/src/UI/Widget/thumbnailbarwidget.cpp
+++ b/src/src/UI/Widget/Thumbnail/thumbnailbarwidget.cpp
@@ -6,7 +6,7 @@
 #include <QDebug>
 #include <QPixmap>
 
-#include "dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 #include "qstyleoption.h"
 #include "qpainter.h"
 /************************************************************************
diff --git a/src/src/UI/Widget/thumbnailbarwidget.h b/src/src/UI/Widget/Thumbnail/thumbnailbarwidget.h
similarity index 100%
rename from src/src/UI/Widget/thumbnailbarwidget.h
rename to src/src/UI/Widget/Thumbnail/thumbnailbarwidget.h
diff --git a/src/src/UI/Widget/cine/pqVCRController.h b/src/src/UI/Widget/cine/pqVCRController.h
index ec2f63d..8b25cea 100644
--- a/src/src/UI/Widget/cine/pqVCRController.h
+++ b/src/src/UI/Widget/cine/pqVCRController.h
@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <QObject>
 #include <QPointer>
 #include <QTimer>
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 // pqVCRController is the QObject that encapsulates the
 // VCR control functionality.
 // It provides a slot to set the scene that this object
diff --git a/src/src/UI/Widget/cine/pqVCRToolbar.cxx b/src/src/UI/Widget/cine/pqVCRToolbar.cxx
index 42679c6..b89852d 100644
--- a/src/src/UI/Widget/cine/pqVCRToolbar.cxx
+++ b/src/src/UI/Widget/cine/pqVCRToolbar.cxx
@@ -1,7 +1,7 @@
 #include "pqVCRToolbar.h"
 #include "pqVCRController.h"
 #include <QThread>
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 QString stylesheet =
 "QToolBar#vcr_toolbar{border:1px solid grey;}"
 "QSpinBox#spinFPS{background-color:transparent;border:0px;height:30px;width:30px;color:#a7d28c;font:bold 14px;}"
diff --git a/src/src/UI/Window/QDicomViewer.cpp b/src/src/UI/Window/QDicomViewer.cpp
index 269032a..db096dd 100644
--- a/src/src/UI/Window/QDicomViewer.cpp
+++ b/src/src/UI/Window/QDicomViewer.cpp
@@ -6,9 +6,10 @@
 #include <QMessageBox>
 #include <QButtonGroup>
 
+
 #include "Interaction/ActorDraggableInteractorStyle.h"
 #include "UI/Manager/ImageViewManager.h"
-#include "UI/Widget/gridpopwidget.h"
+#include "UI/Widget/Component/gridpopwidget.h"
 #include "UI/Widget/cine/pqVCRToolbar.h"
 
 QDicomViewer::QDicomViewer(QWidget *parent) : QMainWindow(parent),
diff --git a/src/src/UI/Window/QDicomViewer.ui b/src/src/UI/Window/QDicomViewer.ui
index 1ba8c4f..649b6f4 100644
--- a/src/src/UI/Window/QDicomViewer.ui
+++ b/src/src/UI/Window/QDicomViewer.ui
@@ -148,7 +148,7 @@
   <customwidget>
    <class>ViewContainerWidget</class>
    <extends>QWidget</extends>
-   <header>UI/Widget/viewcontainerwidget.h</header>
+   <header>UI/Widget/ImageView/viewcontainerwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff --git a/src/src/UI/Window/customwindow.cpp b/src/src/UI/Window/customwindow.cpp
index 05a023f..173a772 100644
--- a/src/src/UI/Window/customwindow.cpp
+++ b/src/src/UI/Window/customwindow.cpp
@@ -1,5 +1,5 @@
 #include "customwindow.h"
-#include "UI/Widget/dicomimageview.h"
+#include "UI/Widget/ImageView/dicomimageview.h"
 
 Customwindow::Customwindow(QWidget *parent)
 	: QDialog(parent)