From 79d8bacf7db4f793eed7a4bfcd46a9406f2fdb78 Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Thu, 30 Jun 2022 14:28:58 +0800
Subject: [PATCH] Arrange classes to add a new IO DICOM package.

---
 src/src/{base => IO/DICOM}/DICOMDirectoryHelper.cpp         | 0
 src/src/{base => IO/DICOM}/DICOMDirectoryHelper.h           | 0
 src/src/{base => IO/DICOM}/DicomLoader.cpp                  | 6 +++---
 src/src/{base => IO/DICOM}/DicomLoader.h                    | 0
 src/src/{base => IO/DICOM}/ExtendMedicalImageProperties.cpp | 0
 src/src/{base => IO/DICOM}/ExtendMedicalImageProperties.h   | 0
 src/src/{util => IO/DICOM}/QDicomUtility.cpp                | 2 +-
 src/src/{util => IO/DICOM}/QDicomUtility.h                  | 0
 src/src/{base => IO/DICOM}/vtkDICOMImageReader2.cpp         | 0
 src/src/{base => IO/DICOM}/vtkDICOMImageReader2.h           | 0
 src/src/QDicomViewer.cpp                                    | 2 +-
 src/src/Rendering/infinitiViewer.cxx                        | 2 +-
 src/src/base/SeriesImageSet.cpp                             | 4 ++--
 src/src/export/exportdialog.h                               | 2 +-
 src/src/global/QGlobals.h                                   | 2 +-
 src/src/view/thumbnailImage.cpp                             | 2 +-
 src/src/view/thumbnailbarwidget.cpp                         | 2 +-
 src/src/view/viewcontainerwidget.cpp                        | 2 +-
 18 files changed, 13 insertions(+), 13 deletions(-)
 rename src/src/{base => IO/DICOM}/DICOMDirectoryHelper.cpp (100%)
 rename src/src/{base => IO/DICOM}/DICOMDirectoryHelper.h (100%)
 rename src/src/{base => IO/DICOM}/DicomLoader.cpp (98%)
 rename src/src/{base => IO/DICOM}/DicomLoader.h (100%)
 rename src/src/{base => IO/DICOM}/ExtendMedicalImageProperties.cpp (100%)
 rename src/src/{base => IO/DICOM}/ExtendMedicalImageProperties.h (100%)
 rename src/src/{util => IO/DICOM}/QDicomUtility.cpp (98%)
 rename src/src/{util => IO/DICOM}/QDicomUtility.h (100%)
 rename src/src/{base => IO/DICOM}/vtkDICOMImageReader2.cpp (100%)
 rename src/src/{base => IO/DICOM}/vtkDICOMImageReader2.h (100%)

diff --git a/src/src/base/DICOMDirectoryHelper.cpp b/src/src/IO/DICOM/DICOMDirectoryHelper.cpp
similarity index 100%
rename from src/src/base/DICOMDirectoryHelper.cpp
rename to src/src/IO/DICOM/DICOMDirectoryHelper.cpp
diff --git a/src/src/base/DICOMDirectoryHelper.h b/src/src/IO/DICOM/DICOMDirectoryHelper.h
similarity index 100%
rename from src/src/base/DICOMDirectoryHelper.h
rename to src/src/IO/DICOM/DICOMDirectoryHelper.h
diff --git a/src/src/base/DicomLoader.cpp b/src/src/IO/DICOM/DicomLoader.cpp
similarity index 98%
rename from src/src/base/DicomLoader.cpp
rename to src/src/IO/DICOM/DicomLoader.cpp
index 21e12fb..ad1a5b8 100644
--- a/src/src/base/DicomLoader.cpp
+++ b/src/src/IO/DICOM/DicomLoader.cpp
@@ -1,4 +1,4 @@
-#include "base/DicomLoader.h"
+#include "DicomLoader.h"
 
 #include "base/SeriesImageSet.h"
 #include "DICOMDirectoryHelper.h"
