From 97ac8bdbace2dd8f05c8bba3946f1061b9fa5d4e Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Thu, 30 Jun 2022 16:04:13 +0800
Subject: [PATCH] Move widgets to UI/Widget package. 1

---
 src/src/QDicomViewer.cpp                           |  2 +-
 src/src/QDicomViewer.h                             |  2 +-
 .../subview => UI/Widget}/ClickableScrollBar.cpp   |  0
 .../subview => UI/Widget}/ClickableScrollBar.h     |  0
 .../{view/subview => UI/Widget}/gridpopwidget.cpp  |  2 +-
 .../{view/subview => UI/Widget}/gridpopwidget.h    |  0
 .../{view/subview => UI/Widget}/gridpopwidget.ui   |  0
 .../{view/subview => UI/Widget}/importtitlebar.cpp |  2 +-
 .../{view/subview => UI/Widget}/importtitlebar.h   |  0
 .../{view/subview => UI/Widget}/importwidget.cpp   |  6 +++---
 src/src/{view/subview => UI/Widget}/importwidget.h |  0
 src/src/{view/subview => UI/Widget}/mytitlebar.cpp |  2 +-
 src/src/{view/subview => UI/Widget}/mytitlebar.h   |  0
 .../subview => UI/Widget}/pacsconfiguration.cpp    | 14 +++++++-------
 .../subview => UI/Widget}/pacsconfiguration.h      |  0
 .../Widget}/pacsconfiguretitlebar.cpp              |  2 +-
 .../subview => UI/Widget}/pacsconfiguretitlebar.h  |  0
 .../subview => UI/Widget}/radiusprogressbar.cpp    |  2 +-
 .../subview => UI/Widget}/radiusprogressbar.h      |  0
 src/src/view/dicomimageview.cpp                    |  2 +-
 src/src/view/dicomimageview.h                      |  2 +-
 21 files changed, 19 insertions(+), 19 deletions(-)
 rename src/src/{view/subview => UI/Widget}/ClickableScrollBar.cpp (100%)
 rename src/src/{view/subview => UI/Widget}/ClickableScrollBar.h (100%)
 rename src/src/{view/subview => UI/Widget}/gridpopwidget.cpp (98%)
 rename src/src/{view/subview => UI/Widget}/gridpopwidget.h (100%)
 rename src/src/{view/subview => UI/Widget}/gridpopwidget.ui (100%)
 rename src/src/{view/subview => UI/Widget}/importtitlebar.cpp (98%)
 rename src/src/{view/subview => UI/Widget}/importtitlebar.h (100%)
 rename src/src/{view/subview => UI/Widget}/importwidget.cpp (99%)
 rename src/src/{view/subview => UI/Widget}/importwidget.h (100%)
 rename src/src/{view/subview => UI/Widget}/mytitlebar.cpp (99%)
 rename src/src/{view/subview => UI/Widget}/mytitlebar.h (100%)
 rename src/src/{view/subview => UI/Widget}/pacsconfiguration.cpp (96%)
 rename src/src/{view/subview => UI/Widget}/pacsconfiguration.h (100%)
 rename src/src/{view/subview => UI/Widget}/pacsconfiguretitlebar.cpp (97%)
 rename src/src/{view/subview => UI/Widget}/pacsconfiguretitlebar.h (100%)
 rename src/src/{view/subview => UI/Widget}/radiusprogressbar.cpp (95%)
 rename src/src/{view/subview => UI/Widget}/radiusprogressbar.h (100%)

diff --git a/src/src/QDicomViewer.cpp b/src/src/QDicomViewer.cpp
index a72e0ca..e689843 100644
--- a/src/src/QDicomViewer.cpp
+++ b/src/src/QDicomViewer.cpp
@@ -1,6 +1,6 @@
 #include "QDicomViewer.h"
 #include "base/SeriesImageSet.h"
