Separate PACS Module.

src/src/PACS/Common/dicomviewerhelper.h

@@ -1,7 +1,6 @@
 #ifndef _DICOM_VIEWER_HELPER_H_
 #define _DICOM_VIEWER_HELPER_H_
 
-#include "dicomviewerbase.h"
 #include <QString>
 #include <QList>
 #include <QJsonObject>
@@ -20,7 +19,10 @@ struct host {
 class DicomViewerProductCfg
 {
 public:
-	SINGLETON_DEFINE(DicomViewerProductCfg);
+	static DicomViewerProductCfg& GetInstance(){
+	    static DicomViewerProductCfg instance;
+	    return instance;
+	}
 
 	QString ourTitle();
 	bool setOurTitle(QString ae);
@@ -33,6 +35,8 @@ public:
 private:
 	DicomViewerProductCfg();
 	~DicomViewerProductCfg();
+    DicomViewerProductCfg(const DicomViewerProductCfg&) = delete;
+    DicomViewerProductCfg operator=(const DicomViewerProductCfg&) = delete;
 	bool loadcfg();
 	bool savecfg();
 private:

src/src/PACS/Network/cmovestorescpcallback.cpp

@@ -1,5 +1,4 @@
 #include "cmovestorescpcallback.h"
-#include "Common/dicomviewerhelper.h"
 
 CMoveStoreSCPCallback::CMoveStoreSCPCallback(std::string outDirectory)
 	: dcm_cmove_storescp_callback()

src/src/PACS/Network/moveworker.h

@@ -2,7 +2,6 @@
 #define _MOVEWORKER_H_
 
 #include <QObject>
-#include "Common/dicomviewertype.h"
 #include "callbackhelper.h"
 #include "cmovecallback.h"
 #include "cmovestorescpcallback.h"

src/src/PACS/Network/queryworker.h

@@ -2,9 +2,10 @@
 #define _QUERYWORKER_H_
 
 #include <QObject>
+
+#include "../Common/dicomviewertype.h"
 #include "callbackhelper.h"
 #include "cfindcallback.h"
-#include "Common/dicomviewertype.h"
 
 class DcmDataset;
 

src/src/PACS/Widget/importwidget.cpp

@@ -10,19 +10,19 @@
 #include <QLineEdit>
 #include <QTableView>
 #include <QStandardItemModel>
-#include <QItemSelectionModel>
 #include <QHeaderView>
 #include <QDir>
 #include <QProgressBar>
-#include <QProgressBar>
-#include "UI/Dialog/promptdialog.h"
-#include "IO/Network/cfindcallback.h"
-#include "IO/Network/callbackhelper.h"
-#include "Common/dicomviewerhelper.h"
+
+#include "PACS/Dialog/promptdialog.h"
+#include "PACS/Network/cfindcallback.h"
+#include "PACS/Network/callbackhelper.h"
+#include "PACS/Common/dicomviewerhelper.h"
+#include "PACS/Common/dicomviewertype.h"
 #include "dcmtk/dcmdata/dcdatset.h"
 #include "dcm_move.h"
-#include "IO/Network/cmovecallback.h"
-#include "IO/Network/cmovestorescpcallback.h"
+#include "PACS/Network/cmovecallback.h"
+#include "PACS/Network/cmovestorescpcallback.h"
 
 ImportWidget::ImportWidget(QWidget *parent)
 	: QDialog(parent)

src/src/PACS/Widget/importwidget.h

@@ -6,10 +6,10 @@
 #include <QEvent>
 #include <QList>
 #include <QThread>
-#include "Common/dicomviewerhelper.h"
-#include "Common/dicomviewertype.h"
-#include "IO/Network/queryworker.h"
-#include "IO/Network/moveworker.h"
+
+#include "PACS/Network/queryworker.h"
+#include "PACS/Network/moveworker.h"
+#include "PACS/Common/dicomviewerhelper.h"
 #include "radiusprogressbar.h"
 
 

src/src/PACS/Widget/pacsconfiguration.cpp

@@ -11,7 +11,7 @@
 #include <QStandardItemModel>
 #include <QItemSelectionModel>
 #include <QHeaderView>
-#include "UI/Dialog/promptdialog.h"
+#include "PACS/Dialog/promptdialog.h"
 
 ConfigurationDialog::ConfigurationDialog(QWidget *parent)
 	: QDialog(parent)

src/src/PACS/Widget/pacsconfiguration.h

@@ -3,7 +3,7 @@
 
 #include <QDialog>
 #include <QStringList>
-#include "Common/dicomviewerhelper.h"
+#include "PACS/Common/dicomviewerhelper.h"
 
 class QVBoxLayout;
 class QHBoxLayout;

src/src/UI/Window/QDicomViewer.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <QtWidgets/QMainWindow>
 #include "ui_QDicomViewer.h"
-#include "UI/Widget/Import/importwidget.h"
+#include "PACS/Widget/importwidget.h"
 #include <QSettings>
 #include "UI/Dialog/exportdialog.h"
 #include "customwindow.h"