@@ -8,10 +8,10 @@
 #include <map>
 #include <algorithm>
 #include <vtkStringArray.h>
-#include <qDebug>
+#include <QDebug>
 #include <string.h>
 #include <stdio.h>
-#include "util/QDicomUtility.h"
+#include "QDicomUtility.h"
 
 #define ORIEN_NUM 4
 #define SINGLE_INSTANCE 1
diff --git a/src/src/base/DicomLoader.h b/src/src/IO/DICOM/DicomLoader.h
similarity index 100%
rename from src/src/base/DicomLoader.h
rename to src/src/IO/DICOM/DicomLoader.h
diff --git a/src/src/base/ExtendMedicalImageProperties.cpp b/src/src/IO/DICOM/ExtendMedicalImageProperties.cpp
similarity index 100%
rename from src/src/base/ExtendMedicalImageProperties.cpp
rename to src/src/IO/DICOM/ExtendMedicalImageProperties.cpp
diff --git a/src/src/base/ExtendMedicalImageProperties.h b/src/src/IO/DICOM/ExtendMedicalImageProperties.h
similarity index 100%
rename from src/src/base/ExtendMedicalImageProperties.h
rename to src/src/IO/DICOM/ExtendMedicalImageProperties.h
diff --git a/src/src/util/QDicomUtility.cpp b/src/src/IO/DICOM/QDicomUtility.cpp
similarity index 98%
rename from src/src/util/QDicomUtility.cpp
rename to src/src/IO/DICOM/QDicomUtility.cpp
index 2674cc9..f2fb406 100644
--- a/src/src/util/QDicomUtility.cpp
+++ b/src/src/IO/DICOM/QDicomUtility.cpp
@@ -9,7 +9,7 @@
 #include <dcmtk/dcmjpls/djdecode.h>
 #include <dcmtk/dcmdata/dcfilefo.h>
 #include <dcmtk/dcmimgle/dcmimage.h>
