add c-move-scu

c-echo-scp/pom.xml

@@ -46,7 +46,7 @@
   <parent>
     <artifactId>quickstart-parent</artifactId>
     <groupId>org.dcm4che.quickstart</groupId>
-    <version>5.13.3</version>
+    <version>5.15.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

c-echo-scu/pom.xml

@@ -46,7 +46,7 @@
   <parent>
     <artifactId>quickstart-parent</artifactId>
     <groupId>org.dcm4che.quickstart</groupId>
-    <version>5.13.3</version>
+    <version>5.15.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

c-move-scu/pom.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ ***** BEGIN LICENSE BLOCK *****
+  ~ Version: MPL 1.1/GPL 2.0/LGPL 2.1
+  ~
+  ~ The contents of this file are subject to the Mozilla Public License Version
+  ~ 1.1 (the "License"); you may not use this file except in compliance with
+  ~ the License. You may obtain a copy of the License at
+  ~ http://www.mozilla.org/MPL/
+  ~
+  ~ Software distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+  ~ for the specific language governing rights and limitations under the
+  ~ License.
+  ~
+  ~ The Original Code is part of dcm4che, an implementation of DICOM(TM) in
+  ~ Java(TM), hosted at https://github.com/dcm4che.
+  ~
+  ~ The Initial Developer of the Original Code is
+  ~ J4Care.
+  ~ Portions created by the Initial Developer are Copyright (C) 2015-2018
+  ~ the Initial Developer. All Rights Reserved.
+  ~
+  ~ Contributor(s):
+  ~ See @authors listed below
+  ~
+  ~ Alternatively, the contents of this file may be used under the terms of
+  ~ either the GNU General Public License Version 2 or later (the "GPL"), or
+  ~ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+  ~ in which case the provisions of the GPL or the LGPL are applicable instead
+  ~ of those above. If you wish to allow use of your version of this file only
+  ~ under the terms of either the GPL or the LGPL, and not to allow others to
+  ~ use your version of this file under the terms of the MPL, indicate your
+  ~ decision by deleting the provisions above and replace them with the notice
+  ~ and other provisions required by the GPL or the LGPL. If you do not delete
+  ~ the provisions above, a recipient may use your version of this file under
+  ~ the terms of any one of the MPL, the GPL or the LGPL.
+  ~
+  ~ ***** END LICENSE BLOCK *****
+  ~
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>quickstart-parent</artifactId>
+    <groupId>org.dcm4che.quickstart</groupId>
+    <version>5.15.1</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>c-move-scu</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.dcm4che</groupId>
+      <artifactId>dcm4che-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.dcm4che</groupId>
+      <artifactId>dcm4che-net</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>

c-move-scu/src/main/java/org/dcm4che3/quickstart/cmovescu/CMoveSCU.java

