From 7c4c29fab0525ff0449b36f136effbd4bad05eea Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Thu, 30 Jun 2022 16:22:53 +0800
Subject: [PATCH] Move widgets to UI/Widget package. 2

---
 src/src/{view => UI/Widget}/dicomimageview.cpp      | 4 ++--
 src/src/{view => UI/Widget}/dicomimageview.h        | 0
 src/src/{view => UI/Widget}/thumbnailImage.cpp      | 2 +-
 src/src/{view => UI/Widget}/thumbnailImage.h        | 0
 src/src/{view => UI/Widget}/thumbnailbarwidget.cpp  | 4 ++--
 src/src/{view => UI/Widget}/thumbnailbarwidget.h    | 4 ++--
 src/src/{view => UI/Widget}/viewcontainerwidget.cpp | 0
 src/src/{view => UI/Widget}/viewcontainerwidget.h   | 0
 src/src/UI/Window/customwindow.cpp                  | 2 +-
 src/src/base/SeriesImageSet.cpp                     | 2 +-
 src/src/cine/pqVCRController.h                      | 2 +-
 src/src/cine/pqVCRToolbar.cxx                       | 2 +-
 src/src/export/exportdialog.h                       | 2 +-
 src/src/measure/pqFontPropertyWidget.cpp            | 2 +-
 src/src/view/ImageViewManager.h                     | 2 +-
 15 files changed, 14 insertions(+), 14 deletions(-)
 rename src/src/{view => UI/Widget}/dicomimageview.cpp (99%)
 rename src/src/{view => UI/Widget}/dicomimageview.h (100%)
 rename src/src/{view => UI/Widget}/thumbnailImage.cpp (99%)
 rename src/src/{view => UI/Widget}/thumbnailImage.h (100%)
 rename src/src/{view => UI/Widget}/thumbnailbarwidget.cpp (99%)
 rename src/src/{view => UI/Widget}/thumbnailbarwidget.h (95%)
 rename src/src/{view => UI/Widget}/viewcontainerwidget.cpp (100%)
 rename src/src/{view => UI/Widget}/viewcontainerwidget.h (100%)

diff --git a/src/src/view/dicomimageview.cpp b/src/src/UI/Widget/dicomimageview.cpp
similarity index 99%
rename from src/src/view/dicomimageview.cpp
rename to src/src/UI/Widget/dicomimageview.cpp
index 48a8db8..13a7bfb 100644
--- a/src/src/view/dicomimageview.cpp
+++ b/src/src/UI/Widget/dicomimageview.cpp
@@ -1,7 +1,7 @@
-#include "view/dicomimageview.h"
+#include "dicomimageview.h"
 #include <QMessageBox>
 #include <QDebug>
-#include "view/thumbnailImage.h"
+#include "thumbnailImage.h"
 #include <vtkRenderer.h>
 #include <vtkCamera.h>
 #include <vtkInteractorStyleImage.h>
diff --git a/src/src/view/dicomimageview.h b/src/src/UI/Widget/dicomimageview.h
similarity index 100%
rename from src/src/view/dicomimageview.h
rename to src/src/UI/Widget/dicomimageview.h
diff --git a/src/src/view/thumbnailImage.cpp b/src/src/UI/Widget/thumbnailImage.cpp
similarity index 99%
rename from src/src/view/thumbnailImage.cpp
rename to src/src/UI/Widget/thumbnailImage.cpp
index d891baf..3d5408f 100644
--- a/src/src/view/thumbnailImage.cpp
+++ b/src/src/UI/Widget/thumbnailImage.cpp
@@ -1,4 +1,4 @@
-#include "view/thumbnailImage.h"
+#include "thumbnailImage.h"
 #include <QPalette>
 #include <QApplication>
 #include <QPainter>
diff --git a/src/src/view/thumbnailImage.h b/src/src/UI/Widget/thumbnailImage.h
similarity index 100%
rename from src/src/view/thumbnailImage.h
rename to src/src/UI/Widget/thumbnailImage.h
diff --git a/src/src/view/thumbnailbarwidget.cpp b/src/src/UI/Widget/thumbnailbarwidget.cpp
similarity index 99%
rename from src/src/view/thumbnailbarwidget.cpp
rename to src/src/UI/Widget/thumbnailbarwidget.cpp
index 036919a..162bd98 100644
--- a/src/src/view/thumbnailbarwidget.cpp
+++ b/src/src/UI/Widget/thumbnailbarwidget.cpp
@@ -1,4 +1,4 @@
-#include "view/thumbnailbarwidget.h"
+#include "thumbnailbarwidget.h"
 #include "IO/DICOM/DicomLoader.h"
 #include "base/SeriesImageSet.h"
 #include <QTimer>
@@ -6,7 +6,7 @@
 #include <QDebug>
 #include <QPixmap>
 
