[med-svn] [conquest-dicom-server] 16/17: Patch acrnema.map and add info on compression
Pablo Lorenzzoni
spectra at moszumanska.debian.org
Mon Feb 3 16:47:52 UTC 2014
This is an automated email from the git hooks/post-receive script.
spectra pushed a commit to branch master
in repository conquest-dicom-server.
commit 53e15cae61c67c0ad9c283620890b2986a342019
Author: Pablo Lorenzzoni <spectra at debian.org>
Date: Sun Feb 2 11:34:07 2014 +0000
Patch acrnema.map and add info on compression
---
debian/make-manpage | 2 +
debian/manparts/aetitle.h2m | 13 +++
debian/manparts/compression.h2m | 102 +++++++++++++++++++++
debian/manparts/files.h2m | 6 +-
...ange-port-for-CONQUESTSRV1-in-acrnema.map.patch | 33 +++++++
debian/patches/series | 1 +
6 files changed, 155 insertions(+), 2 deletions(-)
diff --git a/debian/make-manpage b/debian/make-manpage
index fd16241..d6fb653 100755
--- a/debian/make-manpage
+++ b/debian/make-manpage
@@ -11,6 +11,8 @@ help2man -h "-w$PWD -?" -N -s 1 -n "UCDMC/NKI DICOM server thread and PACS utili
--include debian/manparts/options.h2m \
--include debian/manparts/otheroptions.h2m \
--include debian/manparts/files.h2m \
+ --include debian/manparts/compression.h2m \
+ --include debian/manparts/aetitle.h2m \
--include debian/manparts/author.h2m \
--include debian/manparts/reportingbugs.h2m \
-o dgate.1 ./dgate
diff --git a/debian/manparts/aetitle.h2m b/debian/manparts/aetitle.h2m
new file mode 100644
index 0000000..fc8fd36
--- /dev/null
+++ b/debian/manparts/aetitle.h2m
@@ -0,0 +1,13 @@
+[ae title]
+The default AE Title for ConQuest DICOM server in this package is
+.B CONQUESTSRV1
+and this is the AE Title you should use in DICOM viewers pointing to it. As
+a "bonus" feature, you can use AE Title to declare the type of compression
+you'll be using between the viewer and the server. just add
+.B ~XX
+to ConQuest AE Title, where XX is the compression algo/level you wish to use.
+For instance, to use
+.B uncompressed
+images, the AE Title
+.B CONQUESTSRV1~un
+can be declared in your DICOM node configuration in the viewer.
diff --git a/debian/manparts/compression.h2m b/debian/manparts/compression.h2m
new file mode 100644
index 0000000..fe7f348
--- /dev/null
+++ b/debian/manparts/compression.h2m
@@ -0,0 +1,102 @@
+[compression]
+.B ConQuest
+supports a lot of compression and downsizing methods. These can be declared
+in the
+.B acrnema.map
+file, using directives
+.B DroppedFileCompression, IncomingCompression and ArchiveCompression
+in
+.B dicom.ini
+file and/or by using modifiers to AE Title (check
+.B AE TITLE
+section below).
+.PP
+The following information was extracted from
+.B section 7.7
+of the manual (file
+/user/share/doc/conquest-dicom-server/windowsmanual.pdf.gz in this package):
+.PP
+Files dropped into the server will optionally be compressed, decompressed
+and/or recompressed. Supported values are (expected compression ratio stated
+between brackets):
+.TP
+as
+store images as is, e.g. without changing the compression.
+.TP
+is
+store images as is, e.g. without changing the compression.
+.TP
+un
+uncompress NKI and/or JPEG compressed images
+.TP
+n1
+fast NKI private loss-less compression mode 1 (50%)
+.TP
+n2
+as n1 but with CRC check for errors (50%)
+.TP
+n3
+fast NKI private loss-less compression mode 3 (40%)
+.TP
+n4
+as n3 but with CRC check for errors (40%)
+.TP
+j1
+JPEGLossless (retired, use J2 instead) (33%)
+.TP
+j2
+JPEGLosslessNH14 (33%)
+.TP
+j3
+JPEG baseline 1 (8 bit) lossy (8%)
+.TP
+j4
+JPEGExtended2and4 lossy (15%)
+.TP
+j5
+JPEGSpectralNH6and8 lossy (15%)
+.TP
+j6
+JPEGFulllNH10and12 lossy (14%)
+.TP
+j3NN
+JPEG baseline 1 (8 bit) quality as defined (60..95 suggested)
+.TP
+j4NN
+JPEGExtended2and4 quality as defined (60..95 suggested)
+.TP
+j5NN
+JPEGSpectralNH6and8 quality as defined (60..95 suggested)
+.TP
+j6NN
+JPEGFulllNH10and12 quality as defined (60..95 suggested)
+.TP
+jk
+Lossless JPEG2000 (30%)
+.TP
+jl
+Lossy JPEG2000 (20%)
+.TP
+jlNN
+Lossy JPEG2000 bitrate as defined (1..20 suggested)
+.TP
+nj
+Highest NKI mode; but leaves JPEG as is (variable)
+.TP
+uj
+Uncompressed; but leaves JPEG as is (variable)
+.TP
+k1
+Downsize image>1024 pixels wide/high to 1024 (variable)
+.TP
+k2
+Downsize image>512 pixels wide/high to 512 (variable)
+.TP
+k4
+Downsize image>256 pixels wide/high to 256 (variable)
+.TP
+k8
+Downsize image>128 pixels wide/high to 128 (variable)
+.TP
+ka
+Downsize image>64 pixels wide/high to 64 (variable)
diff --git a/debian/manparts/files.h2m b/debian/manparts/files.h2m
index cfb912c..3ce234d 100644
--- a/debian/manparts/files.h2m
+++ b/debian/manparts/files.h2m
@@ -1,13 +1,15 @@
[files]
All of the locations below can be configured in
.B dicom.ini
-file. By default, in this package
+file. In this package
.B ConQuest
expects dicom.ini to be present in the
.B /etc/conquest-dicom-server
directory. This can be changed using
.B -w
-option.
+option (see
+.B OPTIONS
+above).
.TP 15
/etc/conquest-dicom-server/dicom.ini
Several self-explanatory configuration parameters for the server.
diff --git a/debian/patches/0007-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch b/debian/patches/0007-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch
new file mode 100644
index 0000000..505fa6a
--- /dev/null
+++ b/debian/patches/0007-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch
@@ -0,0 +1,33 @@
+From: Pablo Lorenzzoni <spectra at debian.org>
+Date: Sun, 2 Feb 2014 11:21:47 +0000
+Subject: Change port for CONQUESTSRV1 in acrnema.map
+
+---
+ acrnema.map | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/acrnema.map b/acrnema.map
+index c1baed9..4cda61a 100644
+--- a/acrnema.map
++++ b/acrnema.map
+@@ -14,13 +14,14 @@
+ * *
+ * For compression see manual. Values are un=uncompressed; *
+ * j1,j2=lossless jpeg;j3..j6=lossy jpeg;n1..n4=nki private *
+- * jk=lossless jpeg2000;jl=lossy jpeg2000 *
++ * jk=lossless jpeg2000;jl=lossy jpeg2000;as=as is *
+ * *
+ ********************************************************** */
+
+-CONQUESTSRV1 127.0.0.1 5678 as
+-SUPERMICRO 192.168.0.53 5678 as
+-SKY 192.168.0.34 5678 un
++CONQUESTSRV1 127.0.0.1 11112 as
+
+-V* * 1234 as
+-S* * 5678 un
++// SUPERMICRO 192.168.0.53 5678 as
++// SKY 192.168.0.34 5678 un
++
++// V* * 1234 as
++// S* * 5678 un
diff --git a/debian/patches/series b/debian/patches/series
index 098eeaf..2d470ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
0004-Add-logfiles-location-to-dicom.ini.sqlite.patch
0005-Separate-option-and-description-in-PrintOptions.patch
0006-Add-DebianBaseDir-at-dgate.cpp.patch
+0007-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git
More information about the debian-med-commit
mailing list