-#include "base\ExtendMedicalImageProperties.h"
+#include "ExtendMedicalImageProperties.h"
 
 QPixmap DicomUtil::GetThumbnail(ExtendMedicalImageProperties *property)  {
     double *wlww = property->GetNthWindowLevelPreset(0);
diff --git a/src/src/util/QDicomUtility.h b/src/src/IO/DICOM/QDicomUtility.h
similarity index 100%
rename from src/src/util/QDicomUtility.h
rename to src/src/IO/DICOM/QDicomUtility.h
diff --git a/src/src/base/vtkDICOMImageReader2.cpp b/src/src/IO/DICOM/vtkDICOMImageReader2.cpp
similarity index 100%
rename from src/src/base/vtkDICOMImageReader2.cpp
rename to src/src/IO/DICOM/vtkDICOMImageReader2.cpp
diff --git a/src/src/base/vtkDICOMImageReader2.h b/src/src/IO/DICOM/vtkDICOMImageReader2.h
similarity index 100%
rename from src/src/base/vtkDICOMImageReader2.h
rename to src/src/IO/DICOM/vtkDICOMImageReader2.h
diff --git a/src/src/QDicomViewer.cpp b/src/src/QDicomViewer.cpp
index 6cb459c..9ba728d 100644
--- a/src/src/QDicomViewer.cpp
+++ b/src/src/QDicomViewer.cpp
@@ -3,7 +3,7 @@
 #include "base/SeriesImageSet.h"
 #include "view/subview/gridpopwidget.h"
 #include "view/ViewContainerWidget.h"
-#include "base/DicomLoader.h"
+#include "IO/DICOM/DicomLoader.h"
 
 #include <QFileDialog>
 #include <QDebug>
diff --git a/src/src/Rendering/infinitiViewer.cxx b/src/src/Rendering/infinitiViewer.cxx
index 56db2d3..145ce56 100644
--- a/src/src/Rendering/infinitiViewer.cxx
+++ b/src/src/Rendering/infinitiViewer.cxx
@@ -27,7 +27,7 @@
 
 
 
-#include "DicomLoader.h"
+#include "IO/DICOM/DicomLoader.h"
 
 vtkStandardNewMacro(infinitiViewer);
 
diff --git a/src/src/base/SeriesImageSet.cpp b/src/src/base/SeriesImageSet.cpp
index e3cfb2e..27b1982 100644
--- a/src/src/base/SeriesImageSet.cpp
+++ b/src/src/base/SeriesImageSet.cpp
@@ -1,10 +1,10 @@
 #include "base/SeriesImageSet.h"
 #include <vtkRendererCollection.h>
 #include "view/dicomimageview.h"
-#include "base/DicomLoader.h"
+#include "IO/DICOM/DicomLoader.h"
 #include <QPainter>
 #include <QDebug>
-#include "ExtendMedicalImageProperties.h"
+#include "IO/DICOM/ExtendMedicalImageProperties.h"
 #include <vtkBoundingBox.h>
 
 
diff --git a/src/src/export/exportdialog.h b/src/src/export/exportdialog.h
index 922a50e..067c0ae 100644
--- a/src/src/export/exportdialog.h
+++ b/src/src/export/exportdialog.h
@@ -6,7 +6,7 @@
 #include "qdir.h"
 #include "dicomexporterthread.h"
 #include "QFileDialog"
-#include "base/DicomLoader.h"
+#include "IO/DICOM/DicomLoader.h"
 #include "dicomimageview.h"
 
 
diff --git a/src/src/global/QGlobals.h b/src/src/global/QGlobals.h
index 2a4015d..ad49331 100644
--- a/src/src/global/QGlobals.h
+++ b/src/src/global/QGlobals.h
@@ -15,7 +15,7 @@
 #include <QScreen>
 
 #include <sstream>
-#include "base/ExtendMedicalImageProperties.h"
+#include "IO/DICOM/ExtendMedicalImageProperties.h"
 using namespace std;
 
 // ����汾
diff --git a/src/src/view/thumbnailImage.cpp b/src/src/view/thumbnailImage.cpp
index 214edbb..0fc1267 100644
--- a/src/src/view/thumbnailImage.cpp
+++ b/src/src/view/thumbnailImage.cpp
@@ -5,7 +5,7 @@
 #include "global/QGlobals.h"
 #include "qstyleoption.h"
 #include "qpainter.h"
-#include "util/QDicomUtility.h"
+#include "IO/DICOM/QDicomUtility.h"
 
 static QString unpick_style = "*{background-color:#7f7f7f;border: 1px;}"
 "QLabel#m_descri{color:white}";
diff --git a/src/src/view/thumbnailbarwidget.cpp b/src/src/view/thumbnailbarwidget.cpp
index 4087144..036919a 100644
--- a/src/src/view/thumbnailbarwidget.cpp
+++ b/src/src/view/thumbnailbarwidget.cpp
@@ -1,5 +1,5 @@
 #include "view/thumbnailbarwidget.h"
-#include "base/DicomLoader.h"
+#include "IO/DICOM/DicomLoader.h"
 #include "base/SeriesImageSet.h"
 #include <QTimer>
 #include <QDir>
diff --git a/src/src/view/viewcontainerwidget.cpp b/src/src/view/viewcontainerwidget.cpp
index 4acd7bd..f7bb2c6 100644
--- a/src/src/view/viewcontainerwidget.cpp
+++ b/src/src/view/viewcontainerwidget.cpp
@@ -1,6 +1,6 @@
 #include "viewcontainerwidget.h"
 #include "thumbnailImage.h"
-#include "DicomLoader.h"
+#include "IO/DICOM/DicomLoader.h"
 #include <QWidget>
 #include <QGridLayout>
 #include <QSettings>