Move widgets to UI/Widget package. 1

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"
 

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"

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>

src/src/UI/Widget/importtitlebar.cpp

@@ -1,4 +1,4 @@
-#include "view/subview/importtitlebar.h"
+#include "importtitlebar.h"
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QButtonGroup>

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>

src/src/UI/Widget/mytitlebar.cpp

@@ -1,4 +1,4 @@
-#include "view/subview/mytitlebar.h"
+#include "mytitlebar.h"
 #include <QHBoxLayout>
 #include <QPainter>
 #include <QFile>

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是否存在，不存在直接添加
+// ֱ<EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>name<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD>ڣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 void ConfigurationDialog::add()
 {
 	QString name = m_pPeerDescriptionEdit->text();
@@ -394,8 +394,8 @@ void ConfigurationDialog::add()
 	clearModify();
 }
 
-// 当前选中和修改的name是否一致，如果一致，直接修改当前选中
-// 如果不一致，判断是否存在，如果不存在，修改当前选中
+// <EFBFBD><EFBFBD>ǰѡ<EFBFBD>к<EFBFBD><EFBFBD>޸ĵ<EFBFBD>name<EFBFBD>Ƿ<EFBFBD>һ<EFBFBD>£<EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD>£<EFBFBD>ֱ<EFBFBD><EFBFBD><EFBFBD>޸ĵ<EFBFBD>ǰѡ<EFBFBD><EFBFBD>
+// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD>£<EFBFBD><EFBFBD>ж<EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD>ڣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڣ<EFBFBD><EFBFBD>޸ĵ<EFBFBD>ǰѡ<EFBFBD><EFBFBD>
 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) // <EFBFBD><EFBFBD><EFBFBD>ﲻҪ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˣ<EFBFBD><EFBFBD><EFBFBD>ȥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD>е<EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>
 				{
 					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) // <EFBFBD><EFBFBD><EFBFBD>ﲻҪ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˣ<EFBFBD><EFBFBD><EFBFBD>ȥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD>е<EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>
 			//	{
 			//		var.name = addName;
 			//		var.ae = m_pPeerTitleEdit->text();

src/src/UI/Widget/pacsconfiguretitlebar.cpp

@@ -1,4 +1,4 @@
-#include "view/subview/pacsconfiguretitlebar.h"
+#include "pacsconfiguretitlebar.h"
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPushButton>

src/src/UI/Widget/radiusprogressbar.cpp

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

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"

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>