← Back to branch summary

~ubuntu-branches/ubuntu/lucid/igstk/lucid

« back to all changes in this revision

Viewing changes to Source/igstkDICOMImageReader.txx

  • Committer: Bazaar Package Importer
  • Author(s): Dominique Belhachemi
  • Date: 2009-10-07 17:35:43 UTC
  • mfrom: (2.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091007173543-69eyhyjrh0bfoqe5
Tags: 4.2.0-2
http://bugs.debian.org/549799
* Fixed link issue (Closes: #549799)
* switch to quilt

Show diffs side-by-side

added added

removed removed

Lines of Context:
Source/igstkDICOMImageReader.txx
3
3
  Program:   Image Guided Surgery Software Toolkit
4
4
  Module:    $RCSfile: igstkDICOMImageReader.txx,v $
5
5
  Language:  C++
6
 
  Date:      $Date: 2008-02-11 01:41:50 $
7
 
  Version:   $Revision: 1.17 $
 
6
  Date:      $Date: 2009-06-15 19:54:58 $
 
7
  Version:   $Revision: 1.20 $
8
8
 
9
9
  Copyright (c) ISC  Insight Software Consortium.  All rights reserved.
10
10
  See IGSTKCopyright.txt or http://www.igstk.org/copyright.htm for details.
419
419
 
420
420
  // Create the DICOM GDCM file reader
421
421
  m_FileNames = itk::GDCMSeriesFileNames::New();
 
422
  m_FileNames->SetRecursive(false);
 
423
  m_FileNames->SetGlobalWarningDisplay(this->GetGlobalWarningDisplay());
 
424
 
 
425
  // add more criteria to distinguish between different series
 
426
  m_FileNames->SetUseSeriesDetails( true );
 
427
 
 
428
  // add acquisition number
 
429
  m_FileNames->AddSeriesRestriction( "0020|0012" );
 
430
 
422
431
  m_ImageIO = itk::GDCMImageIO::New();
 
432
  m_ImageIO->SetGlobalWarningDisplay(this->GetGlobalWarningDisplay());
423
433
  m_ImageSeriesReader = ImageSeriesReaderType::New();
424
434
  m_ImageSeriesReader->SetImageIO( m_ImageIO );
425
435
 
541
551
  
542
552
  m_FileNames->SetInputDirectory( m_ImageDirectoryName );
543
553
 
544
 
  const std::vector< std:: string > & seriesUID = 
 
554
  const std::vector< std::string > & seriesUID = 
545
555
                                               m_FileNames -> GetSeriesUIDs();
 
556
   
 
557
  std::vector< std::string >::const_iterator iter = seriesUID.begin();
 
558
  
 
559
  for (; iter != seriesUID.end(); iter++)
 
560
    {
 
561
    igstkLogMacro( DEBUG, 
 
562
              "igstk::DICOMImageReader::seriesUID " << (*iter) << "\n");
 
563
    }
 
564
              
546
565
  if ( seriesUID.empty() ) 
547
566
    {
548
567
    this->m_ImageReadingErrorInformation = 
553
572
    return;
554
573
    } 
555
574
 
556
 
  m_ImageSeriesReader->SetFileNames( m_FileNames->GetInputFileNames() );
 
575
  // m_ImageSeriesReader->SetFileNames( m_FileNames->GetInputFileNames() );
 
576
 
 
577
  igstkLogMacro( DEBUG, "igstk::DICOMImageReader will open seriesUID: " 
 
578
                                          << seriesUID.front().c_str() << "\n");
 
579
                            
 
580
  m_ImageSeriesReader->SetFileNames( m_FileNames->GetFileNames( 
 
581
                                                 seriesUID.front().c_str() )  );
 
582
  
557
583
  this->m_StateMachine.PushInput( 
558
584
                   this->m_ImageSeriesFileNamesGeneratingSuccessInput );
559
585
  this->m_StateMachine.ProcessInputs();
825
851
bool
826
852
DICOMImageReader<TPixelType>::CheckModalityType( DICOMInformationType modality )
827
853
{
828
 
  return true;
 
854
  //Default modality type is CT
 
855
  if ( modality != "CT" )
 
856
    {
 
857
    return false;
 
858
    }
 
859
  else 
 
860
    {
 
861
    return true;
 
862
    }
829
863
}
830
864
 
831
865
/** Print Self function */