@@ -0,0 +1,175 @@
+/*
+ * **** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is part of dcm4che, an implementation of DICOM(TM) in
+ * Java(TM), hosted at https://github.com/dcm4che.
+ *
+ * The Initial Developer of the Original Code is
+ * J4Care.
+ * Portions created by the Initial Developer are Copyright (C) 2015-2018
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * See @authors listed below
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * **** END LICENSE BLOCK *****
+ *
+ */
+
+package org.dcm4che3.quickstart.cmovescu;
+
+import org.dcm4che3.data.Attributes;
+import org.dcm4che3.data.Tag;
+import org.dcm4che3.data.UID;
+import org.dcm4che3.data.VR;
+import org.dcm4che3.net.*;
+import org.dcm4che3.net.pdu.AAssociateRQ;
+import org.dcm4che3.net.pdu.PresentationContext;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+/**
+ * @author Gunter Zeilinger <[email protected]>
+ * @since Jan 2019
+ */
+public class CMoveSCU {
+    private Device device;
+    private ApplicationEntity ae;
+    private Connection conn;
+    public CMoveSCU(String callingAET) {
+        device = new Device("c-move-scu");
+        ae = new ApplicationEntity(callingAET);
+        conn = new Connection();
+        device.addApplicationEntity(ae);
+        device.addConnection(conn);
+        ae.addConnection(conn);
+    }
+
+    public void setExecutor(Executor executor) {
+        device.setExecutor(executor);
+    }
+
+    public void setScheduledExecutor(ScheduledExecutorService executor) {
+        device.setScheduledExecutor(executor);
+    }
+
+    public void move(String calledAET, String hostName, int port, String destinationAET, Attributes request)
+            throws IOException, InterruptedException, GeneralSecurityException, IncompatibleConnectionException {
+        Association as = ae.connect(mkConnection(hostName, port), mkAARQ(calledAET));
+            try {
+                as.cmove(UID.StudyRootQueryRetrieveInformationModelMOVE,
+                        Priority.NORMAL,
+                        request,
+                        UID.ImplicitVRLittleEndian,
+                        destinationAET,
+                        new DimseRSPHandler(as.nextMessageID()));
+            } catch (IOException e) {
+                System.out.printf("Failed to invoke C-MOVE-RQ to %s - %s%n", calledAET, e);
+            }
+        as.waitForOutstandingRSP();
+        as.release();
+    }
+
+    private AAssociateRQ mkAARQ(String calledAET) {
+        AAssociateRQ aarq = new AAssociateRQ();
+        aarq.setCallingAET(ae.getAETitle()); // optional: will be set in ae.connect() if not explicitly set.
+        aarq.setCalledAET(calledAET);
+        aarq.addPresentationContext(
+                        new PresentationContext(1,
+                                UID.StudyRootQueryRetrieveInformationModelMOVE,
+                                UID.ImplicitVRLittleEndian));
+        return aarq;
+    }
+
+    private Connection mkConnection(String hostName, int port) {
+        return new Connection(null, hostName, port);
+    }
+
+    public static void main(String[] args) throws Exception {
+        CLI cli = CLI.parse(args);
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        ScheduledExecutorService scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
+        try {
+            CMoveSCU scu = new CMoveSCU(cli.callingAET);
+            scu.setExecutor(executor);
+            scu.setScheduledExecutor(scheduledExecutor);
+            scu.move(cli.calledAET, cli.hostname, cli.port, cli.destinationAET, cli.request);
+        } finally {
+            executor.shutdown();
+            scheduledExecutor.shutdown();
+        }
+    }
+
+    private static class CLI {
+        final String callingAET;
+        final String calledAET;
+        final String hostname;
+        final int port;
+        final String destinationAET;
+        final Attributes request;
+
+        CLI(String[] args) {
+            if (args.length < 6)
+                throw new IllegalArgumentException();
+
+            callingAET = args[0];
+            calledAET = args[1];
+            hostname = args[2];
+            port = Integer.parseInt(args[3]);
+            destinationAET = args[4];
+            request = new Attributes(args.length - 5);
+            request.setString(Tag.QueryRetrieveLevel, VR.CS,
+                    args.length == 6 ? "STUDY" :
+                    args.length == 7 ? "SERIES"
+                                     : "IMAGE");
+            request.setString(Tag.StudyInstanceUID, VR.UI, args[5]);
+            if (args.length > 6) {
+                request.setString(Tag.SeriesInstanceUID, VR.UI, args[6]);
+                if (args.length > 7) {
+                    String[] iuids = new String[args.length - 7];
+                    System.arraycopy(args, 7, iuids, 0, iuids.length);
+                    request.setString(Tag.SOPInstanceUID, VR.UI, iuids);
+                }
+            }
+        }
+
+        static CLI parse(String[] args) {
+            try {
+                return new CLI(args);
+            } catch (IllegalArgumentException e) {
+                System.out.println("Usage: c-move-scu <calling-aet> <called-aet> <host> <port> <destination-aet> \\");
+                System.out.println("                  <study-iuid> [<series-iuid> [<object-iuid>...]]");
+                System.exit(-1);
+                return null;
+            }
+        }
+    }
+}

c-store-scp/pom.xml

@@ -46,7 +46,7 @@
   <parent>
     <artifactId>quickstart-parent</artifactId>
     <groupId>org.dcm4che.quickstart</groupId>
-    <version>5.13.3</version>
+    <version>5.15.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

c-store-scu/pom.xml

@@ -46,7 +46,7 @@
   <parent>
     <artifactId>quickstart-parent</artifactId>
     <groupId>org.dcm4che.quickstart</groupId>
-    <version>5.13.3</version>
+    <version>5.15.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

ian-scp/pom.xml

@@ -46,7 +46,7 @@
   <parent>
     <artifactId>quickstart-parent</artifactId>
     <groupId>org.dcm4che.quickstart</groupId>
-    <version>5.13.3</version>
+    <version>5.15.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -47,7 +47,7 @@
 
   <groupId>org.dcm4che.quickstart</groupId>
   <artifactId>quickstart-parent</artifactId>
-  <version>5.13.3</version>
+  <version>5.15.1</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -70,6 +70,7 @@
   <modules>
     <module>c-echo-scp</module>
     <module>c-echo-scu</module>
+    <module>c-move-scu</module>
     <module>c-store-scp</module>
     <module>c-store-scu</module>
     <module>ian-scp</module>