-#include "view/subview/gridpopwidget.h"
+#include "UI/Widget/gridpopwidget.h"
 #include "view/ViewContainerWidget.h"
 #include "IO/DICOM/DicomLoader.h"
 
diff --git a/src/src/QDicomViewer.h b/src/src/QDicomViewer.h
index 244b098..b938547 100644
--- a/src/src/QDicomViewer.h
+++ b/src/src/QDicomViewer.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <QtWidgets/QMainWindow>
 #include "ui_QDicomViewer.h"
-#include "importwidget.h"
+#include "UI/Widget/importwidget.h"
 #include <QSettings>
 #include "export/exportdialog.h"
 #include "Customwindow.h"
diff --git a/src/src/view/subview/ClickableScrollBar.cpp b/src/src/UI/Widget/ClickableScrollBar.cpp
similarity index 100%
rename from src/src/view/subview/ClickableScrollBar.cpp
rename to src/src/UI/Widget/ClickableScrollBar.cpp
diff --git a/src/src/view/subview/ClickableScrollBar.h b/src/src/UI/Widget/ClickableScrollBar.h
similarity index 100%
rename from src/src/view/subview/ClickableScrollBar.h
rename to src/src/UI/Widget/ClickableScrollBar.h
diff --git a/src/src/view/subview/gridpopwidget.cpp b/src/src/UI/Widget/gridpopwidget.cpp
similarity index 98%
rename from src/src/view/subview/gridpopwidget.cpp
rename to src/src/UI/Widget/gridpopwidget.cpp
index 71cd9b6..0f6c484 100644
--- a/src/src/view/subview/gridpopwidget.cpp
+++ b/src/src/UI/Widget/gridpopwidget.cpp
@@ -1,4 +1,4 @@
-#include "view/subview/gridpopwidget.h"
+#include "gridpopwidget.h"
 #include "ui_gridpopwidget.h"
 
 //#include <global/KissGlobal>
diff --git a/src/src/view/subview/gridpopwidget.h b/src/src/UI/Widget/gridpopwidget.h
similarity index 100%
rename from src/src/view/subview/gridpopwidget.h
rename to src/src/UI/Widget/gridpopwidget.h
diff --git a/src/src/view/subview/gridpopwidget.ui b/src/src/UI/Widget/gridpopwidget.ui
similarity index 100%
rename from src/src/view/subview/gridpopwidget.ui
rename to src/src/UI/Widget/gridpopwidget.ui
diff --git a/src/src/view/subview/importtitlebar.cpp b/src/src/UI/Widget/importtitlebar.cpp
similarity index 98%
rename from src/src/view/subview/importtitlebar.cpp
rename to src/src/UI/Widget/importtitlebar.cpp
index 174fe4a..a56eb46 100644
--- a/src/src/view/subview/importtitlebar.cpp
+++ b/src/src/UI/Widget/importtitlebar.cpp
@@ -1,4 +1,4 @@
-#include "view/subview/importtitlebar.h"
+#include "importtitlebar.h"
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QButtonGroup>
diff --git a/src/src/view/subview/importtitlebar.h b/src/src/UI/Widget/importtitlebar.h
similarity index 100%
rename from src/src/view/subview/importtitlebar.h
rename to src/src/UI/Widget/importtitlebar.h
diff --git a/src/src/view/subview/importwidget.cpp b/src/src/UI/Widget/importwidget.cpp
similarity index 99%
rename from src/src/view/subview/importwidget.cpp
rename to src/src/UI/Widget/importwidget.cpp
index 69291bc..ab4daed 100644
--- a/src/src/view/subview/importwidget.cpp
+++ b/src/src/UI/Widget/importwidget.cpp
@@ -1,6 +1,6 @@
-#include "view/subview/importwidget.h"
-#include "view/subview/importtitlebar.h"
-#include "view/subview/pacsconfiguration.h"
+#include "importwidget.h"
+#include "importtitlebar.h"
+#include "pacsconfiguration.h"
 #include <QVBoxLayout>
 #include <QGridLayout>
 #include <QPushButton>
