diff --git a/dimse/c-find.js b/dimse/c-find.js index 4bad59c5..c519dfaa 100644 --- a/dimse/c-find.js +++ b/dimse/c-find.js @@ -1,12 +1,11 @@ -const { default: Attributes } = require("@dcm4che/data/Attributes"); -const { default: UID } = require("@dcm4che/data/UID"); -const { default: Association } = require("@dcm4che/net/Association"); -const { default: Dimse } = require("@dcm4che/net/Dimse"); -const { default: Status } = require("@dcm4che/net/Status"); -const { default: PresentationContext } = require("@dcm4che/net/pdu/PresentationContext"); -const { default: QueryRetrieveLevel2 } = require("@dcm4che/net/service/QueryRetrieveLevel2"); -const { default: EnumSet } = require("@java-wrapper/java/util/EnumSet"); -const { default: BasicModCFindSCP } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/BasicModCFindSCP"); +const { Attributes } = require("@dcm4che/data/Attributes"); +const { UID } = require("@dcm4che/data/UID"); +const { Association } = require("@dcm4che/net/Association"); +const { Dimse } = require("@dcm4che/net/Dimse"); +const { Status } = require("@dcm4che/net/Status"); +const { PresentationContext } = require("@dcm4che/net/pdu/PresentationContext"); +const { QueryRetrieveLevel2 } = require("@dcm4che/net/service/QueryRetrieveLevel2"); +const { BasicModCFindSCP } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/BasicModCFindSCP"); const { createCFindSCPInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/CFindSCPInject"); const { JsPatientQueryTask } = require("./patientQueryTask"); const { JsStudyQueryTask } = require("./studyQueryTask"); diff --git a/dimse/c-get.js b/dimse/c-get.js index 625c3ac3..dd70fe2a 100644 --- a/dimse/c-get.js +++ b/dimse/c-get.js @@ -1,12 +1,12 @@ const { UID } = require("@dcm4che/data/UID"); const { createCGetSCPInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/CGetSCPInject"); -const { default: SimpleCGetSCP } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/SimpleCGetSCP"); +const { SimpleCGetSCP } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/SimpleCGetSCP"); const { PATIENT_ROOT_LEVELS, STUDY_ROOT_LEVELS, PATIENT_STUDY_ONLY_LEVELS } = require("./level"); const { getInstancesFromKeysAttr } = require("./utils"); -const { default: RetrieveTaskImpl } = require("@dcm4che/tool/dcmqrscp/RetrieveTaskImpl"); +const { RetrieveTaskImpl } = require("@dcm4che/tool/dcmqrscp/RetrieveTaskImpl"); const { Dimse } = require("@dcm4che/net/Dimse"); const { EnumSet } = require("@java-wrapper/java/util/EnumSet"); -const { default: QueryRetrieveLevel2 } = require("@dcm4che/net/service/QueryRetrieveLevel2"); +const { QueryRetrieveLevel2 } = require("@dcm4che/net/service/QueryRetrieveLevel2"); class JsCGetScp { constructor() { } diff --git a/dimse/c-move.js b/dimse/c-move.js index f3958ed8..70e112b4 100644 --- a/dimse/c-move.js +++ b/dimse/c-move.js @@ -1,7 +1,3 @@ -const _ = require("lodash"); -const path = require("path"); -const { mongoose } = require("mongoose"); - const { Attributes } = require("@dcm4che/data/Attributes"); const { Tag } = require("@dcm4che/data/Tag"); const { Association } = require("@dcm4che/net/Association"); @@ -9,18 +5,13 @@ const { Status } = require("@dcm4che/net/Status"); const { PresentationContext } = require("@dcm4che/net/pdu/PresentationContext"); const { DicomServiceError } = require("@error/dicom-service"); const { createCMoveSCPInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/CMoveSCPInject"); -const { DimseQueryBuilder } = require("./queryBuilder"); -const { File } = require("@java-wrapper/java/io/File"); -const { raccoonConfig } = require("@root/config-class"); const { SimpleCMoveSCP } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/SimpleCMoveSCP"); const { UID } = require("@dcm4che/data/UID"); const { PATIENT_ROOT_LEVELS, STUDY_ROOT_LEVELS, PATIENT_STUDY_ONLY_LEVELS } = require("./level"); -const { importClass } = require("java-bridge"); -const { default: InstanceLocator } = require("@dcm4che/net/service/InstanceLocator"); -const { default: AAssociateRQ } = require("@dcm4che/net/pdu/AAssociateRQ"); -const { default: Connection } = require("@dcm4che/net/Connection"); -const { default: RetrieveTaskImpl } = require("@dcm4che/tool/dcmqrscp/RetrieveTaskImpl"); +const { AAssociateRQ } = require("@dcm4che/net/pdu/AAssociateRQ"); +const { Connection } = require("@dcm4che/net/Connection"); +const { RetrieveTaskImpl } = require("@dcm4che/tool/dcmqrscp/RetrieveTaskImpl"); const { Dimse } = require("@dcm4che/net/Dimse"); const { getInstancesFromKeysAttr } = require("./utils"); diff --git a/dimse/c-store.js b/dimse/c-store.js index 036a4aa4..435d8ed1 100644 --- a/dimse/c-store.js +++ b/dimse/c-store.js @@ -1,8 +1,6 @@ const myMongoDB = require("@models/mongodb"); const path = require("path"); -const { default: Dimse } = require("@dcm4che/net/Dimse"); -const { default: Status } = require("@dcm4che/net/Status"); const { createCStoreSCPInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/CStoreSCPInject"); const { default: SimpleCStoreSCP } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/SimpleCStoreSCP"); const { default: File } = require("@java-wrapper/java/io/File"); diff --git a/dimse/index.js b/dimse/index.js index 68a8820f..6acaf5d0 100644 --- a/dimse/index.js +++ b/dimse/index.js @@ -1,7 +1,6 @@ const _ = require("lodash"); const { java } = require("@models/DICOM/dcm4che/java-instance"); -const { importClass, appendClasspath, stdout, newProxy } = require("java-bridge"); -const glob = require("glob"); +const { importClass } = require("java-bridge"); const path = require("path"); const { ApplicationEntity } = require("@dcm4che/net/ApplicationEntity"); diff --git a/dimse/patientQueryTask.js b/dimse/patientQueryTask.js index 86352098..5341a9df 100644 --- a/dimse/patientQueryTask.js +++ b/dimse/patientQueryTask.js @@ -1,10 +1,10 @@ const _ = require("lodash"); -const { default: PatientQueryTask } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/PatientQueryTask"); +const { PatientQueryTask } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/PatientQueryTask"); const { PatientQueryTaskInjectInterface, createPatientQueryTaskInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/PatientQueryTaskInject"); const { createQueryTaskInjectProxy, QueryTaskInjectInterface } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/QueryTaskInject"); -const { default: Attributes } = require("@dcm4che/data/Attributes"); -const { default: Tag } = require("@dcm4che/data/Tag"); -const { default: VR } = require("@dcm4che/data/VR"); +const { Attributes } = require("@dcm4che/data/Attributes"); +const { Tag } = require("@dcm4che/data/Tag"); +const { VR } = require("@dcm4che/data/VR"); const { DimseQueryBuilder } = require("./queryBuilder"); const patientModel = require("@models/mongodb/models/patient"); const { Association } = require("@dcm4che/net/Association"); diff --git a/dimse/queryBuilder.js b/dimse/queryBuilder.js index f644d22c..4c194b85 100644 --- a/dimse/queryBuilder.js +++ b/dimse/queryBuilder.js @@ -1,14 +1,11 @@ const _ = require("lodash"); -const { default: Attributes } = require("@dcm4che/data/Attributes"); +const { Attributes } = require("@dcm4che/data/Attributes"); const { queryTagsOfEachLevel } = require("./queryTagsOfEachLevel"); -// const { default: ElementDictionary } = require("@dcm4che/data/ElementDictionary"); -const { default: StringUtils } = require("@dcm4che/util/StringUtils"); +const { StringUtils } = require("@dcm4che/util/StringUtils"); const { intTagToString } = require("./utils"); const { convertRequestQueryToMongoQuery } = require("@root/api/dicom-web/controller/QIDO-RS/service/QIDO-RS.service"); -// const dict = ElementDictionary.getStandardElementDictionarySync(); - class DimseQueryBuilder { /** diff --git a/dimse/queryTagsOfEachLevel.js b/dimse/queryTagsOfEachLevel.js index f6ac4a96..aa50060d 100644 --- a/dimse/queryTagsOfEachLevel.js +++ b/dimse/queryTagsOfEachLevel.js @@ -1,4 +1,4 @@ -const { default: Tag } = require("@dcm4che/data/Tag"); +const { Tag } = require("@dcm4che/data/Tag"); const queryTagsOfEachLevel = { "patient": [ diff --git a/dimse/studyQueryTask.js b/dimse/studyQueryTask.js index c32415e0..41809a6d 100644 --- a/dimse/studyQueryTask.js +++ b/dimse/studyQueryTask.js @@ -2,7 +2,7 @@ const _ = require("lodash"); const { StudyQueryTask } = require("@chinlinlee/dcm777/net/StudyQueryTask"); const { JsPatientQueryTask } = require("./patientQueryTask"); -const { default: Tag } = require("@dcm4che/data/Tag"); +const { Tag } = require("@dcm4che/data/Tag"); const { createQueryTaskInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/QueryTaskInject"); const { StudyQueryTaskInjectInterface, createStudyQueryTaskInjectProxy } = require("@java-wrapper/org/github/chinlinlee/dcm777/net/StudyQueryTaskInject"); const { DimseQueryBuilder } = require("./queryBuilder"); diff --git a/dimse/utils.js b/dimse/utils.js index 43326547..048c5d95 100644 --- a/dimse/utils.js +++ b/dimse/utils.js @@ -5,7 +5,7 @@ const mongoose = require("mongoose"); const { importClass } = require("java-bridge"); const { raccoonConfig } = require("@root/config-class"); const { InstanceLocator } = require("@dcm4che/net/service/InstanceLocator"); -const { default: File } = require("@java-wrapper/java/io/File"); +const { File } = require("@java-wrapper/java/io/File"); /** * * @param {number} tag