From: rblanc <rblanc33@gmail.com>
Date: Tue, 2 Apr 2013 14:34:41 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~236^2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3abd767ea72e82f5f3de805917014a0ae2a71da9;hp=-c;p=clitk.git

Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
---

3abd767ea72e82f5f3de805917014a0ae2a71da9
diff --combined vv/vvMainWindow.cxx
index 34e66ad,1869763..ca0f542
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@@ -739,7 -739,7 +739,7 @@@ void vvMainWindow::OpenDicom(
  {
    std::vector<std::string> files;
  
-   std::cout << "dicomSeriesSelector " << std::endl;
+   //std::cout << "dicomSeriesSelector " << std::endl;
    if (dicomSeriesSelector->exec() == QDialog::Accepted) {
      files = *(dicomSeriesSelector->GetFilenames());
      LoadImages(files, vvImageReader::DICOM);
@@@ -1134,6 -1134,9 +1134,9 @@@ void vvMainWindow::ImageInfoChanged(
      dim += pixelType + ")";
  
      infoPanel->setFileName(image);
+     std::string creationImageTimeValue("No creation time");
+     itk::ExposeMetaData< std::string > (*imageSelected->GetFirstMetaDataDictionary(), "creationImageTime", creationImageTimeValue);
+     infoPanel->setImageCreationTime(QString(creationImageTimeValue.c_str()));
      infoPanel->setDimension(dim);
      infoPanel->setSizePixel(GetVectorIntAsString(inputSize));
      infoPanel->setSizeMM(GetVectorDoubleAsString(sizeMM));
@@@ -2474,7 -2477,7 +2477,7 @@@ void vvMainWindow::SelectFusionSequence
    bool signalOK = true;
    unsigned nbFrameMain = mSlicerManagers[index]->GetImage()->GetTransform().size();
    unsigned nbFrameSecondary = mSlicerManagers[index]->GetFusionSequenceNbFrames();
 -
 +std::cout<<"nbFrameMain = "<<nbFrameMain<<", nbFrameSecondary= "<<nbFrameSecondary<<", signal size: "<<tmpVect.size()<<std::endl;
    std::vector<unsigned> temporalCorrespondances;
    if ( tmpVect.size() == nbFrameMain + nbFrameSecondary ) {
      for (unsigned i=0 ; i<tmpVect.size() ; i++) {
@@@ -2517,7 -2520,6 +2520,7 @@@ void vvMainWindow::AddFusionSequence(in
      mInputPathName = itksys::SystemTools::GetFilenamePath(file.toStdString()).c_str();
      itk::ImageIOBase::Pointer reader = itk::ImageIOFactory::CreateImageIO(
        file.toStdString().c_str(), itk::ImageIOFactory::ReadMode);
 +    std::sort (fileNames.begin(), fileNames.end());//make sure the files are sorted.
      reader->SetFileName(fileNames[0].c_str());
      reader->ReadImageInformation();
      std::string component = reader->GetComponentTypeAsString(reader->GetComponentType());