diff --git a/src/src/view/subview/importwidget.h b/src/src/UI/Widget/importwidget.h
similarity index 100%
rename from src/src/view/subview/importwidget.h
rename to src/src/UI/Widget/importwidget.h
diff --git a/src/src/view/subview/mytitlebar.cpp b/src/src/UI/Widget/mytitlebar.cpp
similarity index 99%
rename from src/src/view/subview/mytitlebar.cpp
rename to src/src/UI/Widget/mytitlebar.cpp
index b85c2fc..3ebabfd 100644
--- a/src/src/view/subview/mytitlebar.cpp
+++ b/src/src/UI/Widget/mytitlebar.cpp
@@ -1,4 +1,4 @@
-#include "view/subview/mytitlebar.h"
+#include "mytitlebar.h"
 #include <QHBoxLayout>
 #include <QPainter>
 #include <QFile>
diff --git a/src/src/view/subview/mytitlebar.h b/src/src/UI/Widget/mytitlebar.h
similarity index 100%
rename from src/src/view/subview/mytitlebar.h
rename to src/src/UI/Widget/mytitlebar.h
diff --git a/src/src/view/subview/pacsconfiguration.cpp b/src/src/UI/Widget/pacsconfiguration.cpp
similarity index 96%
rename from src/src/view/subview/pacsconfiguration.cpp
rename to src/src/UI/Widget/pacsconfiguration.cpp
index 2197e8e..b3cc688 100644
--- a/src/src/view/subview/pacsconfiguration.cpp
+++ b/src/src/UI/Widget/pacsconfiguration.cpp
@@ -1,5 +1,5 @@
-#include "view/subview/pacsconfiguration.h"
-#include "view/subview/pacsconfiguretitlebar.h"
+#include "pacsconfiguration.h"
+#include "pacsconfiguretitlebar.h"
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
@@ -348,7 +348,7 @@ void ConfigurationDialog::cancel()
 	reject();
 }
 
-// Ö±½ÓÅжÏnameÊÇ·ñ´æÔÚ£¬²»´æÔÚÖ±½ÓÌí¼Ó
+// ֱ���ж�name�Ƿ���ڣ�������ֱ�����
 void ConfigurationDialog::add()
 {
 	QString name = m_pPeerDescriptionEdit->text();
@@ -394,8 +394,8 @@ void ConfigurationDialog::add()
 	clearModify();
 }
 
