Mercurial > hg > orthanc

comparison OrthancServer/DicomProtocol/DicomUserConnection.cpp @ 758:67e6400fca03 query-retrieve

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline -> query-retrieve
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 16 Apr 2014 16:34:09 +0200
parents 3bdb5db8e839 b79eda29896d
children c2c28dd17e87
comparison
equal deleted inserted replaced
681:3bdb5db8e839 758:67e6400fca03
1 /** 1 /**
2 * Orthanc - A Lightweight, RESTful DICOM Store 2 * Orthanc - A Lightweight, RESTful DICOM Store
3 * Copyright (C) 2012-2013 Medical Physics Department, CHU of Liege, 3 * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege,
4 * Belgium 4 * Belgium
5 * 5 *
6 * This program is free software: you can redistribute it and/or 6 * This program is free software: you can redistribute it and/or
7 * modify it under the terms of the GNU General Public License as 7 * modify it under the terms of the GNU General Public License as
8 * published by the Free Software Foundation, either version 3 of the 8 * published by the Free Software Foundation, either version 3 of the
333 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0020, 0x000e), ""); 333 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0020, 0x000e), "");
334 334
335 break; 335 break;
336 336
337 case FindRootModel_Instance: 337 case FindRootModel_Instance:
338 if (manufacturer_ == ModalityManufacturer_ClearCanvas) 338 if (manufacturer_ == ModalityManufacturer_ClearCanvas ||
339 manufacturer_ == ModalityManufacturer_Dcm4Chee)
339 { 340 {
340 // This is a particular case for ClearCanvas, thanks to Peter Somlo <peter.somlo@gmail.com>. 341 // This is a particular case for ClearCanvas, thanks to Peter Somlo <peter.somlo@gmail.com>.
341 // https://groups.google.com/d/msg/orthanc-users/j-6C3MAVwiw/iolB9hclom8J 342 // https://groups.google.com/d/msg/orthanc-users/j-6C3MAVwiw/iolB9hclom8J
342 // http://www.clearcanvas.ca/Home/Community/OldForums/tabid/526/aff/11/aft/14670/afv/topic/Default.aspx 343 // http://www.clearcanvas.ca/Home/Community/OldForums/tabid/526/aff/11/aft/14670/afv/topic/Default.aspx
343 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "IMAGE"); 344 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "IMAGE");
417 DicomMap s; 418 DicomMap s;
418 fields.ExtractStudyInformation(s); 419 fields.ExtractStudyInformation(s);
419 420
420 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID); 421 s.CopyTagIfExists(fields, DICOM_TAG_PATIENT_ID);
421 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER); 422 s.CopyTagIfExists(fields, DICOM_TAG_ACCESSION_NUMBER);
423 s.CopyTagIfExists(fields, DICOM_TAG_MODALITIES_IN_STUDY);
422 424
423 Find(result, FindRootModel_Study, s); 425 Find(result, FindRootModel_Study, s);
424 } 426 }
425 427
426 void DicomUserConnection::FindSeries(DicomFindAnswers& result, 428 void DicomUserConnection::FindSeries(DicomFindAnswers& result,