From 5b3c246eda413fcb9156a93d39223e1c292b1aad Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Thu, 30 Jun 2022 17:04:51 +0800
Subject: [PATCH] Move base/ classes to Common package.

---
 src/src/{base => Common}/SeriesImageSet.cpp    | 2 +-
 src/src/{base => Common}/SeriesImageSet.h      | 0
 src/src/{base => Common}/dicomviewerbase.h     | 0
 src/src/{base => Common}/dicomviewerhelper.cpp | 2 +-
 src/src/{base => Common}/dicomviewerhelper.h   | 0
 src/src/{base => Common}/dicomviewertype.h     | 0
 src/src/IO/DICOM/DicomLoader.cpp               | 2 +-
 src/src/IO/Export/dicomexporter.cpp            | 2 +-
 src/src/IO/Network/cmovestorescpcallback.cpp   | 2 +-
 src/src/IO/Network/moveworker.h                | 2 +-
 src/src/IO/Network/queryworker.h               | 2 +-
 src/src/UI/Widget/dicomimageview.h             | 2 +-
 src/src/UI/Widget/importwidget.cpp             | 2 +-
 src/src/UI/Widget/importwidget.h               | 4 ++--
 src/src/UI/Widget/pacsconfiguration.h          | 4 ++--
 src/src/UI/Widget/thumbnailbarwidget.cpp       | 2 +-
 16 files changed, 14 insertions(+), 14 deletions(-)
 rename src/src/{base => Common}/SeriesImageSet.cpp (98%)
 rename src/src/{base => Common}/SeriesImageSet.h (100%)
 rename src/src/{base => Common}/dicomviewerbase.h (100%)
 rename src/src/{base => Common}/dicomviewerhelper.cpp (99%)
 rename src/src/{base => Common}/dicomviewerhelper.h (100%)
 rename src/src/{base => Common}/dicomviewertype.h (100%)

diff --git a/src/src/base/SeriesImageSet.cpp b/src/src/Common/SeriesImageSet.cpp
similarity index 98%
rename from src/src/base/SeriesImageSet.cpp
rename to src/src/Common/SeriesImageSet.cpp
index e6d5382..1b848de 100644
--- a/src/src/base/SeriesImageSet.cpp
+++ b/src/src/Common/SeriesImageSet.cpp
@@ -1,4 +1,4 @@
-#include "base/SeriesImageSet.h"
+#include "SeriesImageSet.h"
 #include <vtkRendererCollection.h>
 #include "UI/Widget/dicomimageview.h"
 #include "IO/DICOM/DicomLoader.h"
diff --git a/src/src/base/SeriesImageSet.h b/src/src/Common/SeriesImageSet.h
similarity index 100%
rename from src/src/base/SeriesImageSet.h
rename to src/src/Common/SeriesImageSet.h
diff --git a/src/src/base/dicomviewerbase.h b/src/src/Common/dicomviewerbase.h
similarity index 100%
rename from src/src/base/dicomviewerbase.h
rename to src/src/Common/dicomviewerbase.h
diff --git a/src/src/base/dicomviewerhelper.cpp b/src/src/Common/dicomviewerhelper.cpp
similarity index 99%
rename from src/src/base/dicomviewerhelper.cpp
rename to src/src/Common/dicomviewerhelper.cpp
index e4392dc..9b12314 100644
--- a/src/src/base/dicomviewerhelper.cpp
+++ b/src/src/Common/dicomviewerhelper.cpp
@@ -1,4 +1,4 @@
-#include "base/dicomviewerhelper.h"
+#include "dicomviewerhelper.h"
 #include <QFile>
 #include <QApplication>
 
diff --git a/src/src/base/dicomviewerhelper.h b/src/src/Common/dicomviewerhelper.h
similarity index 100%
rename from src/src/base/dicomviewerhelper.h
rename to src/src/Common/dicomviewerhelper.h
diff --git a/src/src/base/dicomviewertype.h b/src/src/Common/dicomviewertype.h
similarity index 100%
rename from src/src/base/dicomviewertype.h
rename to src/src/Common/dicomviewertype.h
diff --git a/src/src/IO/DICOM/DicomLoader.cpp b/src/src/IO/DICOM/DicomLoader.cpp
index ad1a5b8..33f1cad 100644
--- a/src/src/IO/DICOM/DicomLoader.cpp
+++ b/src/src/IO/DICOM/DicomLoader.cpp
@@ -1,6 +1,6 @@
 #include "DicomLoader.h"
 
-#include "base/SeriesImageSet.h"
+#include "Common/SeriesImageSet.h"
 #include "DICOMDirectoryHelper.h"
 #include "ExtendMedicalImageProperties.h"
 #include "vtkDICOMImageReader2.h"
diff --git a/src/src/IO/Export/dicomexporter.cpp b/src/src/IO/Export/dicomexporter.cpp
index cbf2ab6..5b82b32 100644
--- a/src/src/IO/Export/dicomexporter.cpp
+++ b/src/src/IO/Export/dicomexporter.cpp
@@ -1,5 +1,5 @@
 #include "dicomexporter.h"
-#include "SeriesImageSet.h"
+#include "Common/SeriesImageSet.h"
 
 
 DicomExporter::DicomExporter(QObject *parent) 
