--- dicomscope-3.6.0.orig/debian/doc-base.dscs +++ dicomscope-3.6.0/debian/doc-base.dscs @@ -0,0 +1,21 @@ +Document: dicomscope +Title: DICOM Conformance Statement +Author: M. Eichelberg, K. Kleber, J. Riesmeier, A. Schröter, A. Thiel +Abstract: The OFFIS DICOM Viewer + DICOMscope is a free DICOM viewer which can display uncompressed, + monochrome DICOM images from all modalities and which supports + monitor calibration according to DICOM part 14 as well as + presentation states. DICOMscope offers a print client (DICOM Basic + Grayscale Print Management) which also implements the optional + Presentation LUT SOP Class. The development of this prototype was + commissioned by the "Committee for the Advancement of DICOM" and + demonstrated at the European Congress of Radiology ECR 1999. An + enhanced version was developed for the "DICOM Display Consistency + Demonstration" at RSNA InfoRAD 1999. The current release 3.5.1 has + been demonstrated at ECR 2001 and contains numerous extensions, + including a print server, support for encrypted DICOM communication, + digital signatures and structured reporting. +Section: Science/Medicine + +Format: PDF +Files: /usr/share/doc/dicomscope/dscs360.pdf --- dicomscope-3.6.0.orig/debian/doc-base.dsum +++ dicomscope-3.6.0/debian/doc-base.dsum @@ -0,0 +1,21 @@ +Document: dicomscope +Title: DICOMscope 3.6.0 User Manual +Author: M. Eichelberg, K. Kleber, J. Riesmeier, A. Schröter, A. Thiel +Abstract: The OFFIS DICOM Viewer + DICOMscope is a free DICOM viewer which can display uncompressed, + monochrome DICOM images from all modalities and which supports + monitor calibration according to DICOM part 14 as well as + presentation states. DICOMscope offers a print client (DICOM Basic + Grayscale Print Management) which also implements the optional + Presentation LUT SOP Class. The development of this prototype was + commissioned by the "Committee for the Advancement of DICOM" and + demonstrated at the European Congress of Radiology ECR 1999. An + enhanced version was developed for the "DICOM Display Consistency + Demonstration" at RSNA InfoRAD 1999. The current release 3.5.1 has + been demonstrated at ECR 2001 and contains numerous extensions, + including a print server, support for encrypted DICOM communication, + digital signatures and structured reporting. +Section: Science/Medicine + +Format: PDF +Files: /usr/share/doc/dicomscope/dsum360.pdf --- dicomscope-3.6.0.orig/debian/docs +++ dicomscope-3.6.0/debian/docs @@ -0,0 +1 @@ +DICOMscope/docs/* --- dicomscope-3.6.0.orig/debian/postinst +++ dicomscope-3.6.0/debian/postinst @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +# This should be added by dh_makeshlibs but something seems to go wrong +# here. So adding the code needed manually for the moment +if [ "$1" = "configure" ]; then + ldconfig +fi + +#DEBHELPER# + +exit 0 --- dicomscope-3.6.0.orig/debian/compat +++ dicomscope-3.6.0/debian/compat @@ -0,0 +1 @@ +7 --- dicomscope-3.6.0.orig/debian/changelog +++ dicomscope-3.6.0/debian/changelog @@ -0,0 +1,20 @@ +dicomscope (3.6.0-3) experimental; urgency=low + + * Fix compilation of dicomscope against dcmtk 3.6.0 release and new API + * Convert iso german to utf-8 to prevent warning during java compilation + * Update debian Standard Version to 3.9.1 no change needed + * Switch to dpkg-source 3.0 (quilt) format + + -- Mathieu Malaterre Wed, 09 Feb 2011 11:04:47 +0100 + +dicomscope (3.6.0-2) unstable; urgency=low + + * Remove tofrodos and unzip from Build-Deps. Fixes hurd-386 compilation. + + -- Mathieu Malaterre Mon, 21 Dec 2009 15:46:02 +0100 + +dicomscope (3.6.0-1) unstable; urgency=low + + * Initial release (Closes: #508990) + + -- Mathieu Malaterre Mon, 16 Nov 2009 17:58:43 +0100 --- dicomscope-3.6.0.orig/debian/dicomscope.lintian-overrides +++ dicomscope-3.6.0/debian/dicomscope.lintian-overrides @@ -0,0 +1,8 @@ +# W: dicomscope: package-name-doesnt-match-sonames libjInterface +dicomscope: package-name-doesnt-match-sonames +# W: dicomscope: shlib-without-versioned-soname usr/lib/libjInterface.so libjInterface.so +dicomscope: shlib-without-versioned-soname +# the suspected openssl-gpl conflict is due to +# the source package being licensed under gpl. +# therefore, we provide an explicit override +dicomscope binary: possible-gpl-code-linked-with-openssl --- dicomscope-3.6.0.orig/debian/copyright +++ dicomscope-3.6.0/debian/copyright @@ -0,0 +1,48 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Debianized-By: Mathieu Malaterre +Debianized-Date: Mon, 12 Jan 2009 11:12:57 +0100 +Original-Source: http://dicom.offis.de/dscope.php.en + +Files: * +Copyright: + Copyright (C) 1999-2009, OFFIS and Institute for MicroTherapy +License: + This software and supporting documentation were developed by + + OFFIS e.V. + Escherweg 2 + 26121 Oldenburg + Germany + + and + + University of Witten/Herdecke + Department of Radiology and MicroTherapy + Institute for MicroTherapy + Medical computer science + Universitaetsstrasse 142 + 44799 Bochum + Germany + + THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND OFFIS AND THE INSTITUTE + FOR MICROTHERAPY MAKE NO WARRANTY REGARDING THE SOFTWARE, ITS + PERFORMANCE, ITS MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR USE, + FREEDOM FROM ANY COMPUTER DISEASES OR ITS CONFORMITY TO ANY SPECIFI- + CATION. THE ENTIRE RISK AS TO QUALITY AND PERFORMANCE OF THE SOFTWARE + IS WITH THE USER. + + Copyright of the software and supporting documentation is, unless + otherwise stated, owned by OFFIS and the Institute of MicroTherapy, + and free access is hereby granted as a license to use this software, + copy this software and prepare derivative works based upon this + software. However, any distribution of this software source code or + supporting documentation or derivative works (source code and support- + ing documentation) must include the three paragraphs of this copyright + notice. + +Files: debian/* +Copyright: + Copyright 2009, Mathieu Malaterre +License: GPL-2+ + The Debian packaging is licensed under the GPL-2 or any later version, + see `/usr/share/common-licenses/GPL-2' --- dicomscope-3.6.0.orig/debian/control +++ dicomscope-3.6.0/debian/control @@ -0,0 +1,31 @@ +Source: dicomscope +Section: graphics +Maintainer: Debian Med Packaging Team +DM-Upload-Allowed: yes +Uploaders: Mathieu Malaterre +Priority: extra +Build-Depends: debhelper (>= 7), cmake, libdcmtk2-dev (>= 3.6.0), default-jdk, + libssl-dev, libxml2-dev, quilt +Standards-Version: 3.9.1 +Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dicomscope/trunk/?rev=0&sc=0 +Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/dicomscope/trunk/ +Homepage: http://dicom.offis.de/dscope.php.en + +Package: dicomscope +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, tk8.3 | tk8.4, libdcmtk2 (>= 3.6.0), libssl0.9.8, + libxml2, java-gcj-compat | java1-runtime | java2-runtime +Description: The OFFIS DICOM Viewer + DICOMscope is a free DICOM viewer which can display uncompressed, + monochrome DICOM images from all modalities and which supports + monitor calibration according to DICOM part 14 as well as + presentation states. DICOMscope offers a print client (DICOM Basic + Grayscale Print Management) which also implements the optional + Presentation LUT SOP Class. The development of this prototype was + commissioned by the "Committee for the Advancement of DICOM" and + demonstrated at the European Congress of Radiology ECR 1999. An + enhanced version was developed for the "DICOM Display Consistency + Demonstration" at RSNA InfoRAD 1999. The current release 3.5.1 has + been demonstrated at ECR 2001 and contains numerous extensions, + including a print server, support for encrypted DICOM communication, + digital signatures and structured reporting. --- dicomscope-3.6.0.orig/debian/watch +++ dicomscope-3.6.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="passive" \ +ftp://dicom.offis.de/pub/dicom/offis/software/dscope/dscope([\d]+)/dsgui(\d)(\d)(\d)\.zip --- dicomscope-3.6.0.orig/debian/upstream-metadata.yaml +++ dicomscope-3.6.0/debian/upstream-metadata.yaml @@ -0,0 +1,2 @@ +Donation: http://dicom.offis.de/donation.php.en +Homepage: http://dicom.offis.de/dscope.php.en --- dicomscope-3.6.0.orig/debian/README.source +++ dicomscope-3.6.0/debian/README.source @@ -0,0 +1,4 @@ +This packages uses the quilt patch system. Please read +/usr/share/doc/quilt/README.source for more information. + + -- Mathieu Malaterre (malat) Tue, 08 Sep 2009 09:23:36 +0200 --- dicomscope-3.6.0.orig/debian/README.Debian +++ dicomscope-3.6.0/debian/README.Debian @@ -0,0 +1,10 @@ +DICOMScope for Debian +===================== + +An helper script is provided to start the main jar archive: + + /usr/bin/dicomscope + +which simply starts: java -jar /usr/share/dicomscope/DICOMscope.jar + +-- Mathieu Malaterre Wed Jan 21 14:51:47 CET 2009 --- dicomscope-3.6.0.orig/debian/dicomscope.1 +++ dicomscope-3.6.0/debian/dicomscope.1 @@ -0,0 +1,32 @@ +.TH DICOMSCOPE 1 "20 Aug 2009" "Version 3.6.0" "OFFIS DCMTK" +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.SH NAME +dicomscope \- DICOM Viewer +.SH SYNOPSIS +.B dicomscope +.I DICOMFile.dcm + +.SH "DESCRIPTION" +This manual page documents briefly the +.B dicomscope +command. + +.PP +DICOMscope is a free DICOM viewer which can display uncompressed, monochrome DICOM images from all modalities and which supports monitor calibration according to DICOM part 14 as well as presentation states. DICOMscope offers a print client (DICOM Basic Grayscale Print Management) which also implements the optional Presentation LUT SOP Class. The development of this prototype was commissioned by the "Committee for the Advancement of DICOM" and demonstrated at the European Congress of Radiology ECR 1999. An enhanced version was developed for the "DICOM Display Consistency Demonstration" at RSNA InfoRAD 1999. The current release 3.5.1 has been demonstrated at ECR 2001 and contains numerous extensions, including a print server, support for encrypted DICOM communication, digital signatures and structured reporting. + +DICOMscope is not meant as a competition for commercial DICOM viewers. The application is rather a feasibility study for DICOM presentation states. The program is not appropriate to be used in a clinical environment, e.g. for reporting. + +.SH "DISCLAIMER" +This software is made available, as is, and OFFIS, the Institute for Microtherapy / VISUS-TT and OTech make no warranty regarding the software, its performance, its merchantability or fitness for any particular use, freedom from any computer diseases or its conformity to any specification. The entire risk as to quality and performance of the software is with the user. This software is intended for investigational use only. It has not been tested or approved for clinical application or production environments. + +.SH SEE ALSO +See the project homepage +.B http://dicom.offis.de/dscope.php.en +for more information. + +.SH "COPYRIGHT" +Copyright (C) 1994-2005 by Kuratorium OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. + +This manual page was written by Mathieu Malaterre + for the Debian GNU/Linux system (but may be used by others). --- dicomscope-3.6.0.orig/debian/rules +++ dicomscope-3.6.0/debian/rules @@ -0,0 +1,154 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# debian/rules for dicomscope +# (C) 2008 Mathieu Malaterre , +# Andreas Tille getStandardDisplayedArea (tx, ty, bx, by); + +@@ -1014,7 +1014,7 @@ + { + DVPresentationState *ps = getAddressOfDVPresentationState (env, obj); + +- long tx, ty, bx, by; ++ Sint32 tx, ty, bx, by; + + OFCondition res = ps->getImageRelativeDisplayedArea (tx, ty, bx, by); + --- dicomscope-3.6.0.orig/debian/patches/dicomscope_defaultpackage.patch +++ dicomscope-3.6.0/debian/patches/dicomscope_defaultpackage.patch @@ -0,0 +1,10 @@ +The MANIFEST.MF provides does not work on case sensitive system. Fix it. + +Index: b/MANIFEST.MF +=================================================================== +--- a/MANIFEST.MF 2011-02-09 10:49:19.000000000 +0100 ++++ b/MANIFEST.MF 2011-02-09 10:49:25.000000000 +0100 +@@ -1,2 +1,2 @@ + Manifest-Version: 1.0 +-Main-Class: DICOMscope/DICOMscope ++Main-Class: dicomscope/DICOMscope --- dicomscope-3.6.0.orig/debian/patches/dicomscope.cfg.patch +++ dicomscope-3.6.0/debian/patches/dicomscope.cfg.patch @@ -0,0 +1,63 @@ +Fix the default path to those as defined in debian packaging of dcmtk + +Index: b/DICOMscope/DICOMscope.cfg +=================================================================== +--- a/DICOMscope/DICOMscope.cfg 2011-02-09 10:49:19.000000000 +0100 ++++ b/DICOMscope/DICOMscope.cfg 2011-02-09 10:49:26.000000000 +0100 +@@ -157,15 +157,15 @@ + # ---------------------------------------------------------------------------- + + # directory in which DICOM images and index.dat reside +-Directory = database ++Directory = /var/lib/dcmtk/db/READWRITE + + # Path to the dump tool used to display the contents of DICOM files located + # in the database +-Dump = c:\program files\tcl\bin\wish83 dcmpsdmp.tcl ++Dump = /usr/bin/wish /usr/share/dicomscope/tcl/dcmpsdmp.tcl + + # Path to the check tool used to evaluate the contents of DICOM files located + # in the database +-Check = c:\program files\tcl\bin\wish83 dcmpschk.tcl ++Check = /usr/bin/wish /usr/share/dicomscope/tcl/dcmpschk.tcl + + # ---------------------------------------------------------------------------- + # General Presentation LUT settings in this section. +@@ -173,7 +173,7 @@ + # ---------------------------------------------------------------------------- + + # directory in which LUT files reside +-Directory = lut ++Directory = /usr/share/dicomscope/lut + + # ---------------------------------------------------------------------------- + # General Structured Reporting (SR) settings in this section. +@@ -181,7 +181,7 @@ + # ---------------------------------------------------------------------------- + + # directory in which SR "template" files reside +-Directory = reports ++Directory = /usr/share/dicomscope/reports + + # ---------------------------------------------------------------------------- + # This section contains the settings for network communication. +@@ -254,7 +254,7 @@ + # Path to the DICOM query/retrieve server (Q/R SCP) to be used. + # The configuration filename is created from this entry by adding the file + # extension ".cfg". +-Server = imagectn ++Server = dcmqrscp + + # IP Port number on which the server listens for new connections. + # On Unix platforms, the receiver must be started with setuid root +@@ -267,8 +267,8 @@ + # Default is 16384. + MaxPDU = 32768 + +-# Application entity title imagectn will use to identify itself. +-AETitle = IMAGECTN ++# Application entity title dcmqrscp will use to identify itself. ++AETitle = DCMQRSCP + + # Maximum number of associations the server can handle at the same time. + # This is only applicable on Unix platforms, since Windows does not support --- dicomscope-3.6.0.orig/debian/patches/series +++ dicomscope-3.6.0/debian/patches/series @@ -0,0 +1,10 @@ +iso2utf8.patch +cmakelists.txt.patch +dicomscope_defaultpackage.patch +DVPresentationState.patch +dicomscope.cfg.patch +maincontext.java.patch +dicomscope.patch +DSRDocument.cpp.patch +dicom_2009.patch +log4cplus.patch --- dicomscope-3.6.0.orig/debian/patches/dicomscope.patch +++ dicomscope-3.6.0/debian/patches/dicomscope.patch @@ -0,0 +1,10 @@ +Provide a special helper script to start dicomscope + +Index: b/dicomscope +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ b/dicomscope 2011-02-09 10:49:26.000000000 +0100 +@@ -0,0 +1,3 @@ ++#!/bin/sh ++ ++exec /usr/bin/java -jar /usr/share/dicomscope/DICOMscope.jar --- dicomscope-3.6.0.orig/debian/patches/maincontext.java.patch +++ dicomscope-3.6.0/debian/patches/maincontext.java.patch @@ -0,0 +1,15 @@ +Use full path instead of relative path + +Index: b/tkgui/main/MainContext.java +=================================================================== +--- a/tkgui/main/MainContext.java 2011-02-09 10:49:19.000000000 +0100 ++++ b/tkgui/main/MainContext.java 2011-02-09 10:49:26.000000000 +0100 +@@ -148,7 +148,7 @@ + //System.out.println("MainContext.iconPath " +MainContext.iconPath ); + //Load deviceColorModell + loadDeviceInformation(); +- codeList = new SRCodeList("codes.dic"); ++ codeList = new SRCodeList("/usr/share/dcmtk/codes.dic"); + } + + --- dicomscope-3.6.0.orig/debian/patches/DSRDocument.cpp.patch +++ dicomscope-3.6.0/debian/patches/DSRDocument.cpp.patch @@ -0,0 +1,15 @@ +This is undefined in the source (fix compilation) + +Index: b/interface/libsrc/DSRDocument.cpp +=================================================================== +--- a/interface/libsrc/DSRDocument.cpp 2011-02-09 10:49:19.000000000 +0100 ++++ b/interface/libsrc/DSRDocument.cpp 2011-02-09 10:49:27.000000000 +0100 +@@ -106,7 +106,7 @@ + + /* create local string stream */ + OFOStringStream oss; +- OFCondition res = doc->renderHTML(oss, flags | DSRTypes::HF_version32Compatibility | DSRTypes::HF_renderFullData); ++ OFCondition res = doc->renderHTML(oss, flags /*| DSRTypes::HF_version32Compatibility */| DSRTypes::HF_renderFullData); + OFSTRINGSTREAM_GETSTR(oss, tmpString) + + if (res == EC_Normal) --- dicomscope-3.6.0.orig/debian/patches/log4cplus.patch +++ dicomscope-3.6.0/debian/patches/log4cplus.patch @@ -0,0 +1,23 @@ +This patch simply remove the call to the old API for logging until a better fix is to be found +Index: b/interface/libsrc/DVInterface.cpp +=================================================================== +--- a/interface/libsrc/DVInterface.cpp 2011-02-09 10:49:19.000000000 +0100 ++++ b/interface/libsrc/DVInterface.cpp 2011-02-09 10:49:27.000000000 +0100 +@@ -2828,7 +2828,7 @@ + { + DVInterface *dvi = getAddressOfDVInterface (env, obj); + +- dvi->setLogFilter ((DVPSLogMessageLevel)level); ++// dvi->setLogFilter ((DVPSLogMessageLevel)level); + } + + +@@ -2845,7 +2845,7 @@ + char *mod = (char*) env->GetStringUTFChars (module, 0); + char *msg = (char*) env->GetStringUTFChars (message, 0); + +- OFCondition res = dvi->writeLogMessage ((DVPSLogMessageLevel)level, mod, msg); ++ OFCondition res = EC_Normal; //dvi->writeLogMessage ((DVPSLogMessageLevel)level, mod, msg); + + env->ReleaseStringUTFChars (module, mod); + env->ReleaseStringUTFChars (message, msg); --- dicomscope-3.6.0.orig/debian/patches/dicom_2009.patch +++ dicomscope-3.6.0/debian/patches/dicom_2009.patch @@ -0,0 +1,79 @@ +This patch is due to the following change: + +http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=de4ba95922ebce6c30a21ee73f6790cb0aa31912#patch20 +Index: b/interface/libsrc/DSRDocument.cpp +=================================================================== +--- a/interface/libsrc/DSRDocument.cpp 2011-02-09 10:49:27.000000000 +0100 ++++ b/interface/libsrc/DSRDocument.cpp 2011-02-09 10:49:27.000000000 +0100 +@@ -442,7 +442,7 @@ + { + DSRDocument *doc = getAddressOfDSRDocument (env, obj); + +- const char *string = doc->getPatientsName(); ++ const char *string = doc->getPatientName(); + + if (string == NULL) return NULL; + return env->NewStringUTF (string); +@@ -459,7 +459,7 @@ + { + DSRDocument *doc = getAddressOfDSRDocument (env, obj); + +- const char *string = doc->getPatientsBirthDate(); ++ const char *string = doc->getPatientBirthDate(); + + if (string == NULL) return NULL; + return env->NewStringUTF (string); +@@ -476,7 +476,7 @@ + { + DSRDocument *doc = getAddressOfDSRDocument (env, obj); + +- const char *string = doc->getPatientsSex(); ++ const char *string = doc->getPatientSex(); + + if (string == NULL) return NULL; + return env->NewStringUTF (string); +@@ -493,7 +493,7 @@ + { + DSRDocument *doc = getAddressOfDSRDocument (env, obj); + +- const char *string = doc->getReferringPhysiciansName(); ++ const char *string = doc->getReferringPhysicianName(); + + if (string == NULL) return NULL; + return env->NewStringUTF (string); +@@ -812,7 +812,7 @@ + { + jbyte *string = env->GetByteArrayElements(array, 0); + +- res = doc->setPatientsName(OFString((char *)string, env->GetArrayLength(array))); ++ res = doc->setPatientName(OFString((char *)string, env->GetArrayLength(array))); + + env->ReleaseByteArrayElements(array, string, 0); + } +@@ -834,7 +834,7 @@ + + char *str = (value) ? (char *) env->GetStringUTFChars (value, 0) : NULL; + +- OFCondition res = doc->setPatientsBirthDate(str); ++ OFCondition res = doc->setPatientBirthDate(str); + + env->ReleaseStringUTFChars (value, str); + +@@ -854,7 +854,7 @@ + + char *str = (value) ? (char *) env->GetStringUTFChars (value, 0) : NULL; + +- OFCondition res = doc->setPatientsSex(str); ++ OFCondition res = doc->setPatientSex(str); + + env->ReleaseStringUTFChars (value, str); + +@@ -884,7 +884,7 @@ + { + jbyte *string = env->GetByteArrayElements(array, 0); + +- res = doc->setReferringPhysiciansName(OFString((char *)string, env->GetArrayLength(array))); ++ res = doc->setReferringPhysicianName(OFString((char *)string, env->GetArrayLength(array))); + + env->ReleaseByteArrayElements(array, string, 0); + } --- dicomscope-3.6.0.orig/debian/patches/cmakelists.txt.patch +++ dicomscope-3.6.0/debian/patches/cmakelists.txt.patch @@ -0,0 +1,145 @@ +Instead of using the in-src dcmtk build system, provide a replacement one +that allow building dicomscope outside of dcmtk + +Index: b/CMakeLists.txt +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ b/CMakeLists.txt 2011-02-09 10:49:25.000000000 +0100 +@@ -0,0 +1,24 @@ ++PROJECT(DICOMSCOPE) ++ ++cmake_minimum_required(VERSION 2.6) ++ ++#----------------------------------------------------------------------------- ++SET (EXECUTABLE_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.") ++SET (LIBRARY_OUTPUT_PATH ${DICOMSCOPE_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.") ++MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH) ++ ++IF(NOT DICOMSCOPE_INSTALL_BIN_DIR) ++ SET(DICOMSCOPE_INSTALL_BIN_DIR "bin") ++ENDIF(NOT DICOMSCOPE_INSTALL_BIN_DIR) ++ ++IF(NOT DICOMSCOPE_INSTALL_LIB_DIR) ++ SET(DICOMSCOPE_INSTALL_LIB_DIR "lib") ++ENDIF(NOT DICOMSCOPE_INSTALL_LIB_DIR) ++IF(NOT DICOMSCOPE_INSTALL_JAVA_DIR) ++ SET(DICOMSCOPE_INSTALL_JAVA_DIR "share/dicomscope") ++ENDIF(NOT DICOMSCOPE_INSTALL_JAVA_DIR) ++ ++INCLUDE_DIRECTORIES(interface/include) ++ ++SUBDIRS(interface/libsrc) ++SUBDIRS(tkgui) +Index: b/interface/libsrc/CMakeLists.txt +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ b/interface/libsrc/CMakeLists.txt 2011-02-09 10:49:25.000000000 +0100 +@@ -0,0 +1,60 @@ ++SET(dsgui_SRCS ++DSRCodeValue.cpp ++DSRCompositeValue.cpp ++DSRDocument.cpp ++DSRDocumentTree.cpp ++DSRImageValue.cpp ++DSRNumericValue.cpp ++DSRSCoordValue.cpp ++DSRTCoordValue.cpp ++DSRWaveformValue.cpp ++DVInterface.cpp ++DVPresentationState.cpp ++DVPSCurve.cpp ++DVPSGraphicObject.cpp ++DVPSStoredPrint.cpp ++DVPSTextObject.cpp ++) ++FIND_PACKAGE(JNI REQUIRED) ++INCLUDE_DIRECTORIES( ++ #${JNI_INCLUDE_PATH} # cmake bug # ++ ${JAVA_INCLUDE_PATH} ++ ${JAVA_INCLUDE_PATH2} ++ ${JAVA_AWT_INCLUDE_PATH} ++ ) ++ ++FIND_PACKAGE(DCMTK REQUIRED) ++# /usr/include/dcmtk/dcmpstat/dviface.h ++FIND_PATH( DCMTK_dcmpstat_INCLUDE_DIR dviface.h ++ ${DCMTK_DIR}/dcmpstat/include ++ ${DCMTK_DIR}/include/dcmpstat ++) ++# /usr/include/dcmtk/dcmjpeg/djdecode.h ++FIND_PATH( DCMTK_dcmjpeg_INCLUDE_DIR djdecode.h ++ ${DCMTK_DIR}/dcmjpeg/include ++ ${DCMTK_DIR}/include/dcmjpeg ++) ++# /usr/include/dcmtk/dcmsr/dsrdoc.h ++FIND_PATH( DCMTK_dcmsr_INCLUDE_DIR dsrdoc.h ++ ${DCMTK_DIR}/dcmsr/include ++ ${DCMTK_DIR}/include/dcmsr ++) ++ ++# MESSAGE(${DCMTK_INCLUDE_DIR}) ++INCLUDE_DIRECTORIES( ++ ${DCMTK_INCLUDE_DIR} ++ ${DCMTK_dcmpstat_INCLUDE_DIR} ++ ${DCMTK_dcmsr_INCLUDE_DIR} ${DCMTK_dcmjpeg_INCLUDE_DIR} ++) ++ ++ADD_DEFINITIONS(-DHAVE_CONFIG_H -DNDEBUG -DHAVE_STRSTREAM_H) ++ ++#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ++ADD_LIBRARY(jInterface SHARED ${dsgui_SRCS}) ++TARGET_LINK_LIBRARIES(jInterface ${DCMTK_LIBRARIES} dcmpstat dcmsr dcmjpeg ijg16 ijg12 ijg8 xml2 dcmdsig dcmqrdb crypto oflog) ++ INSTALL(TARGETS jInterface ++ RUNTIME DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime ++ LIBRARY DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Runtime ${NAMELINK_SKIP} ++ ARCHIVE DESTINATION ${DICOMSCOPE_INSTALL_LIB_DIR} COMPONENT Development ++ ) ++ +Index: b/tkgui/CMakeLists.txt +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ b/tkgui/CMakeLists.txt 2011-02-09 10:49:25.000000000 +0100 +@@ -0,0 +1,43 @@ ++# Java ++FIND_PACKAGE(Java REQUIRED) # javac, jar ++ ++file(GLOB_RECURSE javafiles ${CMAKE_CURRENT_SOURCE_DIR} "*.java") ++file(GLOB lutfiles "${DICOMSCOPE_SOURCE_DIR}/DICOMscope/lut/*.lut") ++file(GLOB reportfiles "${DICOMSCOPE_SOURCE_DIR}/DICOMscope/reports/*.dcm") ++#message(${lutfiles}) ++ ++#FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DICOMscope) ++ ++ADD_CUSTOM_COMMAND( ++ OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class ++ COMMAND ${JAVA_COMPILE} ARGS -d ../DICOMscope -classpath . dicomscope/DICOMscope.java ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++ DEPENDS ${javafiles} ++ COMMENT "javac *.java" ++) ++ ++ADD_CUSTOM_COMMAND( ++ OUTPUT ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ++ COMMAND ${JAVA_ARCHIVE} ARGS cfm ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/MANIFEST.MF ./ ++ # manifest thingy ++ #COMMAND ${JAVA_ARCHIVE} ARGS i ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ++ WORKING_DIRECTORY ${DICOMSCOPE_SOURCE_DIR}/DICOMscope ++ DEPENDS ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class ++ COMMENT "jar cvf -> DICOMscope.jar" ++) ++ ++ADD_CUSTOM_TARGET(dummy ALL ++ DEPENDS ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ++ COMMENT "building DICOMscope.jar" ++) ++ ++ INSTALL(FILES ${reportfiles} DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/reports COMPONENT Runtime) ++ INSTALL(FILES ${lutfiles} DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/lut COMPONENT Runtime) ++ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/dicomscope DESTINATION ${DICOMSCOPE_INSTALL_BIN_DIR} COMPONENT Runtime) ++ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpschk.tcl ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/dcmpsdmp.tcl DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR}/tcl COMPONENT Runtime) ++ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.cfg DESTINATION /etc/dcmtk COMPONENT Runtime) ++ INSTALL(FILES ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic DESTINATION /usr/share/dcmtk COMPONENT Runtime) ++ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/DICOMscope.jar ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/codes.dic ++ DESTINATION ${DICOMSCOPE_INSTALL_JAVA_DIR} COMPONENT Runtime ++ ) ++ --- dicomscope-3.6.0.orig/debian/patches/iso2utf8.patch +++ dicomscope-3.6.0/debian/patches/iso2utf8.patch @@ -0,0 +1,635 @@ +Index: dicomscope-3.6.0/tkgui/DICOMscope.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/DICOMscope.java 2011-02-09 11:02:13.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/DICOMscope.java 2011-02-09 11:02:10.000000000 +0100 +@@ -230,7 +230,7 @@ + + Dimension d = getSize(); + +- if (mc.highQualitySystem) // doppelte Gre als Minimum ++ if (mc.highQualitySystem) // doppelte Größe als Minimum + { + if (d.width < 1500) d.width = 1500; + if (d.height < 1500) d.height = 1500; +Index: dicomscope-3.6.0/tkgui/J2Ci/jBooleanByRef.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jBooleanByRef.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jBooleanByRef.java 2011-02-09 11:02:10.000000000 +0100 +@@ -32,7 +32,7 @@ + /** + * The class jBooleanByRef manages the "variable-by-reference". + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jBooleanByRef + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVIFhierarchyStatus.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVIFhierarchyStatus.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVIFhierarchyStatus.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVIFhierarchyStatus represents the C++-enumeration + * DVIFhierarchyStatus. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVIFhierarchyStatus + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurve.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSCurve.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurve.java 2011-02-09 11:02:10.000000000 +0100 +@@ -34,7 +34,7 @@ + * A jDVPSCurve is the Java-sided class for the C++-Class + * DVPSCurve. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSCurve + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurveType.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSCurveType.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSCurveType.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSCurveType represents the C++-enumeration + * DVPSCurveType. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSCurveType + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSDecimateCropBehaviour.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSDecimateCropBehaviour.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSDecimateCropBehaviour.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSDecimateCropBehaviour represents the C++-enumeration + * DVPSDecimateCropBehaviour. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSDecimateCropBehaviour + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSDisplayTransform.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSDisplayTransform.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSDisplayTransform.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSDisplayTransform represents the C++-enumeration + * DVPSDisplayTransform. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSDisplayTransform + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSFilmOrientation.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSFilmOrientation.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSFilmOrientation.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSFilmOrientation represents the C++-enumeration + * DVPSFilmOrientation. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSFilmOrientation + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicObject.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSGraphicObject.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicObject.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * A jDVPSGraphicObject is the Java-sided class for the C++-Class + * DVPSGraphicObject. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSGraphicObject + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicType.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSGraphicType.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSGraphicType.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSGraphicType represents the C++-enumeration + * DVPSGraphicType. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSGraphicType + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSObjectApplicability.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSObjectApplicability.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSObjectApplicability.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSObjectApplicability represents the C++-enumeration + * DVPSObjectApplicability. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSObjectApplicability + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSPresentationSizeMode.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSPresentationSizeMode.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSPresentationSizeMode.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSPresentationSizeMode represents the C++-enumeration + * DVPSPresentationSizeMode. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSPresentationSizeMode + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSPrintPresentationLUTType.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSPrintPresentationLUTType.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSPrintPresentationLUTType.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSPrintPresentationLUTType represents the C++-enumeration + * jDVPSPrintPresentationLUTType. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSPrintPresentationLUTType + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSRotationType.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSRotationType.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSRotationType.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSRotationType represents the C++-enumeration + * DVPSRotationType. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSRotationType + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSShutterType.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSShutterType.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSShutterType.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSShutterType represents the C++-enumeration + * DVPSShutterType. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSShutterType + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextJustification.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSTextJustification.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextJustification.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSTextJustification represents the C++-enumeration + * DVPSTextJustification. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSTextJustification + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextObject.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSTextObject.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSTextObject.java 2011-02-09 11:02:10.000000000 +0100 +@@ -34,7 +34,7 @@ + * A jDVPSTextObject is the Java-sided class for the C++-Class + * DVPSTextObject. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSTextObject + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSTrimMode.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSTrimMode.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSTrimMode.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSTrimMode represents the C++-enumeration + * DVPSTrimMode. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSTrimMode + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPSannotationUnit.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPSannotationUnit.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPSannotationUnit.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPSannotationUnit represents the C++-enumeration + * DVPSannotationUnit. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPSannotationUnit + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPScharacterSet.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPScharacterSet.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPScharacterSet.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jE_Condition represents the C++-enumeration + * E_Condition. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPScharacterSet + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetImageReference.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetImageReference.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetImageReference.java 2011-02-09 11:02:10.000000000 +0100 +@@ -36,7 +36,7 @@ + * and what Java can't manage. So an extra class had to be constructed - this class. + * Create an object of this class before passing it to that method! + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPrStateParam_GetImageReference + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetOverlayData.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetOverlayData.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetOverlayData.java 2011-02-09 11:02:10.000000000 +0100 +@@ -37,7 +37,7 @@ + * Create an object of this class before passing it to that method! + * IN and OUT specifies the type of param (input param or output param). + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPrStateParam_GetOverlayData + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetPixelData.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetPixelData.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetPixelData.java 2011-02-09 11:02:10.000000000 +0100 +@@ -36,7 +36,7 @@ + * and what Java can't manage. So an extra class had to be constructed - this class. + * Create an object of this class before passing it to that method! + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPrStateParam_GetPixelData + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetScreenData.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDVPrStateParam_GetScreenData.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDVPrStateParam_GetScreenData.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDVPrStateParam_GetScreenData is responsible for parameters + * passed to the method getScreenData(). + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDVPrStateParam_GetScreenData + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jDoubleByRef.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jDoubleByRef.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jDoubleByRef.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jDoublebyRef manages the "variable-by-reference". + * + * @version 1.0, 28.12.98 +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jDoubleByRef + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jE_Condition.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jE_Condition.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jE_Condition.java 2011-02-09 11:02:10.000000000 +0100 +@@ -42,7 +42,7 @@ + * return value of OFCondition::status() which might be OF_ok, + * OF_error or OF_failure. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jE_Condition + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jIntByRef.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jIntByRef.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jIntByRef.java 2011-02-09 11:02:10.000000000 +0100 +@@ -32,7 +32,7 @@ + /** + * The class jIntbyRef manages the "variable-by-reference". + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jIntByRef + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jRGB.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jRGB.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jRGB.java 2011-02-09 11:02:10.000000000 +0100 +@@ -32,7 +32,7 @@ + /** + * The class jRGB represents a RGB-color value. + * +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jRGB + { +Index: dicomscope-3.6.0/tkgui/J2Ci/jStringByRef.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/J2Ci/jStringByRef.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/J2Ci/jStringByRef.java 2011-02-09 11:02:10.000000000 +0100 +@@ -33,7 +33,7 @@ + * The class jStringByRef manages the "variable-by-reference". + * + * @version 1.0, 28.12.98 +- * @author Andreas Schrter ++ * @author Andreas Schröter + */ + public class jStringByRef + { +Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/CSDocument.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/CSDocument.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/CSDocument.java 2011-02-09 11:02:10.000000000 +0100 +@@ -38,8 +38,8 @@ + * A string of characters with leading or trailing + * spaces (20H) being non-significant. + *

+-* Character Repertoire: Uppercase characters, 0-9, the SPACE +-* character, and underscore _, of the Default Character Repertoire ++* Character Repertoire: Uppercase characters, “0”-”9”, the SPACE ++* character, and underscore “_”, of the Default Character Repertoire + *

+ * Max size: 16 + * +@@ -82,8 +82,8 @@ + /** + * Inserts some content into the document. + *

+- * The content will be checked. All uppercase characters, 0-9, the SPACE +- * character, and underscore _, of the Default Character Repertoire will be accepted ++ * The content will be checked. All uppercase characters, “0”-”9”, the SPACE ++ * character, and underscore “_”, of the Default Character Repertoire will be accepted + * lowercase characters will be converted into uppercase + *

+ * Inserting content causes a write lock to be held while the actual changes are taking place, +Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DADocument.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/DADocument.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DADocument.java 2011-02-09 11:02:10.000000000 +0100 +@@ -40,7 +40,7 @@ + * contain the month, and dd shall contain the + * day. This conforms to the ANSI HISPP MSDSDate common data type. + *

+-* Example:19930822 would represent August 22,1993. ++* Example:“19930822” would represent August 22,1993. + *

+ * Notes: 1. For reasons of backward + * compatibility with versions of this +Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DSDocument.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/DSDocument.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/DSDocument.java 2011-02-09 11:02:10.000000000 +0100 +@@ -46,7 +46,7 @@ + * Strings may be padded with leading or trailing + * spaces. Embedded spaces are not allowed. + *

+-* 0-9, +, -,E, e, ." of Default Character Repertoire ++* “0”-”9”, “+”, “-”,“E”, “e”, “." of Default Character Repertoire + *

+ * Max size: 16 + * @author Klaus Kleber +Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/ISDocument.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/ISDocument.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/ISDocument.java 2011-02-09 11:02:10.000000000 +0100 +@@ -41,7 +41,7 @@ + * trailing spaces. Embedded spaces are not allowed. + *

+ * The integer, n, represented shall be in the range: +-* -2^31 <= n <= (2^31 - 1). 0-9, +, -" of ++* -2^31 <= n <= (2^31 - 1). “0”-”9”, “+”, “-" of + * Default Character Repertoire can be used + * + * 12 bytes maximum +@@ -63,8 +63,8 @@ + /** + * Inserts some content into the document. + *

+- * The content will be checked. All uppercase characters, 0-9, the SPACE +- * character, and underscore _, of the Default Character Repertoire will be accepted ++ * The content will be checked. All uppercase characters, “0”-”9”, the SPACE ++ * character, and underscore “_”, of the Default Character Repertoire will be accepted + * lowercase characters will be converted into uppercase + *

+ * Inserting content causes a write lock to be held while the actual changes are taking place, +Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/SHDocument.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/SHDocument.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/SHDocument.java 2011-02-09 11:02:10.000000000 +0100 +@@ -35,7 +35,7 @@ + * Contains a document for DICOM Long String (SH) values. + * A character string that may be padded with + * leading and/or trailing spaces. The character +-* code 05CH (the BACKSLASH \ in ISO-IR 6) ++* code 05CH (the BACKSLASH “\” in ISO-IR 6) + * shall not be present, as it is used as the + * delimiter between values for multiple data + * elements. The string shall not have Control +Index: dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/TMDocument.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/de/microtherapy/tools/text/document/dicom/TMDocument.java 2011-02-09 11:02:14.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/de/microtherapy/tools/text/document/dicom/TMDocument.java 2011-02-09 11:02:10.000000000 +0100 +@@ -41,27 +41,27 @@ + * "59"), ss contains seconds (range "00" - + * "59"), and frac contains a fractional part of a + * second as small as 1 millionth of a second +-* (range 000000 - 999999). A 24 hour clock ++* (range “000000” - “999999”). A 24 hour clock + * is assumed. Midnight can be represented by +-* only 0000 since 2400 would violate the hour ++* only “0000“ since “2400“ would violate the hour + * range. The string may be padded with trailing + * spaces. Leading and embedded spaces are + * not allowed. One or more of the components + * mm, ss, or frac may be unspecified as long as + * every component to the right of an unspecified + * component is also unspecified. If frac is +-* unspecified the preceding . may not be ++* unspecified the preceding “.” may not be + * included. Frac shall be held to six decimal + * places or less to ensure its format conforms to + * the ANSI HISPP MSDS Time common data + * type. + * Examples: +-* 1. 070907.0705 represents a time of ++* 1. “070907.0705 ” represents a time of + * 7 hours, 9 minutes and 7.0705 seconds. + *
+-* 2. 1010 represents a time of 10 hours,and 10 minutes. ++* 2. “1010” represents a time of 10 hours,and 10 minutes. + *
+-* 3. 021 is an invalid value. ++* 3. “021 ” is an invalid value. + *

+ * Notes: 1. For reasons of backward + * compatibility with versions of this +Index: dicomscope-3.6.0/tkgui/dicomPrint/PrintPanel.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/dicomPrint/PrintPanel.java 2011-02-09 11:02:13.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/dicomPrint/PrintPanel.java 2011-02-09 11:02:10.000000000 +0100 +@@ -361,7 +361,7 @@ + } + + +- //Hier mu normalerweise Targetfestgelegt werden. ++ //Hier muß normalerweise Targetfestgelegt werden. + if (dvi.getCurrentPrinter() == null ) + { + +Index: dicomscope-3.6.0/tkgui/dicomscope/DICOMscope.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/dicomscope/DICOMscope.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/dicomscope/DICOMscope.java 2011-02-09 11:02:10.000000000 +0100 +@@ -218,7 +218,7 @@ + + Dimension d = getSize(); + +- if (mc.highQualitySystem) // doppelte Gre als Minimum ++ if (mc.highQualitySystem) // doppelte Größe als Minimum + { + if (d.width < 1500) d.width = 1500; + if (d.height < 1500) d.height = 1500; +Index: dicomscope-3.6.0/tkgui/processCommunication/ProcessTable.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/processCommunication/ProcessTable.java 2011-02-09 11:02:15.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/processCommunication/ProcessTable.java 2011-02-09 11:02:10.000000000 +0100 +@@ -67,7 +67,7 @@ + + + // init selection +- setSelectionMode(ListSelectionModel.SINGLE_SELECTION); // immer nur eine Zeile auswhlbar ++ setSelectionMode(ListSelectionModel.SINGLE_SELECTION); // immer nur eine Zeile auswählbar + getSelectionModel().addListSelectionListener(new SelectRowListener(textArea)); + + // init Mouse Listener +@@ -231,7 +231,7 @@ + TableColumnModel tcm = getTableHeader().getColumnModel(); // schon mal das Spaltenmodell holen + int index = tcm.getColumnIndexAtX(e.getX()); // Index der angeklickten Spalte ermitteln + +- if(index >= 0) // wurde tatschlich eine Spalte angeklickt... ++ if(index >= 0) // wurde tatsächlich eine Spalte angeklickt... + { + int modelIndex = convertColumnIndexToModel(index); // ...hole Spaltenindex des Modells + +Index: dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicLayer.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/viewer/presentation/PresentationStateGraphicLayer.java 2011-02-09 11:02:13.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicLayer.java 2011-02-09 11:02:09.000000000 +0100 +@@ -456,7 +456,7 @@ + PresentationStateLayerObject delLayerObject = ((PresentationStateLayerObject)listPresentationStateObject.elementAt(deleteIndex)); + System.out.println("deleteIndex: " + deleteIndex); + System.out.println("delLayerObject.getIndex(): " + delLayerObject.getIndex()); +- System.out.println(" lschendes Object: " + delLayerObject.getInfo()); ++ System.out.println(" löschendes Object: " + delLayerObject.getInfo()); + //Delete C++ + delLayerObject.deleteAll(); + +Index: dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicsHandler.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/viewer/presentation/PresentationStateGraphicsHandler.java 2011-02-09 11:02:13.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateGraphicsHandler.java 2011-02-09 11:02:09.000000000 +0100 +@@ -1371,7 +1371,7 @@ + */ + public void updatePresentationState() { + deleteAll(); +- boolean temp = enablePresentationState; // enable... wird in build..() berschrieben ++ boolean temp = enablePresentationState; // enable... wird in build..() überschrieben + buildPresentationState(); + enablePresentationState = temp; + setScreenSize(screenSize); +Index: dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateTextObject.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/viewer/presentation/PresentationStateTextObject.java 2011-02-09 11:02:13.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/viewer/presentation/PresentationStateTextObject.java 2011-02-09 11:02:09.000000000 +0100 +@@ -71,7 +71,7 @@ + int needRot = -1; + int rot = 0; + int just = 0; +- //Gibt die Ge der Grten Zeile an ++ //Gibt die Göße der Größten Zeile an + private float maxLength; + + //Transformationen der BoundingBox +@@ -80,10 +80,10 @@ + //Transformationen des Textes + AffineTransform affText= new AffineTransform(); + +- //Enthlt die einzelen Zeilen ++ //Enthält die einzelen Zeilen + TextLayout[] layoutSegment; + +- //Enthalt die Offsets fr jedes Zeile ++ //Enthalt die Offsets für jedes Zeile + Point2D.Float[] offsets; + + /** +Index: dicomscope-3.6.0/tkgui/viewer/sr/VerificationDialog.java +=================================================================== +--- dicomscope-3.6.0.orig/tkgui/viewer/sr/VerificationDialog.java 2011-02-09 11:02:13.000000000 +0100 ++++ dicomscope-3.6.0/tkgui/viewer/sr/VerificationDialog.java 2011-02-09 11:02:09.000000000 +0100 +@@ -151,7 +151,7 @@ + + + //init model +- tableData = new TableData( getUserData(),columnIdentifiers); // Konstruktion der zuflligen Tabellendaten ++ tableData = new TableData( getUserData(),columnIdentifiers); // Konstruktion der zufälligen Tabellendaten + + // init table + table = new JTable(tableData); // Konstruktion der sichtbaren Tabelle +@@ -176,7 +176,7 @@ + + + // init selection +- table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); // immer nur eine Zeile auswhlbar ++ table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); // immer nur eine Zeile auswählbar + table.addMouseListener(new VerifyMouseAdapter()); + + // init Mouse Listener +@@ -505,7 +505,7 @@ + TableColumnModel tcm = table.getTableHeader().getColumnModel(); // schon mal das Spaltenmodell holen + int index = tcm.getColumnIndexAtX(e.getX()); // Index der angeklickten Spalte ermitteln + +- if(index >= 0) // wurde tatschlich eine Spalte angeklickt... ++ if(index >= 0) // wurde tatsächlich eine Spalte angeklickt... + { + int modelIndex = table.convertColumnIndexToModel(index); // ...hole Spaltenindex des Modells +