-#include "view/dicomimageview.h"
+#include "dicomimageview.h"
 #include "qstyleoption.h"
 #include "qpainter.h"
 /************************************************************************
diff --git a/src/src/view/thumbnailbarwidget.h b/src/src/UI/Widget/thumbnailbarwidget.h
similarity index 95%
rename from src/src/view/thumbnailbarwidget.h
rename to src/src/UI/Widget/thumbnailbarwidget.h
index c4c7fef..c707708 100644
--- a/src/src/view/thumbnailbarwidget.h
+++ b/src/src/UI/Widget/thumbnailbarwidget.h
@@ -7,8 +7,8 @@
 #include <QThread>
 #include <QLabel>
 #include "Common/QGlobals.h"
-#include "QScrollArea.h"
-#include "view/thumbnailImage.h"
+#include "qscrollarea.h"
+#include "thumbnailImage.h"
 
 class SeriesImageSet;
 class DicomImageView;
diff --git a/src/src/view/viewcontainerwidget.cpp b/src/src/UI/Widget/viewcontainerwidget.cpp
similarity index 100%
rename from src/src/view/viewcontainerwidget.cpp
rename to src/src/UI/Widget/viewcontainerwidget.cpp
diff --git a/src/src/view/viewcontainerwidget.h b/src/src/UI/Widget/viewcontainerwidget.h
similarity index 100%
rename from src/src/view/viewcontainerwidget.h
rename to src/src/UI/Widget/viewcontainerwidget.h
diff --git a/src/src/UI/Window/customwindow.cpp b/src/src/UI/Window/customwindow.cpp
index 0c99d95..7aab0a9 100644
--- a/src/src/UI/Window/customwindow.cpp
+++ b/src/src/UI/Window/customwindow.cpp
@@ -1,5 +1,5 @@
 #include "customwindow.h"
-#include "view/dicomimageview.h"
+#include "UI/Widget/dicomimageview.h"
 
 Customwindow::Customwindow(QWidget *parent)
 	: QDialog(parent)
diff --git a/src/src/base/SeriesImageSet.cpp b/src/src/base/SeriesImageSet.cpp
index 27b1982..e6d5382 100644
--- a/src/src/base/SeriesImageSet.cpp
+++ b/src/src/base/SeriesImageSet.cpp
@@ -1,6 +1,6 @@
 #include "base/SeriesImageSet.h"
 #include <vtkRendererCollection.h>
-#include "view/dicomimageview.h"
+#include "UI/Widget/dicomimageview.h"
 #include "IO/DICOM/DicomLoader.h"
 #include <QPainter>
 #include <QDebug>
diff --git a/src/src/cine/pqVCRController.h b/src/src/cine/pqVCRController.h
index 339071e..ec2f63d 100644
--- a/src/src/cine/pqVCRController.h
+++ b/src/src/cine/pqVCRController.h
@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <QObject>
 #include <QPointer>
 #include <QTimer>
-#include "DicomImageView.h"
+#include "UI/Widget/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/cine/pqVCRToolbar.cxx b/src/src/cine/pqVCRToolbar.cxx
index c871410..c8f20f5 100644
--- a/src/src/cine/pqVCRToolbar.cxx
+++ b/src/src/cine/pqVCRToolbar.cxx
@@ -1,7 +1,7 @@
 #include "cine/pqVCRToolbar.h"
 #include "cine/pqVCRController.h"
 #include <QThread>
-#include "DicomImageView.h"
+#include "UI/Widget/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/export/exportdialog.h b/src/src/export/exportdialog.h
index 067c0ae..3530e09 100644
--- a/src/src/export/exportdialog.h
+++ b/src/src/export/exportdialog.h
@@ -7,7 +7,7 @@
 #include "dicomexporterthread.h"
 #include "QFileDialog"
 #include "IO/DICOM/DicomLoader.h"
-#include "dicomimageview.h"
+#include "UI/Widget/dicomimageview.h"
 
 
 
diff --git a/src/src/measure/pqFontPropertyWidget.cpp b/src/src/measure/pqFontPropertyWidget.cpp
index 8c35211..ecd8857 100644
--- a/src/src/measure/pqFontPropertyWidget.cpp
+++ b/src/src/measure/pqFontPropertyWidget.cpp
@@ -1,5 +1,5 @@
 #include "pqFontPropertyWidget.h"
-#include "dicomimageview.h"
+#include "UI/Widget/dicomimageview.h"
 #include <vtkRenderWindowInteractor.h>
 #include "QColorDialog.h"
 //#include "QFontDialog.h"
diff --git a/src/src/view/ImageViewManager.h b/src/src/view/ImageViewManager.h
index 00ff1e9..24e9593 100644
--- a/src/src/view/ImageViewManager.h
+++ b/src/src/view/ImageViewManager.h
@@ -6,7 +6,7 @@
 #define OMEGAV_IMAGEVIEWMANAGER_H
 #include <QObject>
 #include <QList>
-#include "dicomimageview.h"
+#include "UI/Widget/dicomimageview.h"
 
 
 class ImageViewManager:public QObject {