diff --git a/src/src/IO/Network/cmovestorescpcallback.cpp b/src/src/IO/Network/cmovestorescpcallback.cpp
index e4af3ca..3ea0279 100644
--- a/src/src/IO/Network/cmovestorescpcallback.cpp
+++ b/src/src/IO/Network/cmovestorescpcallback.cpp
@@ -1,5 +1,5 @@
 #include "cmovestorescpcallback.h"
-#include "base/dicomviewerhelper.h"
+#include "Common/dicomviewerhelper.h"
 
 CMoveStoreSCPCallback::CMoveStoreSCPCallback(std::string outDirectory)
 	: dcm_cmove_storescp_callback()
diff --git a/src/src/IO/Network/moveworker.h b/src/src/IO/Network/moveworker.h
index 6e183aa..fcbdeaf 100644
--- a/src/src/IO/Network/moveworker.h
+++ b/src/src/IO/Network/moveworker.h
@@ -2,7 +2,7 @@
 #define _MOVEWORKER_H_
 
 #include <QObject>
-#include "base/dicomviewertype.h"
+#include "Common/dicomviewertype.h"
 #include "callbackhelper.h"
 #include "cmovecallback.h"
 #include "cmovestorescpcallback.h"
diff --git a/src/src/IO/Network/queryworker.h b/src/src/IO/Network/queryworker.h
index 3226be5..18465cc 100644
--- a/src/src/IO/Network/queryworker.h
+++ b/src/src/IO/Network/queryworker.h
@@ -4,7 +4,7 @@
 #include <QObject>
 #include "callbackhelper.h"
 #include "cfindcallback.h"
-#include "base/dicomviewertype.h"
+#include "Common/dicomviewertype.h"
 
 class DcmDataset;
 
diff --git a/src/src/UI/Widget/dicomimageview.h b/src/src/UI/Widget/dicomimageview.h
index ab79863..cf9f920 100644
--- a/src/src/UI/Widget/dicomimageview.h
+++ b/src/src/UI/Widget/dicomimageview.h
@@ -3,7 +3,7 @@
 #include <QOpenGLWidget>
 #include "UI/Widget/ClickableScrollBar.h"
 #include <QGridLayout>
-#include "base/SeriesImageSet.h"
+#include "Common/SeriesImageSet.h"
 #include <QThread>
 #include "Rendering/infinitiViewer.h"
 
diff --git a/src/src/UI/Widget/importwidget.cpp b/src/src/UI/Widget/importwidget.cpp
index d1e18d3..e422314 100644
--- a/src/src/UI/Widget/importwidget.cpp
+++ b/src/src/UI/Widget/importwidget.cpp
@@ -18,7 +18,7 @@
 #include "UI/Dialog/promptdialog.h"
 #include "IO/Network/cfindcallback.h"
 #include "IO/Network/callbackhelper.h"
-#include "base/dicomviewerhelper.h"
+#include "Common/dicomviewerhelper.h"
 #include "dcmtk/dcmdata/dcdatset.h"
 #include "dcm_move.h"
 #include "IO/Network/cmovecallback.h"
diff --git a/src/src/UI/Widget/importwidget.h b/src/src/UI/Widget/importwidget.h
index 7734be2..5804cf8 100644
--- a/src/src/UI/Widget/importwidget.h
+++ b/src/src/UI/Widget/importwidget.h
@@ -6,8 +6,8 @@
 #include <QEvent>
 #include <QList>
 #include <QThread>
-#include "base/dicomviewerhelper.h"
-#include "base/dicomviewertype.h"
+#include "Common/dicomviewerhelper.h"
+#include "Common/dicomviewertype.h"
 #include "IO/Network/queryworker.h"
 #include "IO/Network/moveworker.h"
 #include "radiusprogressbar.h"
diff --git a/src/src/UI/Widget/pacsconfiguration.h b/src/src/UI/Widget/pacsconfiguration.h
index 469d079..cf6950a 100644
--- a/src/src/UI/Widget/pacsconfiguration.h
+++ b/src/src/UI/Widget/pacsconfiguration.h
@@ -3,7 +3,7 @@
 
 #include <QDialog>
 #include <QStringList>
-#include "base/dicomviewerhelper.h"
+#include "Common/dicomviewerhelper.h"
 
 class QVBoxLayout;
 class QHBoxLayout;
@@ -95,7 +95,7 @@ private:
 	PromptDialog *m_pMsgDialog;
 
 	QList<host> m_lHosts;
-	QList<host> m_lHostsNew; // Èç¹ûÖмä×öÁ˲Ù×÷£¬µ«ÊÇ×îºóCancelµô£¬¾ÍÓÃÕâ¸ö¼Ç¼ÖмäµÄ²Ù×÷°É£¬lol
+	QList<host> m_lHostsNew; // ����м����˲������������Cancel�������������¼�м�IJ����ɣ�lol
 	
 private:
 	struct
diff --git a/src/src/UI/Widget/thumbnailbarwidget.cpp b/src/src/UI/Widget/thumbnailbarwidget.cpp
index 162bd98..5195287 100644
--- a/src/src/UI/Widget/thumbnailbarwidget.cpp
+++ b/src/src/UI/Widget/thumbnailbarwidget.cpp
@@ -1,6 +1,6 @@
 #include "thumbnailbarwidget.h"
 #include "IO/DICOM/DicomLoader.h"
-#include "base/SeriesImageSet.h"
+#include "Common/SeriesImageSet.h"
 #include <QTimer>
 #include <QDir>
 #include <QDebug>