-// µ±Ç°Ñ¡ÖкÍÐ޸ĵÄnameÊÇ·ñÒ»Ö£¬Èç¹ûÒ»Ö£¬Ö±½ÓÐ޸ĵ±Ç°Ñ¡ÖÐ
-// Èç¹û²»Ò»Ö£¬ÅжÏÊÇ·ñ´æÔÚ£¬Èç¹û²»´æÔÚ£¬Ð޸ĵ±Ç°Ñ¡ÖÐ
+// ��ǰѡ�к��޸ĵ�name�Ƿ�һ�£����һ�£�ֱ���޸ĵ�ǰѡ��
+// �����һ�£��ж��Ƿ���ڣ���������ڣ��޸ĵ�ǰѡ��
 void ConfigurationDialog::modify()
 {
 	if (currentRow == -1)
@@ -465,7 +465,7 @@ void ConfigurationDialog::modify()
 			itr = m_lHostsNew.begin();
 			for (; itr != m_lHostsNew.end(); ++itr)
 			{
-				if (selectedName == itr->name) // ÕâÀï²»Òª¸ã»ìÁË£¬ÊÇÈ¥¸üÐÂÑ¡ÖеÄÄÇÒ»Ìõ
+				if (selectedName == itr->name) // ���ﲻҪ����ˣ���ȥ����ѡ�е���һ��
 				{
 					itr->name = addName;
 					itr->ae = m_pPeerTitleEdit->text();
@@ -477,7 +477,7 @@ void ConfigurationDialog::modify()
 			}
 			//for each (host var in m_lHostsNew)
 			//{
-			//	if (selectedName == var.name) // ÕâÀï²»Òª¸ã»ìÁË£¬ÊÇÈ¥¸üÐÂÑ¡ÖеÄÄÇÒ»Ìõ
+			//	if (selectedName == var.name) // ���ﲻҪ����ˣ���ȥ����ѡ�е���һ��
 			//	{
 			//		var.name = addName;
 			//		var.ae = m_pPeerTitleEdit->text();
diff --git a/src/src/view/subview/pacsconfiguration.h b/src/src/UI/Widget/pacsconfiguration.h
similarity index 100%
rename from src/src/view/subview/pacsconfiguration.h
rename to src/src/UI/Widget/pacsconfiguration.h
diff --git a/src/src/view/subview/pacsconfiguretitlebar.cpp b/src/src/UI/Widget/pacsconfiguretitlebar.cpp
similarity index 97%
rename from src/src/view/subview/pacsconfiguretitlebar.cpp
rename to src/src/UI/Widget/pacsconfiguretitlebar.cpp
index 8492863..d46a342 100644
--- a/src/src/view/subview/pacsconfiguretitlebar.cpp
+++ b/src/src/UI/Widget/pacsconfiguretitlebar.cpp
@@ -1,4 +1,4 @@
-#include "view/subview/pacsconfiguretitlebar.h"
+#include "pacsconfiguretitlebar.h"
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPushButton>
diff --git a/src/src/view/subview/pacsconfiguretitlebar.h b/src/src/UI/Widget/pacsconfiguretitlebar.h
similarity index 100%
rename from src/src/view/subview/pacsconfiguretitlebar.h
rename to src/src/UI/Widget/pacsconfiguretitlebar.h
diff --git a/src/src/view/subview/radiusprogressbar.cpp b/src/src/UI/Widget/radiusprogressbar.cpp
similarity index 95%
rename from src/src/view/subview/radiusprogressbar.cpp
rename to src/src/UI/Widget/radiusprogressbar.cpp
index 7dfcdef..88cf43b 100644
--- a/src/src/view/subview/radiusprogressbar.cpp
+++ b/src/src/UI/Widget/radiusprogressbar.cpp
@@ -1,4 +1,4 @@
-#include "view/subview/radiusprogressbar.h"
+#include "radiusprogressbar.h"
 #include <QPainter>
 
 RadiusProgressBar::RadiusProgressBar(QWidget *parent)
diff --git a/src/src/view/subview/radiusprogressbar.h b/src/src/UI/Widget/radiusprogressbar.h
similarity index 100%
rename from src/src/view/subview/radiusprogressbar.h
rename to src/src/UI/Widget/radiusprogressbar.h
diff --git a/src/src/view/dicomimageview.cpp b/src/src/view/dicomimageview.cpp
index cf714c9..cff5421 100644
--- a/src/src/view/dicomimageview.cpp
+++ b/src/src/view/dicomimageview.cpp
@@ -8,7 +8,7 @@
 #include <QVTKOpenGLNativeWidget.h>
 #include <vtkGenericOpenGLRenderWindow.h>
 #include "vtkImageProperty.h"
-#include "view/subview/mytitlebar.h"
+#include "UI/Widget/mytitlebar.h"
 
 #include "Interaction/ActorDraggableInteractorStyle.h"
 #include "cine/pqVCRController.h"
diff --git a/src/src/view/dicomimageview.h b/src/src/view/dicomimageview.h
index 0780573..ab79863 100644
--- a/src/src/view/dicomimageview.h
+++ b/src/src/view/dicomimageview.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <QFrame>
 #include <QOpenGLWidget>
-#include "ClickableScrollBar.h"
+#include "UI/Widget/ClickableScrollBar.h"
 #include <QGridLayout>
 #include "base/SeriesImageSet.h"
 #include <QThread>