Allow to retrieve and display multiple series.

[clitk.git] / vv / vvQPacsConnection.cxx

diff --git a/vv/vvQPacsConnection.cxx b/vv/vvQPacsConnection.cxx
index 905c668ad1dc8a76a4964b4a4f90999b6737b8d9..8f40ae6405b839e39cf5ea5d8c26a99cae94e35f 100644 (file)
--- a/vv/vvQPacsConnection.cxx
+++ b/vv/vvQPacsConnection.cxx
@@ -8,6 +8,8 @@
 #include "vvPacsSettingsDialog.h"
 #include "vvUtils.h"
 #include <algorithm>
+#include <itkGDCMImageIO.h>
+#include <itkGDCMSeriesFileNames.h>
 
 
 vvQPacsConnection::vvQPacsConnection(QWidget *i_parent)
@@ -365,7 +367,7 @@ void vvQPacsConnection::chooseServer(int index)
 void vvQPacsConnection::on_importButton_clicked()
        {
                setCursor(QCursor(Qt::WaitCursor));
-               QString path = QDir::homePath() +QString::fromStdString("/.move");
+               QString path = QString::fromStdString(getCMoveDirectory());
                QDir dirpath (path);
                if (dirpath.exists())
                {
@@ -385,8 +387,26 @@ void vvQPacsConnection::on_importButton_clicked()
                        getDicomClientPort(),  getDicomClientAETitle().c_str(), m_aetitle.c_str(), path.toStdString().c_str() );
                gdcm::Directory theDir;
                theDir.Load(path.toStdString().c_str());
-          m_files =    theDir.GetFilenames();
-               std::sort (m_files.begin(), m_files.end()); // make sure names are in lexicographical order
+     //m_files =       theDir.GetFilenames();
+
+     typedef itk::GDCMSeriesFileNames NamesGeneratorType;
+     NamesGeneratorType::Pointer nameGenerator = NamesGeneratorType::New();
+     nameGenerator->SetUseSeriesDetails(true);
+
+     //ds gérer recursive moi-meme pour progress ...
+     nameGenerator->SetInputDirectory(path.toStdString());
+
+     // insert in table
+     typedef std::vector<std::string> SeriesIdContainer;
+     const SeriesIdContainer & seriesUID = nameGenerator->GetSeriesUIDs();
+       std::map<std::string, std::vector<std::string>* > mListOfSeriesFilenames;
+
+
+          m_fileseries.clear();
+          
+     for (unsigned int i=0; i<seriesUID.size(); i++) {
+               m_fileseries.push_back( nameGenerator->GetFileNames(seriesUID[i]));
+        }
           
           accept();
          setCursor(QCursor(Qt::ArrowCursor));
@@ -394,11 +414,11 @@ void vvQPacsConnection::on_importButton_clicked()
 
 
 
-std::vector <std::string> vvQPacsConnection::getFileNames()
+std::vector <std::string> vvQPacsConnection::getFileNames(int i_series)
 {
        std::vector <std::string> filenames;
-       gdcm::Directory::FilenamesType::iterator it = m_files.begin();
-       for (;it != m_files.end(); it++)
+       gdcm::Directory::FilenamesType::iterator it = m_fileseries[i_series].begin();
+       for (;it != m_fileseries[i_series].end(); it++)
                filenames.push_back(it->c_str());
        return filenames;
 }