Separate PACS Module.

DIDKit/App/DIDMainWindow.cpp

@@ -0,0 +1,15 @@
+//
+// Created by Krad on 2022/9/20.
+//
+
+#include "DIDMainWindow.h"
+#include "PACS/Widget/ImportWidget.h"
+
+DIDMainWindow::DIDMainWindow(QWidget *parent) {
+    auto m_import = new ImportWidget(this);
+    m_import->show();
+}
+
+DIDMainWindow::~DIDMainWindow() {
+
+}

DIDKit/App/DIDMainWindow.h

@@ -0,0 +1,20 @@
+//
+// Created by Krad on 2022/9/20.
+//
+
+#ifndef OMEGAV_DIDMAINWINDOW_H
+#define OMEGAV_DIDMAINWINDOW_H
+
+#include <QtWidgets/QMainWindow>
+
+class DIDMainWindow : public QMainWindow{
+        Q_OBJECT
+
+    public:
+        explicit DIDMainWindow(QWidget *parent = Q_NULLPTR);
+        ~DIDMainWindow();
+
+};
+
+
+#endif //OMEGAV_DIDMAINWINDOW_H

DIDKit/App/app.cpp

@@ -0,0 +1,24 @@
+//
+// Created by Krad on 2022/9/20.
+//
+
+#include <QTextCodec>
+#include <QApplication>
+#include <QFont>
+
+#include "DIDMainWindow.h"
+
+int main(int argc, char* argv[]) {
+    QTextCodec* codec = QTextCodec::codecForName("GB2312");
+    QTextCodec::setCodecForLocale(codec);
+
+    QApplication a(argc, argv);
+
+    QFont font;
+    font.setFamily(QString::fromUtf8("Arial"));
+    QApplication::setFont(font);
+
+    DIDMainWindow w;
+    w.show();
+    return a.exec();
+}

DIDKit/CMakeLists.txt

@@ -1,7 +1,11 @@
 project(DIDKit)
 
-file(GLOB_RECURSE DIDKit_headers ../src/src/IO/*.h)
+file(GLOB_RECURSE DIDKit_IO_headers ../src/src/IO/*.h)
-file(GLOB_RECURSE DIDKit_cpps ../src/src/IO/*.cpp)
+file(GLOB_RECURSE DIDKit_IO_cpps ../src/src/IO/*.cpp)
+file(GLOB_RECURSE DIDKit_PACS_headers ../src/src/PACS/*.h)
+file(GLOB_RECURSE DIDKit_PACS_cpps ../src/src/PACS/*.cpp)
+file(GLOB_RECURSE DIDKit_App_headers App/*.h)
+file(GLOB_RECURSE DIDKit_App_cpps App/*.cpp)
 set(BUILD_SHARED_LIBS ON)
 if (${BUILD_SHARED_LIBS})
     include_directories(Defines/)
@@ -10,18 +14,31 @@ include_directories(../src/src/)
 
 add_library(DIDKit SHARED ${DIDKit_headers} ${DIDKit_cpps})
 
+option(BUILD_DIDKit_APP "Build DIDKit App" ON)
+set(BUILD_DIDKit_APP ON)
+
+
 find_package(DCMTK REQUIRED)
 include_directories(${DCMTK_INCLUDE_DIRS})
-target_link_libraries(DIDKit ${DCMTK_LIBRARIES})
+
 include_directories(${DCM_NETWORK_INCLUDE_DIRS})
 
 find_package(VTK REQUIRED)
 include(${VTK_USE_FILE})
-target_link_libraries(DIDKit ${VTK_LIBRARIES})
-
-#add_subdirectory(dcm_network)
-#include_directories(dcm_network)
 
 include_directories(${DCM_NETWORK_INCLUDE_DIRS})
+
+target_link_libraries(DIDKit ${DCMTK_LIBRARIES})
+target_link_libraries(DIDKit ${VTK_LIBRARIES})
 target_link_libraries(DIDKit dcm_network)
 add_dependencies(DIDKit dcm_network)
+
+if(${BUILD_DIDKit_APP})
+    add_executable(DIDKitApp ${DIDKit_headers} ${DIDKit_cpps} ${DIDKit_App_headers} ${DIDKit_App_cpps}
+            ${DIDKit_PACS_headers} ${DIDKit_PACS_cpps})
+    target_link_libraries(DIDKitApp ${DCMTK_LIBRARIES})
+    target_link_libraries(DIDKitApp ${VTK_LIBRARIES})
+    target_link_libraries(DIDKitApp dcm_network)
+    add_dependencies(DIDKitApp dcm_network)
+    target_link_libraries(DIDKitApp Qt5::Core Qt5::Widgets Qt5::Gui)
+endif()

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 "PACS/Dialog/promptdialog.h"
-#include "IO/Network/cfindcallback.h"
+#include "PACS/Network/cfindcallback.h"
-#include "IO/Network/callbackhelper.h"
+#include "PACS/Network/callbackhelper.h"
-#include "Common/dicomviewerhelper.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 "PACS/Network/cmovecallback.h"
-#include "IO/Network/cmovestorescpcallback.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 "PACS/Network/queryworker.h"
-#include "IO/Network/queryworker.h"
+#include "PACS/Network/moveworker.h"
-#include "IO/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"