orthanc: OrthancServer/FromDcmtkBridge.cpp annotate

annotate OrthancServer/FromDcmtkBridge.cpp @ 671:7131193b0e4b

fix mainline version

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 08 Nov 2013 16:28:58 +0100
parents	d233b5090105
children	aa5ca7a2166f

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
399 4d5f0857ec9c copyright update Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3 * Copyright (C) 2012-2013 Medical Physics Department, CHU of Liege,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Belgium
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	10 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	11 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	12 * program give permission to link the code of its release with the
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	14 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	15 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	16 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	17 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	18 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	19 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	20 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	21 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31
448 9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	32
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	33
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	34 /*=========================================================================
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	35
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	36 This file is based on portions of the following project:
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	37
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	38 Program: GDCM (Grassroots DICOM). A DICOM library
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	39 Module: http://gdcm.sourceforge.net/Copyright.html
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	40
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	41 Copyright (c) 2006-2011 Mathieu Malaterre
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	42 Copyright (c) 1993-2005 CREATIS
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	43 (CREATIS = Centre de Recherche et d'Applications en Traitement de l'Image)
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	44 All rights reserved.
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	45
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	46 Redistribution and use in source and binary forms, with or without
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	47 modification, are permitted provided that the following conditions are met:
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	48
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	49 * Redistributions of source code must retain the above copyright notice,
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	50 this list of conditions and the following disclaimer.
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	51
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	52 * Redistributions in binary form must reproduce the above copyright notice,
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	53 this list of conditions and the following disclaimer in the documentation
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	54 and/or other materials provided with the distribution.
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	55
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	56 * Neither name of Mathieu Malaterre, or CREATIS, nor the names of any
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	57 contributors (CNRS, INSERM, UCB, Universite Lyon I), may be used to
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	58 endorse or promote products derived from this software without specific
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	59 prior written permission.
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	60
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	61 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	62 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	63 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	64 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	65 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	66 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	67 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	68 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	69 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	70 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	71
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	72 =========================================================================*/
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	73
9d830dcc7730 missing copyright information Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	74
71 aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	75 #ifndef NOMINMAX
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	76 #define NOMINMAX
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	77 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 #include "FromDcmtkBridge.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 #include "ToDcmtkBridge.h"
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 106 diff changeset	82 #include "../Core/Toolbox.h"
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	83 #include "../Core/OrthancException.h"
454 6f47a4262618 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 448 diff changeset	84 #include "../Core/FileFormats/PngWriter.h"
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	85 #include "../Core/Uuid.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 #include "../Core/DicomFormat/DicomString.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 #include "../Core/DicomFormat/DicomNullValue.h"
79 297bad4e1019 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	88 #include "../Core/DicomFormat/DicomIntegerPixelAccessor.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	90 #include <list>
71 aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	91 #include <limits>
aa65ced5f0f0 fix for visual studio jodogne parents: 62 diff changeset	92
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 #include <boost/lexical_cast.hpp>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	95 #include <dcmtk/dcmdata/dcchrstr.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96 #include <dcmtk/dcmdata/dcdicent.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97 #include <dcmtk/dcmdata/dcdict.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98 #include <dcmtk/dcmdata/dcfilefo.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99 #include <dcmtk/dcmdata/dcistrmb.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	100 #include <dcmtk/dcmdata/dcuid.h>
661 d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	101 #include <dcmtk/dcmdata/dcmetinf.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	102
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	103 #include <dcmtk/dcmdata/dcvrae.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	104 #include <dcmtk/dcmdata/dcvras.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	105 #include <dcmtk/dcmdata/dcvrcs.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	106 #include <dcmtk/dcmdata/dcvrda.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	107 #include <dcmtk/dcmdata/dcvrds.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	108 #include <dcmtk/dcmdata/dcvrdt.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109 #include <dcmtk/dcmdata/dcvrfd.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110 #include <dcmtk/dcmdata/dcvrfl.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	111 #include <dcmtk/dcmdata/dcvris.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	112 #include <dcmtk/dcmdata/dcvrlo.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	113 #include <dcmtk/dcmdata/dcvrlt.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	114 #include <dcmtk/dcmdata/dcvrpn.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	115 #include <dcmtk/dcmdata/dcvrsh.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116 #include <dcmtk/dcmdata/dcvrsl.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	117 #include <dcmtk/dcmdata/dcvrss.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	118 #include <dcmtk/dcmdata/dcvrst.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	119 #include <dcmtk/dcmdata/dcvrtm.h>
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	120 #include <dcmtk/dcmdata/dcvrui.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 #include <dcmtk/dcmdata/dcvrul.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 #include <dcmtk/dcmdata/dcvrus.h>
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	123 #include <dcmtk/dcmdata/dcvrut.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	124
2 67a6978503b7 fixing Windows build Jodogne@Laptop parents: 0 diff changeset	125 #include <boost/math/special_functions/round.hpp>
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	126 #include <glog/logging.h>
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	127 #include <dcmtk/dcmdata/dcostrmb.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	129 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	131 void ParsedDicomFile::Setup(const char* buffer, size_t size)
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	132 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	133 DcmInputBufferStream is;
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	134 if (size > 0)
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	135 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	136 is.setBuffer(buffer, size);
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	137 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	138 is.setEos();
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	139
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	140 file_.reset(new DcmFileFormat);
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	141 file_->transferInit();
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	142 if (!file_->read(is).good())
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	143 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	144 throw OrthancException(ErrorCode_BadFileFormat);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	145 }
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	146 file_->loadAllDataIntoMemory();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	147 file_->transferEnd();
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	148 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	149
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	150
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	151 static void SendPathValueForDictionary(RestApiOutput& output,
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	152 DcmItem& dicom)
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	153 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	154 Json::Value v = Json::arrayValue;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	155
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	156 for (unsigned long i = 0; i < dicom.card(); i++)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	157 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	158 DcmElement* element = dicom.getElement(i);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	159 if (element)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	160 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	161 char buf[16];
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	162 sprintf(buf, "%04x-%04x", element->getTag().getGTag(), element->getTag().getETag());
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	163 v.append(buf);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	164 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	165 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	166
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	167 output.AnswerJson(v);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	168 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	169
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	170 static inline uint16_t GetCharValue(char c)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	171 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	172 if (c >= '0' && c <= '9')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	173 return c - '0';
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	174 else if (c >= 'a' && c <= 'f')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	175 return c - 'a' + 10;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	176 else if (c >= 'A' && c <= 'F')
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	177 return c - 'A' + 10;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	178 else
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	179 return 0;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	180 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	181
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	182 static inline uint16_t GetTagValue(const char* c)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	183 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	184 return ((GetCharValue(c[0]) << 12) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	185 (GetCharValue(c[1]) << 8) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	186 (GetCharValue(c[2]) << 4) +
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	187 GetCharValue(c[3]));
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	188 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	189
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	190 static void ParseTagAndGroup(DcmTagKey& key,
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	191 const std::string& tag)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	192 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	193 DicomTag t = FromDcmtkBridge::ParseTag(tag);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	194 key = DcmTagKey(t.GetGroup(), t.GetElement());
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	195 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	196
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	197
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	198 static void SendSequence(RestApiOutput& output,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	199 DcmSequenceOfItems& sequence)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	200 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	201 // This element is a sequence
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	202 Json::Value v = Json::arrayValue;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	203
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	204 for (unsigned long i = 0; i < sequence.card(); i++)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	205 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	206 v.append(boost::lexical_cast<std::string>(i));
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	207 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	208
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	209 output.AnswerJson(v);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	210 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	211
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	212 static void AnswerDicomField(RestApiOutput& output,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	213 DcmElement& element)
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	214 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	215 // This element is not a sequence
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	216 std::string buffer;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	217 buffer.resize(65536);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	218 Uint32 length = element.getLength();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	219 Uint32 offset = 0;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	220
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	221 output.GetLowLevelOutput().SendOkHeader("application/octet-stream", true, length, NULL);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	222
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	223 while (offset < length)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	224 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	225 Uint32 nbytes;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	226 if (length - offset < buffer.size())
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	227 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	228 nbytes = length - offset;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	229 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	230 else
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	231 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	232 nbytes = buffer.size();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	233 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	234
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	235 if (element.getPartialValue(&buffer[0], offset, nbytes).good())
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	236 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	237 output.GetLowLevelOutput().Send(&buffer[0], nbytes);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	238 offset += nbytes;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	239 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	240 else
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	241 {
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	242 LOG(ERROR) << "Error while sending a DICOM field";
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	243 return;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	244 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	245 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	246
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	247 output.MarkLowLevelOutputDone();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	248 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	249
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	250 static void SendPathValueForLeaf(RestApiOutput& output,
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	251 const std::string& tag,
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	252 DcmItem& dicom)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	253 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	254 DcmTagKey k;
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	255 ParseTagAndGroup(k, tag);
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	256
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	257 DcmSequenceOfItems* sequence = NULL;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	258 if (dicom.findAndGetSequence(k, sequence).good() &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	259 sequence != NULL &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	260 sequence->getVR() == EVR_SQ)
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	261 {
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	262 SendSequence(output, *sequence);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	263 return;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	264 }
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	265
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	266 DcmElement* element = NULL;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	267 if (dicom.findAndGetElement(k, element).good() &&
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	268 element != NULL &&
318 b83d85a85d69 fix for private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	269 //element->getVR() != EVR_UNKNOWN && // This would forbid private tags
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	270 element->getVR() != EVR_SQ)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	271 {
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	272 AnswerDicomField(output, *element);
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	273 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	274 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	275
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	276 void ParsedDicomFile::SendPathValue(RestApiOutput& output,
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	277 const UriComponents& uri)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	278 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	279 DcmItem* dicom = file_->getDataset();
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	280
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	281 // Go down in the tag hierarchy according to the URI
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	282 for (size_t pos = 0; pos < uri.size() / 2; pos++)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	283 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	284 size_t index;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	285 try
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	286 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	287 index = boost::lexical_cast<size_t>(uri[2 * pos + 1]);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	288 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	289 catch (boost::bad_lexical_cast&)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	290 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	291 return;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	292 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	293
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	294 DcmTagKey k;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	295 DcmItem *child = NULL;
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	296 ParseTagAndGroup(k, uri[2 * pos]);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	297 if (!dicom->findAndGetSequenceItem(k, child, index).good() \|\|
285 4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	298 child == NULL)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	299 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	300 return;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	301 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	302
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	303 dicom = child;
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	304 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	305
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	306 // We have reached the end of the URI
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	307 if (uri.size() % 2 == 0)
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	308 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	309 SendPathValueForDictionary(output, *dicom);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	310 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	311 else
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	312 {
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	313 SendPathValueForLeaf(output, uri.back(), *dicom);
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	314 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	315 }
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	316
4031f73fe0e4 access to the raw dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 176 diff changeset	317
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	318
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	319
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	320
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	321 static DcmElement* CreateElementForTag(const DicomTag& tag)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	322 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	323 DcmTag key(tag.GetGroup(), tag.GetElement());
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	324
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	325 switch (key.getEVR())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	326 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	327 // http://support.dcmtk.org/docs/dcvr_8h-source.html
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	328
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	329 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	330 * TODO.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	331 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	332
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	333 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	334 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	335 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	336 case EVR_AT: // attribute tag
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	337 throw OrthancException(ErrorCode_NotImplemented);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	338
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	339 case EVR_UN: // unknown value representation
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	340 throw OrthancException(ErrorCode_ParameterOutOfRange);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	341
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	342
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	343 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	344 * String types.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	345 * http://support.dcmtk.org/docs/classDcmByteString.html
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	346 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	347
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	348 case EVR_AS: // age string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	349 return new DcmAgeString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	350
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	351 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	352 return new DcmApplicationEntity(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	353
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	354 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	355 return new DcmCodeString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	356
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	357 case EVR_DA: // date string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	358 return new DcmDate(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	359
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	360 case EVR_DT: // date time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	361 return new DcmDateTime(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	362
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	363 case EVR_DS: // decimal string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	364 return new DcmDecimalString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	365
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	366 case EVR_IS: // integer string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	367 return new DcmIntegerString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	368
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	369 case EVR_TM: // time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	370 return new DcmTime(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	371
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	372 case EVR_UI: // unique identifier
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	373 return new DcmUniqueIdentifier(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	374
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	375 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	376 return new DcmShortText(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	377
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	378 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	379 return new DcmLongString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	380
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	381 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	382 return new DcmLongText(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	383
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	384 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	385 return new DcmUnlimitedText(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	386
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	387 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	388 return new DcmShortString(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	389
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	390 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	391 return new DcmPersonName(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	392
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	393
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	394 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	395 * Numerical types
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	396 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	397
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	398 case EVR_SL: // signed long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	399 return new DcmSignedLong(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	400
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	401 case EVR_SS: // signed short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	402 return new DcmSignedShort(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	403
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	404 case EVR_UL: // unsigned long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	405 return new DcmUnsignedLong(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	406
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	407 case EVR_US: // unsigned short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	408 return new DcmUnsignedShort(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	409
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	410 case EVR_FL: // float single-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	411 return new DcmFloatingPointSingle(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	412
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	413 case EVR_FD: // float double-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	414 return new DcmFloatingPointDouble(key);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	415
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	416
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	417 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	418 * Sequence types, should never occur at this point.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	419 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	420
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	421 case EVR_SQ: // sequence of items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	422 throw OrthancException(ErrorCode_ParameterOutOfRange);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	423
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	424
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	425 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	426 * Internal to DCMTK.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	427 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	428
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	429 case EVR_ox: // OB or OW depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	430 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	431 case EVR_lt: // US, SS or OW depending on context, used for LUT Data (thus the name)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	432 case EVR_na: // na="not applicable", for data which has no VR
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	433 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	434 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	435 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	436 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	437 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	438 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	439 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	440 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	441 case EVR_pixelItem: // used internally for pixel items in a compressed image
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	442 case EVR_UNKNOWN: // used internally for elements with unknown VR (encoded with 4-byte length field in explicit VR)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	443 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	444 case EVR_OverlayData: // used internally for overlay data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	445 case EVR_UNKNOWN2B: // used internally for elements with unknown VR with 2-byte length field in explicit VR
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	446 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	447 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	448 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	449
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	450 throw OrthancException(ErrorCode_InternalError);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	451 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	452
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	453
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	454
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	455 static void FillElementWithString(DcmElement& element,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	456 const DicomTag& tag,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	457 const std::string& value)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	458 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	459 DcmTag key(tag.GetGroup(), tag.GetElement());
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	460 bool ok = false;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	461
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	462 try
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	463 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	464 switch (key.getEVR())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	465 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	466 // http://support.dcmtk.org/docs/dcvr_8h-source.html
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	467
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	468 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	469 * TODO.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	470 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	471
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	472 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	473 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	474 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	475 case EVR_AT: // attribute tag
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	476 throw OrthancException(ErrorCode_NotImplemented);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	477
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	478 case EVR_UN: // unknown value representation
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	479 throw OrthancException(ErrorCode_ParameterOutOfRange);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	480
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	481
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	482 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	483 * String types.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	484 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	485
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	486 case EVR_DS: // decimal string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	487 case EVR_IS: // integer string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	488 case EVR_AS: // age string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	489 case EVR_DA: // date string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	490 case EVR_DT: // date time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	491 case EVR_TM: // time string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	492 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	493 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	494 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	495 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	496 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	497 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	498 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	499 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	500 case EVR_UI: // unique identifier
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	501 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	502 ok = element.putString(value.c_str()).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	503 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	504 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	505
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	506
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	507 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	508 * Numerical types
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	509 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	510
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	511 case EVR_SL: // signed long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	512 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	513 ok = element.putSint32(boost::lexical_cast<Sint32>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	514 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	515 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	516
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	517 case EVR_SS: // signed short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	518 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	519 ok = element.putSint16(boost::lexical_cast<Sint16>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	520 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	521 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	522
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	523 case EVR_UL: // unsigned long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	524 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	525 ok = element.putUint32(boost::lexical_cast<Uint32>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	526 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	527 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	528
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	529 case EVR_US: // unsigned short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	530 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	531 ok = element.putUint16(boost::lexical_cast<Uint16>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	532 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	533 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	534
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	535 case EVR_FL: // float single-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	536 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	537 ok = element.putFloat32(boost::lexical_cast<float>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	538 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	539 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	540
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	541 case EVR_FD: // float double-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	542 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	543 ok = element.putFloat64(boost::lexical_cast<double>(value)).good();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	544 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	545 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	546
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	547
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	548 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	549 * Sequence types, should never occur at this point.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	550 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	551
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	552 case EVR_SQ: // sequence of items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	553 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	554 ok = false;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	555 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	556 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	557
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	558
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	559 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	560 * Internal to DCMTK.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	561 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	562
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	563 case EVR_ox: // OB or OW depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	564 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	565 case EVR_lt: // US, SS or OW depending on context, used for LUT Data (thus the name)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	566 case EVR_na: // na="not applicable", for data which has no VR
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	567 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	568 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	569 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	570 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	571 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	572 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	573 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	574 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	575 case EVR_pixelItem: // used internally for pixel items in a compressed image
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	576 case EVR_UNKNOWN: // used internally for elements with unknown VR (encoded with 4-byte length field in explicit VR)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	577 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	578 case EVR_OverlayData: // used internally for overlay data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	579 case EVR_UNKNOWN2B: // used internally for elements with unknown VR with 2-byte length field in explicit VR
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	580 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	581 break;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	582 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	583 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	584 catch (boost::bad_lexical_cast&)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	585 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	586 ok = false;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	587 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	588
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	589 if (!ok)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	590 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	591 throw OrthancException(ErrorCode_InternalError);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	592 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	593 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	594
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	595
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	596 void ParsedDicomFile::Remove(const DicomTag& tag)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	597 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	598 DcmTagKey key(tag.GetGroup(), tag.GetElement());
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	599 DcmElement* element = file_->getDataset()->remove(key);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	600 if (element != NULL)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	601 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	602 delete element;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	603 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	604 }
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	605
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	606
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	607
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	608 void ParsedDicomFile::RemovePrivateTags()
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	609 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	610 typedef std::list<DcmElement*> Tags;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	611
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	612 Tags privateTags;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	613
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	614 DcmDataset& dataset = *file_->getDataset();
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	615 for (unsigned long i = 0; i < dataset.card(); i++)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	616 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	617 DcmElement* element = dataset.getElement(i);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	618 DcmTag tag(element->getTag());
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	619 if (!strcmp("PrivateCreator", tag.getTagName()) \|\| // TODO - This may change with future versions of DCMTK
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	620 tag.getPrivateCreator() != NULL)
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	621 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	622 privateTags.push_back(element);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	623 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	624 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	625
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	626 for (Tags::iterator it = privateTags.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	627 it != privateTags.end(); ++it)
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	628 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	629 DcmElement* tmp = dataset.remove(*it);
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	630 if (tmp != NULL)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	631 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	632 delete tmp;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	633 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	634 }
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	635 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	636
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	637
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	638
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	639 void ParsedDicomFile::Insert(const DicomTag& tag,
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	640 const std::string& value)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	641 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	642 std::auto_ptr<DcmElement> element(CreateElementForTag(tag));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	643 FillElementWithString(*element, tag, value);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	644
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	645 if (!file_->getDataset()->insert(element.release(), false, false).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	646 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	647 // This field already exists
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	648 throw OrthancException(ErrorCode_InternalError);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	649 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	650 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	651
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	652
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	653 void ParsedDicomFile::Replace(const DicomTag& tag,
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	654 const std::string& value,
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	655 DicomReplaceMode mode)
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	656 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	657 DcmTagKey key(tag.GetGroup(), tag.GetElement());
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	658 DcmElement* element = NULL;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	659
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	660 if (!file_->getDataset()->findAndGetElement(key, element).good() \|\|
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	661 element == NULL)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	662 {
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	663 // This field does not exist, act wrt. the specified "mode"
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	664 switch (mode)
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	665 {
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	666 case DicomReplaceMode_InsertIfAbsent:
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	667 Insert(tag, value);
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	668 break;
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	669
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	670 case DicomReplaceMode_ThrowIfAbsent:
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	671 throw OrthancException(ErrorCode_InexistentItem);
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	672
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	673 case DicomReplaceMode_IgnoreIfAbsent:
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	674 return;
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	675 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	676 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	677 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	678 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	679 FillElementWithString(*element, tag, value);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	680 }
303 c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	681
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	682
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	683 /**
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	684 * dcmodify will automatically correct 'Media Storage SOP Class
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	685 * UID' and 'Media Storage SOP Instance UID' in the metaheader, if
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	686 * you make changes to the related tags in the dataset ('SOP Class
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	687 * UID' and 'SOP Instance UID') via insert or modify mode
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	688 * options. You can disable this behaviour by using the -nmu
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	689 * option.
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	690 **/
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	691 if (tag == DICOM_TAG_SOP_CLASS_UID)
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	692 Replace(DICOM_TAG_MEDIA_STORAGE_SOP_CLASS_UID, value, DicomReplaceMode_InsertIfAbsent);
303 c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	693
c76a35a85c69 ready for anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	694 if (tag == DICOM_TAG_SOP_INSTANCE_UID)
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	695 Replace(DICOM_TAG_MEDIA_STORAGE_SOP_INSTANCE_UID, value, DicomReplaceMode_InsertIfAbsent);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	696 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	697
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	698
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	699 void ParsedDicomFile::Answer(RestApiOutput& output)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	700 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	701 std::string serialized;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	702 if (FromDcmtkBridge::SaveToMemoryBuffer(serialized, file_->getDataset()))
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	703 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	704 output.AnswerBuffer(serialized, "application/octet-stream");
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	705 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	706 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	707
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	708
308 fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	709
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	710 bool ParsedDicomFile::GetTagValue(std::string& value,
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	711 const DicomTag& tag)
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	712 {
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	713 DcmTagKey k(tag.GetGroup(), tag.GetElement());
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	714 DcmDataset& dataset = *file_->getDataset();
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	715 DcmElement* element = NULL;
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	716 if (!dataset.findAndGetElement(k, element).good() \|\|
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	717 element == NULL)
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	718 {
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	719 return false;
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	720 }
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	721
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	722 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement(*element));
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	723
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	724 if (v.get() == NULL)
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	725 {
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	726 value = "";
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	727 }
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	728 else
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	729 {
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	730 value = v->AsString();
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	731 }
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	732
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	733 return true;
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	734 }
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	735
fbf2b2282086 inplace modification of series and studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	736
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	737
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	738 DicomInstanceHasher ParsedDicomFile::GetHasher()
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	739 {
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	740 std::string patientId, studyUid, seriesUid, instanceUid;
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	741
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	742 if (!GetTagValue(patientId, DICOM_TAG_PATIENT_ID) \|\|
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	743 !GetTagValue(studyUid, DICOM_TAG_STUDY_INSTANCE_UID) \|\|
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	744 !GetTagValue(seriesUid, DICOM_TAG_SERIES_INSTANCE_UID) \|\|
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	745 !GetTagValue(instanceUid, DICOM_TAG_SOP_INSTANCE_UID))
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	746 {
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	747 throw OrthancException(ErrorCode_BadFileFormat);
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	748 }
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	749
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	750 return DicomInstanceHasher(patientId, studyUid, seriesUid, instanceUid);
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	751 }
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	752
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	753
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	754 void FromDcmtkBridge::Convert(DicomMap& target, DcmDataset& dataset)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	755 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	756 target.Clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	757 for (unsigned long i = 0; i < dataset.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	758 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	759 DcmElement* element = dataset.getElement(i);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	760 if (element && element->isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	761 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	762 target.SetValue(element->getTag().getGTag(),
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	763 element->getTag().getETag(),
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	764 ConvertLeafElement(*element));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	765 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	766 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	767 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	768
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	769
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	770 DicomTag FromDcmtkBridge::GetTag(const DcmElement& element)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	771 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	772 return DicomTag(element.getGTag(), element.getETag());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	773 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	774
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	775
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	776 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	777 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	778 if (!element.isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	779 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	780 throw OrthancException("Only applicable to leaf elements");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	781 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	782
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	783 if (element.isaString())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	784 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	785 char *c;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	786 if (element.getString(c).good() &&
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	787 c != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	788 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	789 std::string s(c);
107 3b45473c0a73 replace boost::locale with iconv for debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 106 diff changeset	790 std::string utf8 = Toolbox::ConvertToUtf8(s, "ISO-8859-1"); // TODO Parameter?
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	791 return new DicomString(utf8);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	792 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	793 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	794 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	795 return new DicomNullValue;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	796 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	797 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	798
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	799 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	800 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	801 // http://support.dcmtk.org/docs/dcvr_8h-source.html
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	802 switch (element.getVR())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	803 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	804
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	805 /**
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	806 * TODO.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	807 **/
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	808
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	809 case EVR_OB: // other byte
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	810 case EVR_OF: // other float
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	811 case EVR_OW: // other word
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	812 case EVR_AT: // attribute tag
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	813 case EVR_UN: // unknown value representation
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	814 return new DicomNullValue();
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	815
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	816 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	817 * String types, should never happen at this point because of
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	818 * "element.isaString()".
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	819 **/
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	820
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	821 case EVR_DS: // decimal string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	822 case EVR_IS: // integer string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	823 case EVR_AS: // age string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	824 case EVR_DA: // date string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	825 case EVR_DT: // date time string
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	826 case EVR_TM: // time string
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	827 case EVR_AE: // application entity title
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	828 case EVR_CS: // code string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	829 case EVR_SH: // short string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	830 case EVR_LO: // long string
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	831 case EVR_ST: // short text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	832 case EVR_LT: // long text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	833 case EVR_UT: // unlimited text
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	834 case EVR_PN: // person name
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	835 case EVR_UI: // unique identifier
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	836 return new DicomNullValue();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	837
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	838
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	839 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	840 * Numerical types
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	841 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	842
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	843 case EVR_SL: // signed long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	844 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	845 Sint32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	846 if (dynamic_cast<DcmSignedLong&>(element).getSint32(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	847 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	848 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	849 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	850 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	851
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	852 case EVR_SS: // signed short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	853 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	854 Sint16 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	855 if (dynamic_cast<DcmSignedShort&>(element).getSint16(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	856 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	857 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	858 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	859 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	860
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	861 case EVR_UL: // unsigned long
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	862 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	863 Uint32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	864 if (dynamic_cast<DcmUnsignedLong&>(element).getUint32(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	865 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	866 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	867 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	868 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	869
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	870 case EVR_US: // unsigned short
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	871 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	872 Uint16 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	873 if (dynamic_cast<DcmUnsignedShort&>(element).getUint16(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	874 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	875 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	876 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	877 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	878
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	879 case EVR_FL: // float single-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	880 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	881 Float32 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	882 if (dynamic_cast<DcmFloatingPointSingle&>(element).getFloat32(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	883 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	884 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	885 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	886 }
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	887
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	888 case EVR_FD: // float double-precision
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	889 {
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	890 Float64 f;
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	891 if (dynamic_cast<DcmFloatingPointDouble&>(element).getFloat64(f).good())
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	892 return new DicomString(boost::lexical_cast<std::string>(f));
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	893 else
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	894 return new DicomNullValue();
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	895 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	896
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	897
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	898 /**
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	899 * Sequence types, should never occur at this point because of
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	900 * "element.isLeaf()".
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	901 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	902
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	903 case EVR_SQ: // sequence of items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	904 return new DicomNullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	905
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	906
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	907 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	908 * Internal to DCMTK.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	909 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	910
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	911 case EVR_ox: // OB or OW depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	912 case EVR_xs: // SS or US depending on context
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	913 case EVR_lt: // US, SS or OW depending on context, used for LUT Data (thus the name)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	914 case EVR_na: // na="not applicable", for data which has no VR
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	915 case EVR_up: // up="unsigned pointer", used internally for DICOMDIR suppor
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	916 case EVR_item: // used internally for items
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	917 case EVR_metainfo: // used internally for meta info datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	918 case EVR_dataset: // used internally for datasets
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	919 case EVR_fileFormat: // used internally for DICOM files
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	920 case EVR_dicomDir: // used internally for DICOMDIR objects
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	921 case EVR_dirRecord: // used internally for DICOMDIR records
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	922 case EVR_pixelSQ: // used internally for pixel sequences in a compressed image
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	923 case EVR_pixelItem: // used internally for pixel items in a compressed image
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	924 case EVR_UNKNOWN: // used internally for elements with unknown VR (encoded with 4-byte length field in explicit VR)
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	925 case EVR_PixelData: // used internally for uncompressed pixeld data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	926 case EVR_OverlayData: // used internally for overlay data
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	927 case EVR_UNKNOWN2B: // used internally for elements with unknown VR with 2-byte length field in explicit VR
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	928 return new DicomNullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	929
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	930
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	931 /**
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	932 * Default case.
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	933 **/
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	934
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	935 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	936 return new DicomNullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	937 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	938 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	939 catch (boost::bad_lexical_cast)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	941 return new DicomNullValue;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	942 }
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	943 catch (std::bad_cast)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	944 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	945 return new DicomNullValue;
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	946 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	948
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	949
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	950 static void StoreElement(Json::Value& target,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	951 DcmElement& element,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	952 unsigned int maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	953
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	954 static void StoreItem(Json::Value& target,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	955 DcmItem& item,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	956 unsigned int maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	957 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	958 target = Json::Value(Json::objectValue);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	959
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	960 for (unsigned long i = 0; i < item.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	961 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	962 DcmElement* element = item.getElement(i);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	963 StoreElement(target, *element, maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	964 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	965 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	966
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	967
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	968 static void StoreElement(Json::Value& target,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	969 DcmElement& element,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	970 unsigned int maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	971 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	972 assert(target.type() == Json::objectValue);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	973
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	974 DicomTag tag(FromDcmtkBridge::GetTag(element));
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	975 const std::string formattedTag = tag.Format();
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	976
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	977 #if 0
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	978 const std::string tagName = FromDcmtkBridge::GetName(tag);
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	979 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	980 // This version of the code gives access to the name of the private tags
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	981 DcmTag tagbis(element.getTag());
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	982 const std::string tagName(tagbis.getTagName());
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	983 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	984
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	985 if (element.isLeaf())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	986 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	987 Json::Value value(Json::objectValue);
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	988 value["Name"] = tagName;
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	989
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	990 if (tagbis.getPrivateCreator() != NULL)
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	991 {
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	992 value["PrivateCreator"] = tagbis.getPrivateCreator();
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	993 }
326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	994
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	995 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement(element));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	996 if (v->IsNull())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	997 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	998 value["Type"] = "Null";
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	999 value["Value"] = Json::nullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1000 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1001 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1002 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1003 std::string s = v->AsString();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1004 if (maxStringLength == 0 \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1005 s.size() <= maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1006 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1007 value["Type"] = "String";
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1008 value["Value"] = s;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1009 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1010 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1011 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1012 value["Type"] = "TooLong";
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1013 value["Value"] = Json::nullValue;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1014 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1015 }
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1016
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1017 target[formattedTag] = value;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1018 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1019 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1020 {
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1021 Json::Value children(Json::arrayValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1022
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1023 // "All subclasses of DcmElement except for DcmSequenceOfItems
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1024 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1025 // etc. are not." The following cast is thus OK.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1026 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(element);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1027
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1028 for (unsigned long i = 0; i < sequence.card(); i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1029 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1030 DcmItem* child = sequence.getItem(i);
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1031 Json::Value& v = children.append(Json::objectValue);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1032 StoreItem(v, *child, maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1033 }
35 f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1034
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1035 target[formattedTag]["Name"] = tagName;
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1036 target[formattedTag]["Type"] = "Sequence";
f6d12037f886 full json vs. simplified json Sebastien Jodogne <s.jodogne@gmail.com> parents: 2 diff changeset	1037 target[formattedTag]["Value"] = children;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1038 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1039 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1040
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1041
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1042 void FromDcmtkBridge::ToJson(Json::Value& root,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1043 DcmDataset& dataset,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1044 unsigned int maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1045 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1046 StoreItem(root, dataset, maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1047 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1048
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1049
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1050
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1051 void FromDcmtkBridge::ToJson(Json::Value& target,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1052 const std::string& path,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1053 unsigned int maxStringLength)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1054 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1055 DcmFileFormat dicom;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1056 if (!dicom.loadFile(path.c_str()).good())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1057 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1058 throw OrthancException(ErrorCode_BadFileFormat);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1059 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1060 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1061 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1062 FromDcmtkBridge::ToJson(target, *dicom.getDataset(), maxStringLength);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1063 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1064 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1065
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1066
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1067 static void ExtractPngImageColorPreview(std::string& result,
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1068 DicomIntegerPixelAccessor& accessor)
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1069 {
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1070 assert(accessor.GetChannelCount() == 3);
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1071 PngWriter w;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1072
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1073 std::vector<uint8_t> image(accessor.GetWidth() * accessor.GetHeight() * 3, 0);
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1074 uint8_t* pixel = &image[0];
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1075
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1076 for (unsigned int y = 0; y < accessor.GetHeight(); y++)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1077 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1078 for (unsigned int x = 0; x < accessor.GetWidth(); x++)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1079 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1080 for (unsigned int c = 0; c < 3; c++, pixel++)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1081 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1082 int32_t v = accessor.GetValue(x, y, c);
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1083 if (v < 0)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1084 *pixel = 0;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1085 else if (v > 255)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1086 *pixel = 255;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1087 else
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1088 *pixel = v;
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1089 }
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1090 }
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1091 }
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1092
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1093 w.WriteToMemory(result, accessor.GetWidth(), accessor.GetHeight(),
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1094 accessor.GetWidth() * 3, PixelFormat_RGB24, &image[0]);
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1095 }
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1096
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1097
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1098 static void ExtractPngImageGrayscalePreview(std::string& result,
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1099 DicomIntegerPixelAccessor& accessor)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1100 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1101 assert(accessor.GetChannelCount() == 1);
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1102 PngWriter w;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1103
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1104 int32_t min, max;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1105 accessor.GetExtremeValues(min, max);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1106
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1107 std::vector<uint8_t> image(accessor.GetWidth() * accessor.GetHeight(), 0);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1108 if (min != max)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1109 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1110 uint8_t* pixel = &image[0];
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1111 for (unsigned int y = 0; y < accessor.GetHeight(); y++)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1112 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1113 for (unsigned int x = 0; x < accessor.GetWidth(); x++, pixel++)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1114 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1115 int32_t v = accessor.GetValue(x, y);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1116 *pixel = static_cast<uint8_t>(
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1117 boost::math::lround(static_cast<float>(v - min) /
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1118 static_cast<float>(max - min) * 255.0f));
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1119 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1120 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1121 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1122
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1123 w.WriteToMemory(result, accessor.GetWidth(), accessor.GetHeight(),
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1124 accessor.GetWidth(), PixelFormat_Grayscale8, &image[0]);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1125 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1126
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1127
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1128 template <typename T>
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1129 static void ExtractPngImageTruncate(std::string& result,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1130 DicomIntegerPixelAccessor& accessor,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1131 PixelFormat format)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1132 {
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1133 assert(accessor.GetChannelCount() == 1);
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1134
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1135 PngWriter w;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1136
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1137 std::vector<T> image(accessor.GetWidth() * accessor.GetHeight(), 0);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1138 T* pixel = &image[0];
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1139 for (unsigned int y = 0; y < accessor.GetHeight(); y++)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1140 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1141 for (unsigned int x = 0; x < accessor.GetWidth(); x++, pixel++)
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1142 {
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1143 int32_t v = accessor.GetValue(x, y);
464 5987dd8e0776 fix reading signed values in dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	1144 if (v < static_cast<int32_t>(std::numeric_limits<T>::min()))
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1145 *pixel = std::numeric_limits<T>::min();
464 5987dd8e0776 fix reading signed values in dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 454 diff changeset	1146 else if (v > static_cast<int32_t>(std::numeric_limits<T>::max()))
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1147 *pixel = std::numeric_limits<T>::max();
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1148 else
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1149 *pixel = static_cast<T>(v);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1150 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1151 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1152
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1153 w.WriteToMemory(result, accessor.GetWidth(), accessor.GetHeight(),
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1154 accessor.GetWidth() * sizeof(T), format, &image[0]);
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1155 }
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1156
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1157
319 760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1158 static bool DecodePsmctRle1(std::string& output,
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1159 DcmDataset& dataset)
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1160 {
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1161 static const DicomTag tagContent(0x07a1, 0x100a);
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1162 static const DicomTag tagCompressionType(0x07a1, 0x1011);
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1163
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1164 DcmElement* e;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1165 char* c;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1166
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1167 // Check whether the DICOM instance contains an image encoded with
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1168 // the PMSCT_RLE1 scheme.
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1169 if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(tagCompressionType), e).good() \|\|
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1170 e == NULL \|\|
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1171 !e->isaString() \|\|
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1172 !e->getString(c).good() \|\|
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1173 c == NULL \|\|
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1174 strcmp("PMSCT_RLE1", c))
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1175 {
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1176 return false;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1177 }
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1178
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1179 // OK, this is a custom RLE encoding from Philips. Get the pixel
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1180 // data from the appropriate private DICOM tag.
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1181 Uint8* pixData = NULL;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1182 if (!dataset.findAndGetElement(ToDcmtkBridge::Convert(tagContent), e).good() \|\|
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1183 e == NULL \|\|
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1184 e->getUint8Array(pixData) != EC_Normal)
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1185 {
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1186 return false;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1187 }
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1188
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1189 // The "unsigned" below IS VERY IMPORTANT
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1190 const uint8_t* inbuffer = reinterpret_cast<const uint8_t*>(pixData);
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1191 const size_t length = e->getLength();
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1192
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1193 /**
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1194 * The code below is an adaptation of a sample code for GDCM by
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1195 * Mathieu Malaterre (under a BSD license).
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1196 * http://gdcm.sourceforge.net/html/rle2img_8cxx-example.html
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1197 **/
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1198
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1199 // RLE pass
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1200 std::vector<uint8_t> temp;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1201 temp.reserve(length);
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1202 for (size_t i = 0; i < length; i++)
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1203 {
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1204 if (inbuffer[i] == 0xa5)
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1205 {
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1206 temp.push_back(inbuffer[i+2]);
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1207 for (uint8_t repeat = inbuffer[i + 1]; repeat != 0; repeat--)
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1208 {
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1209 temp.push_back(inbuffer[i+2]);
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1210 }
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1211 i += 2;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1212 }
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1213 else
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1214 {
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1215 temp.push_back(inbuffer[i]);
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1216 }
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1217 }
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1218
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1219 // Delta encoding pass
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1220 uint16_t delta = 0;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1221 output.clear();
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1222 output.reserve(temp.size());
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1223 for (size_t i = 0; i < temp.size(); i++)
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1224 {
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1225 uint16_t value;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1226
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1227 if (temp[i] == 0x5a)
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1228 {
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1229 uint16_t v1 = temp[i + 1];
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1230 uint16_t v2 = temp[i + 2];
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1231 value = (v2 << 8) + v1;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1232 i += 2;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1233 }
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1234 else
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1235 {
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1236 value = delta + (int8_t) temp[i];
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1237 }
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1238
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1239 output.push_back(value & 0xff);
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1240 output.push_back(value >> 8);
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1241 delta = value;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1242 }
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1243
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1244 if (output.size() % 2)
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1245 {
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1246 output.resize(output.size() - 1);
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1247 }
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1248
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1249 return true;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1250 }
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1251
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1252
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1253 void FromDcmtkBridge::ExtractPngImage(std::string& result,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1254 DcmDataset& dataset,
53 293038baf8f1 access to multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	1255 unsigned int frame,
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1256 ImageExtractionMode mode)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1257 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1258 // See also: http://support.dcmtk.org/wiki/dcmtk/howto/accessing-compressed-data
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1259
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1260 std::auto_ptr<DicomIntegerPixelAccessor> accessor;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1261
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1262 DicomMap m;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1263 FromDcmtkBridge::Convert(m, dataset);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1264
319 760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1265 std::string privateContent;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1266
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1267 DcmElement* e;
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	1268 if (dataset.findAndGetElement(ToDcmtkBridge::Convert(DICOM_TAG_PIXEL_DATA), e).good() &&
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1269 e != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1270 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1271 Uint8* pixData = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1272 if (e->getUint8Array(pixData) == EC_Normal)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1273 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1274 accessor.reset(new DicomIntegerPixelAccessor(m, pixData, e->getLength()));
53 293038baf8f1 access to multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	1275 accessor->SetCurrentFrame(frame);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1276 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1277 }
319 760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1278 else if (DecodePsmctRle1(privateContent, dataset))
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1279 {
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1280 LOG(INFO) << "The PMSCT_RLE1 decoding has succeeded";
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1281 Uint8* pixData = NULL;
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1282 if (privateContent.size() > 0)
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1283 pixData = reinterpret_cast<Uint8*>(&privateContent[0]);
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1284 accessor.reset(new DicomIntegerPixelAccessor(m, pixData, privateContent.size()));
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1285 accessor->SetCurrentFrame(frame);
760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1286 }
419 ab070786f478 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1287
ab070786f478 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1288 if (accessor.get() == NULL)
ab070786f478 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1289 {
ab070786f478 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1290 throw OrthancException(ErrorCode_BadFileFormat);
ab070786f478 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1291 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1292
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1293 PixelFormat format;
369 4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1294 bool supported = false;
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1295
369 4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1296 if (accessor->GetChannelCount() == 1)
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1297 {
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1298 switch (mode)
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1299 {
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1300 case ImageExtractionMode_Preview:
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1301 supported = true;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1302 format = PixelFormat_Grayscale8;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1303 break;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1304
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1305 case ImageExtractionMode_UInt8:
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1306 supported = true;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1307 format = PixelFormat_Grayscale8;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1308 break;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1309
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1310 case ImageExtractionMode_UInt16:
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1311 supported = true;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1312 format = PixelFormat_Grayscale16;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1313 break;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1314
465 7a966b440f19 signed images to PNG Sebastien Jodogne <s.jodogne@gmail.com> parents: 464 diff changeset	1315 case ImageExtractionMode_Int16:
7a966b440f19 signed images to PNG Sebastien Jodogne <s.jodogne@gmail.com> parents: 464 diff changeset	1316 supported = true;
7a966b440f19 signed images to PNG Sebastien Jodogne <s.jodogne@gmail.com> parents: 464 diff changeset	1317 format = PixelFormat_SignedGrayscale16;
7a966b440f19 signed images to PNG Sebastien Jodogne <s.jodogne@gmail.com> parents: 464 diff changeset	1318 break;
7a966b440f19 signed images to PNG Sebastien Jodogne <s.jodogne@gmail.com> parents: 464 diff changeset	1319
369 4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1320 default:
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1321 supported = false;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1322 break;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1323 }
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1324 }
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1325 else if (accessor->GetChannelCount() == 3)
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1326 {
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1327 switch (mode)
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1328 {
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1329 case ImageExtractionMode_Preview:
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1330 supported = true;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1331 format = PixelFormat_RGB24;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1332 break;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1333
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1334 default:
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1335 supported = false;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1336 break;
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1337 }
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1338 }
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1339
4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1340 if (!supported)
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1341 {
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1342 throw OrthancException(ErrorCode_NotImplemented);
369 4632a044746e simplification of the code Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1343 }
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1344
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1345 if (accessor.get() == NULL \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1346 accessor->GetWidth() == 0 \|\|
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1347 accessor->GetHeight() == 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1348 {
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1349 PngWriter w;
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1350 w.WriteToMemory(result, 0, 0, 0, format, NULL);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1351 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1352 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1353 {
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1354 switch (mode)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1355 {
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1356 case ImageExtractionMode_Preview:
368 80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1357 if (format == PixelFormat_Grayscale8)
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1358 ExtractPngImageGrayscalePreview(result, *accessor);
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1359 else
80011cd589e6 support of rgb images Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1360 ExtractPngImageColorPreview(result, *accessor);
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1361 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1362
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1363 case ImageExtractionMode_UInt8:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1364 ExtractPngImageTruncate<uint8_t>(result, *accessor, format);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1365 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1366
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1367 case ImageExtractionMode_UInt16:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1368 ExtractPngImageTruncate<uint16_t>(result, *accessor, format);
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1369 break;
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1370
465 7a966b440f19 signed images to PNG Sebastien Jodogne <s.jodogne@gmail.com> parents: 464 diff changeset	1371 case ImageExtractionMode_Int16:
7a966b440f19 signed images to PNG Sebastien Jodogne <s.jodogne@gmail.com> parents: 464 diff changeset	1372 ExtractPngImageTruncate<int16_t>(result, *accessor, format);
7a966b440f19 signed images to PNG Sebastien Jodogne <s.jodogne@gmail.com> parents: 464 diff changeset	1373 break;
7a966b440f19 signed images to PNG Sebastien Jodogne <s.jodogne@gmail.com> parents: 464 diff changeset	1374
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1375 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1376 throw OrthancException(ErrorCode_NotImplemented);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1377 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1378 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1379 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1380
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1381
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1382 void FromDcmtkBridge::ExtractPngImage(std::string& result,
ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1383 const std::string& dicomContent,
53 293038baf8f1 access to multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	1384 unsigned int frame,
42 ea48f38afe5f access to raw images Sebastien Jodogne <s.jodogne@gmail.com> parents: 41 diff changeset	1385 ImageExtractionMode mode)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1386 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1387 DcmInputBufferStream is;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1388 if (dicomContent.size() > 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1389 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1390 is.setBuffer(&dicomContent[0], dicomContent.size());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1391 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1392 is.setEos();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1393
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1394 DcmFileFormat dicom;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1395 if (dicom.read(is).good())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1396 {
53 293038baf8f1 access to multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	1397 ExtractPngImage(result, *dicom.getDataset(), frame, mode);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1398 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1399 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1400 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1401 throw OrthancException(ErrorCode_BadFileFormat);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1402 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1403 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1404
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1405
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1406
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1407 std::string FromDcmtkBridge::GetName(const DicomTag& t)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1408 {
106 332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1409 // Some patches for important tags because of different DICOM
332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1410 // dictionaries between DCMTK versions
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1411 std::string n = t.GetMainTagsName();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1412 if (n.size() != 0)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1413 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1414 return n;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1415 }
106 332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1416 // End of patches
332fec038d52 patch for dcmtk dictionaries jodogne parents: 80 diff changeset	1417
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1418 #if 0
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1419 DcmTagKey tag(t.GetGroup(), t.GetElement());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1420 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1421 const DcmDictEntry* entry = dict.findEntry(tag, NULL);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1422
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1423 std::string s(DcmTag_ERROR_TagName);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1424 if (entry != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1425 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1426 s = std::string(entry->getTagName());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1427 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1428
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1429 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1430 return s;
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1431 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1432 DcmTag tag(t.GetGroup(), t.GetElement());
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1433 const char* name = tag.getTagName();
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1434 if (name == NULL)
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1435 {
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1436 return DcmTag_ERROR_TagName;
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1437 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1438 else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1439 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1440 return std::string(name);
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1441 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1442 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1443 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1444
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1445
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1446 DicomTag FromDcmtkBridge::ParseTag(const char* name)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1447 {
304 4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1448 if (strlen(name) == 9 &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1449 isxdigit(name[0]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1450 isxdigit(name[1]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1451 isxdigit(name[2]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1452 isxdigit(name[3]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1453 name[4] == '-' &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1454 isxdigit(name[5]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1455 isxdigit(name[6]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1456 isxdigit(name[7]) &&
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1457 isxdigit(name[8]))
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1458 {
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1459 uint16_t group = GetTagValue(name);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1460 uint16_t element = GetTagValue(name + 5);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1461 return DicomTag(group, element);
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1462 }
4eea080e6e7a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1463
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1464 #if 0
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1465 const DcmDataDictionary& dict = dcmDataDict.rdlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1466 const DcmDictEntry* entry = dict.findEntry(name);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1467
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1468 if (entry == NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1469 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1470 dcmDataDict.unlock();
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1471 throw OrthancException("Unknown DICOM tag");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1472 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1473 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1474 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1475 DcmTagKey key = entry->getKey();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1476 DicomTag tag(key.getGroup(), key.getElement());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1477 dcmDataDict.unlock();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1478 return tag;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1479 }
305 86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1480 #else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1481 DcmTag tag;
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1482 if (DcmTag::findTagFromName(name, tag).good())
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1483 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1484 return DicomTag(tag.getGTag(), tag.getETag());
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1485 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1486 else
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1487 {
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1488 throw OrthancException("Unknown DICOM tag");
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1489 }
86bb79522f19 name of the private tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	1490 #endif
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1491 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1492
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1493
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1494 void FromDcmtkBridge::Print(FILE* fp, const DicomMap& m)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1495 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1496 for (DicomMap::Map::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	1497 it = m.map_.begin(); it != m.map_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1498 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1499 DicomTag t = it->first;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1500 std::string s = it->second->AsString();
319 760d0f32cb34 PMSCT_RLE1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1501 fprintf(fp, "0x%04x 0x%04x (%s) [%s]\n", t.GetGroup(), t.GetElement(), GetName(t).c_str(), s.c_str());
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1502 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1503 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1504
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1505
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1506 void FromDcmtkBridge::ToJson(Json::Value& result,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1507 const DicomMap& values)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1508 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1509 if (result.type() != Json::objectValue)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1510 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1511 throw OrthancException(ErrorCode_BadParameterType);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1512 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1513
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1514 result.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1515
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1516 for (DicomMap::Map::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 465 diff changeset	1517 it = values.map_.begin(); it != values.map_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1518 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1519 result[GetName(it->first)] = it->second->AsString();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1520 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1521 }
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1522
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1523
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1524 std::string FromDcmtkBridge::GenerateUniqueIdentifier(DicomRootLevel level)
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1525 {
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1526 char uid[100];
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1527
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1528 switch (level)
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1529 {
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1530 case DicomRootLevel_Patient:
311 26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1531 // The "PatientID" field is of type LO (Long String), 64
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1532 // Bytes Maximum. An UUID is of length 36, thus it can be used
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1533 // as a random PatientID.
26efccdff583 anonymisation Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	1534 return Toolbox::GenerateUuid();
306 326d5a4a5af3 modification of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 305 diff changeset	1535
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1536 case DicomRootLevel_Instance:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1537 return dcmGenerateUniqueIdentifier(uid, SITE_INSTANCE_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1538
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1539 case DicomRootLevel_Series:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1540 return dcmGenerateUniqueIdentifier(uid, SITE_SERIES_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1541
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1542 case DicomRootLevel_Study:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1543 return dcmGenerateUniqueIdentifier(uid, SITE_STUDY_UID_ROOT);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1544
302 238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1545 default:
238134081136 modification of dicom files Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	1546 throw OrthancException(ErrorCode_ParameterOutOfRange);
176 81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1547 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1548 }
81f11fb357f2 uid generation Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1549
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1550 bool FromDcmtkBridge::SaveToMemoryBuffer(std::string& buffer,
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1551 DcmDataset* dataSet)
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1552 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1553 // Determine the transfer syntax which shall be used to write the
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1554 // information to the file. We always switch to the Little Endian
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1555 // syntax, with explicit length.
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1556
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1557 // http://support.dcmtk.org/docs/dcxfer_8h-source.html
661 d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1558
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1559
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1560 /**
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1561 * Note that up to Orthanc 0.7.1 (inclusive), the
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1562 * "EXS_LittleEndianExplicit" was always used to save the DICOM
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1563 * dataset into memory. We now keep the original transfer syntax
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1564 * (if available).
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1565 **/
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1566 E_TransferSyntax xfer = dataSet->getOriginalXfer();
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1567 if (xfer == EXS_Unknown)
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1568 {
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1569 // No information about the original transfer syntax: This is
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1570 // most probably a DICOM dataset that was read from memory.
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1571 xfer = EXS_LittleEndianExplicit;
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1572 }
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1573
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1574 E_EncodingType encodingType = /opt_sequenceType/ EET_ExplicitLength;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1575
661 d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1576 // Create the meta-header information
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1577 DcmFileFormat ff(dataSet);
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1578 ff.validateMetaInfo(xfer);
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1579
661 d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1580 // Create a memory buffer with the proper size
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1581 uint32_t s = ff.calcElementLength(xfer, encodingType);
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1582 buffer.resize(s);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1583 DcmOutputBufferStream ob(&buffer[0], s);
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1584
661 d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1585 // Fill the memory buffer with the meta-header and the dataset
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1586 ff.transferInit();
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1587 OFCondition c = ff.write(ob, xfer, encodingType, NULL,
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1588 /opt_groupLength/ EGL_recalcGL,
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1589 /opt_paddingType/ EPD_withoutPadding);
d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1590 ff.transferEnd();
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1591
661 d233b5090105 accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	1592 // Handle errors
291 4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1593 if (c.good())
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1594 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1595 return true;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1596 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1597 else
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1598 {
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1599 buffer.clear();
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1600 return false;
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1601 }
4d7469f72a0b embedding of dicom dictionaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	1602 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1603 }

Mercurial > hg > orthanc

annotate OrthancServer/FromDcmtkBridge.cpp @ 671:7131193b0e4b