X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvQPacsConnection.cxx;h=8f40ae6405b839e39cf5ea5d8c26a99cae94e35f;hb=86d74c7664c5d6d11637ba376b639aa3c6e0e057;hp=6033825c0a01ee407e399cbed9a28108e3afad3d;hpb=4eb6f95e59a7602564b15f9d0715650dc91442a2;p=clitk.git

diff --git a/vv/vvQPacsConnection.cxx b/vv/vvQPacsConnection.cxx
index 6033825..8f40ae6 100644
--- a/vv/vvQPacsConnection.cxx
+++ b/vv/vvQPacsConnection.cxx
@@ -7,7 +7,9 @@
 #include <QDateTime>
 #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,7 +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();
+     //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));
@@ -393,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;
 }