]> Creatis software - clitk.git/blobdiff - vv/vvQPacsConnection.cxx
cleanup
[clitk.git] / vv / vvQPacsConnection.cxx
index 0f3f91657f3c3c7e7056bb8bbebb6d6781acd164..9a65bbd5a4062e8b8dea9167f1a5152dce152784 100644 (file)
 #include <QtGui/qlistview.h>
 #include <qfile.h>
 #include <QDate>
+#include <QIcon>
 #include <QDateTime>
+#include "vvPacsSettingsDialog.h"
+#include "vvUtils.h"
 
 
-       vvQPacsConnection::vvQPacsConnection(QWidget *i_parent)
-               :QWidget(i_parent)
-       {
-                setupUi(this);
-                setWindowTitle(QString::fromUtf8("DCM API PACS"));
-                createTreeView();
-                tabFilter->setTabText(0,QString(tr("Modality")));
-                tabFilter->setTabText(1,QString(tr("Date")));
-
-                tabNetwork->setTabText(0,QString(tr("Network")));
-                tabNetwork->setTabText(1,QString(tr("Configuration")));
-                check_ModAll->setChecked(true);
-                on_check_ModAll_clicked(true);
-                QIcon icon;
-                icon.addFile("basket_download.png",QSize(),QIcon::Normal,QIcon::Off);
-                importButton->setIcon(icon);
-                icon.addFile("file_upload.png",QSize(),QIcon::Normal,QIcon::Off);
-               // exportButton->setIcon(icon);
-                icon.addFile("email_forward.png",QSize(),QIcon::Normal,QIcon::Off);
-                icon.addFile("edit.png",QSize(),QIcon::Normal,QIcon::Off);
-                optionsButton->setIcon(icon);
-                icon.addFile("bullet_info.png",QSize(),QIcon::Normal,QIcon::Off);
-                helpButton->setIcon(icon);
-                update();
-       }
-
 
-       void vvQPacsConnection::on_clearButton_clicked()
-       {
-               Patientmodel->removeRows(0, Patientmodel->rowCount(),QModelIndex());
-               Studymodel->removeRows(0, Studymodel->rowCount(),QModelIndex());
-               Seriesmodel->removeRows(0, Seriesmodel->rowCount(),QModelIndex());
-               Imagesmodel->removeRows(0, Imagesmodel->rowCount(),QModelIndex());
-       }
-
-       void vvQPacsConnection::on_scanButton_clicked()
-       {
-               //on_clearButton_clicked();
-               manageStudiesFilter(true);
-               #if defined (USE_GDCM2)
-           bool didItWork = gdcm::CompositeNetworkFunctions::CEcho( "127.0.0.1", 5678,
-                       "CREATIS", "CONQUESTSRV1" );
-                               /*  tag.SetElement(8);
-                 tag.SetGroup(8);*/
-               std::vector< std::pair<gdcm::Tag, std::string> > keys = getKeys();
-
-               //std::pair<gdcm::Tag, std::string> pa;
-               //pa.first = tag;
-               //pa.second = "";
-               ////keys.push_back(std::make_pair(tag, ""));
-               gdcm::EQueryLevel theLevel = gdcm::eStudy;
-               gdcm::ERootType theRoot  = gdcm::eStudyRootType;//ePatientRootType;
-               //gdcm::SmartPointer<gdcm::BaseRootQuery> theQuery =  gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys);
+vvQPacsConnection::vvQPacsConnection(QWidget *i_parent)
+       :QDialog(i_parent)
+{
+       ui.setupUi(this);
+       setWindowTitle(QString::fromUtf8("PACS CONNECTIONHHHH"));
+       createTreeView();
+       ui.tabFilter->setTabText(0,QString(tr("Modality")));
+       ui.tabFilter->setTabText(1,QString(tr("Date")));
 
+       ui. tabNetwork->setTabText(0,QString(tr("Network")));
+       ui. tabNetwork->setTabText(1,QString(tr("Configuration")));
+       ui.check_ModAll->setEnabled(true);
+       ui.networkCombo->addItem("");
+       ui.networkCombo->addItems(getDicomServers());
        
-                   std::vector<gdcm::DataSet> theDataSet;
-
-                         theLevel = gdcm::ePatient;
-  theRoot  = gdcm::ePatientRootType;//ePatientRootType;
-  gdcm::SmartPointer<gdcm::BaseRootQuery> theQuery =  gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,getPatientKeys(""));
-
-//     
-//theDataSet.clear();
-//  gdcm::CompositeNetworkFunctions::CFind("127.0.0.1", 5678, theQuery, theDataSet,
-//       "CREATIS", "CONQUESTSRV1");
-//   keys.clear();
-//   keys.push_back(std::make_pair(gdcm::Tag(0x0010,0x0010), ""));                     
-//                     
-                       gdcm::CompositeNetworkFunctions::CFind("127.0.0.1", 5678, theQuery, theDataSet,
-       "CREATIS", "CONQUESTSRV1");
-  std::vector<gdcm::DataSet>::iterator it_ds = theDataSet.begin();
-//
-  for(; it_ds != theDataSet.end(); it_ds++)
-  {
-
-         QList<QStandardItem *> items;
-         const gdcm::DataSet ds = (*it_ds);
-         std::vector< std::pair<gdcm::Tag, std::string> >::iterator it_key = keys.begin();
-         int ind = 0;
-         for(; it_key != keys.end(); it_key++, ind++)
-         {
-                 gdcm::DataElement de = ds.GetDataElement((*it_key).first);
-                 QStandardItem *item = new QStandardItem;
-                 const gdcm::ByteValue *bv = (de).GetByteValue();
-                 if( !de.IsEmpty() )
-                 {
-                         std::string buffer = std::string( bv->GetPointer(), bv->GetLength() );
-                         item->setText(tr(buffer.c_str()));
-                 }
-                 else
-                 {
-                         item->setText(tr(""));
-                 }
-                 if(ind ==0)
-                 {
-                       item->setCheckable(true);
-                 }
-                 items.push_back(item);
-         }
-         Patientmodel->appendRow(items);
-        }
-//   gdcm::Tag tagtest(0x0020,0x1208);
-//   keys.clear();
-//   keys.push_back(std::make_pair(gdcm::Tag(0x0010,0x0010), ""));
-////  keys.push_back(std::make_pair(tagtest, ""));
-//  theLevel = gdcm::ePatient;
-//  theRoot  = gdcm::ePatientRootType;//ePatientRootType;
-//  theQuery =  gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys);
-//
-//     
-//theDataSet.clear();
-//  gdcm::CompositeNetworkFunctions::CFind("127.0.0.1", 5678, theQuery, theDataSet,
-//       "CREATIS", "CONQUESTSRV1");
-#endif
-       }
-
-
-       void vvQPacsConnection::on_importButton_clicked()
+       // Connection   
+       connect(ui.networkCombo,SIGNAL(currentIndexChanged(int)),this,SLOT(chooseServer(int)));
+       connect(ui.removeNetworkButton,SIGNAL(clicked()),this,SLOT(removeServer()));
+       connect(ui.NetworkButton,SIGNAL(clicked()),this,SLOT(modifyServer()));
+       
+       update();
+}
+
+// remote a Dicom Server in VV settings
+void vvQPacsConnection::removeServer()
+{
+       removeDicomServer(m_nickname);
+       ui.networkCombo->removeItem(ui.networkCombo->findText(QString(m_nickname.c_str())));
+       m_nickname="";
+       refreshNetworks();
+}
+
+// modify a Dicom Server in VV settings
+void vvQPacsConnection::modifyServer()
+{
+       AddDicomServer(ui.NameEdit->text().toStdString(),ui.AETitleEdit->text().toStdString(),ui.AdressEdit->text().toStdString(),ui.PortEdit->text().toStdString());
+       removeServer();
+}
+
+// refresh the list of Dicom Servers available from VV settings
+void vvQPacsConnection::refreshNetworks()
+{
+       ui.networkCombo->clear();
+       ui.networkCombo->addItem(QString());
+       ui.networkCombo->addItems(getDicomServers());
+       ui.NameEdit->setText(QString());
+       ui.AETitleEdit->setText(QString());
+       ui.AdressEdit->setText(QString());
+       ui.PortEdit->setText(QString());
+       ui.tabNetwork->setCurrentIndex(0);
+}
+
+void vvQPacsConnection::on_clearButton_clicked()
+{
+       Patientmodel->removeRows(0, Patientmodel->rowCount(),QModelIndex());
+       Studymodel->removeRows(0, Studymodel->rowCount(),QModelIndex());
+       Seriesmodel->removeRows(0, Seriesmodel->rowCount(),QModelIndex());
+       Imagesmodel->removeRows(0, Imagesmodel->rowCount(),QModelIndex());
+}
+
+void vvQPacsConnection::on_scanButton_clicked()
+{
+       cleanTree();
+       manageStudiesFilter(true);
+
+       // test first if echo works
+       bool didItWork = gdcm::CompositeNetworkFunctions::CEcho(m_adress.c_str(), atoi(m_port.c_str()), "CREATIS", m_nickname.c_str() );
+       if (didItWork)
        {
-               QModelIndex index;
-               QVariant elt= Patientmodel->data(index.sibling(patientTreeView->selectionModel()->selectedRows().first().row(),1));
-               
+               m_level =gdcm::ePatient;
+               std::vector<gdcm::DataSet> theDataSet;
                gdcm::EQueryLevel theLevel = gdcm::ePatient;
                gdcm::ERootType theRoot  = gdcm::ePatientRootType;//ePatientRootType;
-               std::vector<gdcm::DataSet> theDataSet;
-               std::vector< std::pair<gdcm::Tag, std::string> > keys;
-               
-               // Study Description
-               gdcm::Tag tagsdc(0x0010,0x0020);
-               keys.push_back(std::make_pair(tagsdc, elt.toString().toStdString()));
-                               gdcm::SmartPointer<gdcm::BaseRootQuery> theQuery =  gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys);
-               gdcm::CompositeNetworkFunctions::CFind("127.0.0.1", 5678, theQuery, theDataSet, "CREATIS", "CONQUESTSRV1");
-       
-                bool didItWork =  gdcm::CompositeNetworkFunctions::CMove( "127.0.0.1", 5678, theQuery, 0,
-       "CREATIS", "CONQUESTSRV1", "d:\\temp_pacs_import\\" );
-       }
-
-       void vvQPacsConnection::convertDataSet(std::vector<gdcm::DataSet> i_ds, QStandardItemModel *i_model, std::vector< std::pair<gdcm::Tag, std::string> > keys)
-       {
-               gdcm::Tag tagdb(0x0008,0x0020);
-               std::vector<gdcm::DataSet>::iterator it_ds = i_ds.begin();
-               for(; it_ds != i_ds.end(); it_ds++)
+               m_query =  gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,
+                                                       getPatientKeys(ui.patientName->toPlainText().toStdString(),     ui.patientID->toPlainText().toStdString()));
+               bool cfindWork = gdcm::CompositeNetworkFunctions::CFind(m_adress.c_str(), atoi(m_port.c_str()), m_query, theDataSet,    "CREATIS", m_nickname.c_str());
+               if( cfindWork)
                {
-                       QList<QStandardItem *> items;
-                       const gdcm::DataSet ds = (*it_ds);
-                       std::vector< std::pair<gdcm::Tag, std::string> >::iterator it_key = keys.begin();
-                   int ind = 0;
-                   for(; it_key != keys.end(); it_key++, ind++)
-                   {
-                           gdcm::DataElement de = ds.GetDataElement((*it_key).first);
-                           QStandardItem *item = new QStandardItem;
-                           const gdcm::ByteValue *bv = (de).GetByteValue();
-                           if( !de.IsEmpty() )
-                           {
-                                   std::string buffer = std::string( bv->GetPointer(), bv->GetLength() );
-                                       /*if((*it_key).first == tagdb)
-                                       {
-                                               QDate date;
-                                               date.fromString(tr(buffer.c_str()),"yyyy'MM'd");
-                                               item->setText(date.toString());
-                                       }
-                                       else
-                                       {*/
-                                               item->setText(tr(buffer.c_str()));
-                                       //}
-                           }
-                           else
-                           {
-                                   item->setText(tr(""));
-                           }
-                           if(ind ==0)
-                           {
-                                  item->setCheckable(true);
-                           }
-                           items.push_back(item);
-                   }
-                       i_model->appendRow(items);
-               }
-               
-       }
+                       convertDataSet(theDataSet,Patientmodel,getPatientKeys("",""));
+               } // end cfindwork
+       } // end didItwork
+}
 
 
-       void vvQPacsConnection::createTreeView()
-       {
-               // Patient Tree View
-               Patientmodel = new QStandardItemModel(0,2,this); 
-               QStringList Patientlist;
-               Patientlist.push_back(tr("PATIENT NAME"));
-               Patientlist.push_back(tr("PATIENT ID"));
-               Patientmodel->setHorizontalHeaderLabels(Patientlist);
-               patientTreeView->setModel(Patientmodel);
-               patientTreeView->setEnabled(true);
-               connect(patientTreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(selectStudies(QModelIndex)));
-               
-               // Study Tree View
-               Studymodel = new QStandardItemModel(0,3,this); 
-               QStringList Studylist;
-               Studylist.push_back(tr("DESCRIPTION"));
-               Studylist.push_back(tr("DATE"));
-               Studylist.push_back(tr("HOUR"));
-               Studymodel->setHorizontalHeaderLabels(Studylist);
-               studyTreeView->setModel(Studymodel);
-               connect(studyTreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(selectSeries(QModelIndex)));
-
-
-               // Series Tree View
-               Seriesmodel = new QStandardItemModel(0,2,this); 
-               QStringList Serieslist;
-               Serieslist.push_back(tr("MODALITY"));
-               Serieslist.push_back(tr("DESCRIPTION"));
-               Serieslist.push_back(tr("no. accept."));
-               Seriesmodel->setHorizontalHeaderLabels(Serieslist);
-               seriesTreeView->setModel(Seriesmodel);
-               connect(seriesTreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(selectImages(QModelIndex)));
-
-               // Images Tree View
-               Imagesmodel = new QStandardItemModel(0,1,this); 
-               QStringList Imageslist;
-               Imageslist.push_back(tr("instance number"));
-               Imagesmodel->setHorizontalHeaderLabels(Imageslist);
-               imagesTreeView->setModel(Imagesmodel);
-
-               //model->setHeaderData(0, Qt::Horizontal,tr("test"),Qt::DisplayRole);
-               /*QFileSystemModel *filemodel = new   QFileSystemModel;
-               filemodel->insertColumn(1);
-               filemodel->setHeaderData(1, Qt::Horizontal,"test",0);*/
 
-       }
+void vvQPacsConnection::on_optionsButton_clicked()
+{
+       vvPacsSettingsDialog *dg  = new vvPacsSettingsDialog(this);
+       dg->show();
+}
 
-       void vvQPacsConnection::selectStudies(const QModelIndex &index)
+void vvQPacsConnection::convertDataSet(std::vector<gdcm::DataSet> i_ds, QStandardItemModel *i_model, std::vector< std::pair<gdcm::Tag, std::string> > keys)
+{
+       std::vector<gdcm::DataSet>::iterator it_ds = i_ds.begin();
+       for(; it_ds != i_ds.end(); it_ds++)
+       {
+               QList<QStandardItem *> items;
+               const gdcm::DataSet ds = (*it_ds);
+               std::vector< std::pair<gdcm::Tag, std::string> >::iterator it_key = keys.begin();
+               int ind = 0;
+               for(; it_key != keys.end(); it_key++, ind++)
+               {
+                       gdcm::DataElement de = ds.GetDataElement((*it_key).first);
+                       QStandardItem *item = new QStandardItem;
+                       const gdcm::ByteValue *bv = (de).GetByteValue();
+                       if( !de.IsEmpty() )
+                       {
+                               std::string buffer = std::string( bv->GetPointer(), bv->GetLength() );
+                               item->setText(tr(buffer.c_str()));
+                       }
+                       else
+                       {
+                               item->setText(tr(""));
+                       }
+                       if(ind ==0)
+                       {
+                               item->setCheckable(true);
+                       }
+                       items.push_back(item);
+               }
+               i_model->appendRow(items);
+       }
+}
+
+// TreeViews creation
+void vvQPacsConnection::createTreeView()
+{
+       // Patient Tree View
+       Patientmodel = new QStandardItemModel(0,2,this); 
+       QStringList Patientlist;
+       Patientlist.push_back(tr("PATIENT NAME"));
+       Patientlist.push_back(tr("PATIENT ID"));
+       Patientmodel->setHorizontalHeaderLabels(Patientlist);
+       ui.patientTreeView->setModel(Patientmodel);
+       ui.patientTreeView->setEnabled(true);
+       connect(ui.patientTreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(selectStudies(QModelIndex)));
+
+       // Study Tree View
+       Studymodel = new QStandardItemModel(0,3,this); 
+       QStringList Studylist;
+       Studylist.push_back(tr("DESCRIPTION"));
+       Studylist.push_back(tr("DATE"));
+       Studylist.push_back(tr("HOUR"));
+       Studymodel->setHorizontalHeaderLabels(Studylist);
+       ui.studyTreeView->setModel(Studymodel);
+       connect(ui.studyTreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(selectSeries(QModelIndex)));
+
+
+       // Series Tree View
+       Seriesmodel = new QStandardItemModel(0,2,this); 
+       QStringList Serieslist;
+       Serieslist.push_back(tr("MODALITY"));
+       Serieslist.push_back(tr("DESCRIPTION"));
+       Serieslist.push_back(tr("no. accept."));
+       Seriesmodel->setHorizontalHeaderLabels(Serieslist);
+       ui.seriesTreeView->setModel(Seriesmodel);
+       connect(ui.seriesTreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(selectImages(QModelIndex)));
+
+       // Images Tree View
+       Imagesmodel = new QStandardItemModel(0,1,this); 
+       QStringList Imageslist;
+       Imageslist.push_back(tr("instance number"));
+       Imageslist.push_back(tr("sopuid"));
+       Imagesmodel->setHorizontalHeaderLabels(Imageslist);
+       ui.imagesTreeView->setModel(Imagesmodel);
+}
+
+// clean the different model Trees
+void vvQPacsConnection::cleanTree()
+{
+       Patientmodel->removeRows(0,Patientmodel->rowCount());
+       Studymodel->removeRows(0,Patientmodel->rowCount());
+       Seriesmodel->removeRows(0,Patientmodel->rowCount());
+       Imagesmodel->removeRows(0,Patientmodel->rowCount());
+
+}
+
+void vvQPacsConnection::selectStudies(const QModelIndex &index)
+{
+       m_level =gdcm::eStudy;
+       Studymodel->removeRows(0, Studymodel->rowCount(),QModelIndex());
+       QVariant elt= Patientmodel->data(index.sibling(index.row(),1));
+       m_patient=elt.toString().toStdString();
+       manageSeriesFilter(true);
+       
+       std::vector<gdcm::DataSet> theDataSet;
+        m_query = mquery.composeQueryStudy(m_patient);
+       if (  gdcm::CompositeNetworkFunctions::CFind(m_adress.c_str(), atoi(m_port.c_str()), 
+               m_query, theDataSet, "CREATIS", m_nickname.c_str()) )
        {
-               Studymodel->removeRows(0, Studymodel->rowCount(),QModelIndex());
-               QVariant elt= Patientmodel->data(index.sibling(index.row(),1));
-               m_patient=elt.toString().toStdString();
-               manageSeriesFilter(true);
-               gdcm::EQueryLevel theLevel = gdcm::eStudy;
-               gdcm::ERootType theRoot  = gdcm::ePatientRootType;//ePatientRootType;
-               std::vector<gdcm::DataSet> theDataSet;
-               std::vector< std::pair<gdcm::Tag, std::string> > keys;
-               
-               // Study Description
-               gdcm::Tag tagsd(0x0010,0x0020);
-               keys.push_back(std::make_pair(tagsd, m_patient));
-               // Study Description
-               gdcm::Tag tagsdc(0x0008,0x1030);
-               keys.push_back(std::make_pair(tagsdc, ""));
-               // Study date
-               gdcm::Tag tagdb(0x0008,0x0020);
-               keys.push_back(std::make_pair(tagdb, ""));
-               // Study Hour
-               gdcm::Tag tagsdh(0x0008,0x0030);
-               keys.push_back(std::make_pair(tagsdh, ""));
-               gdcm::SmartPointer<gdcm::BaseRootQuery> theQuery =  gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys);
-               gdcm::CompositeNetworkFunctions::CFind("127.0.0.1", 5678, theQuery, theDataSet, "CREATIS", "CONQUESTSRV1");
                convertDataSet(theDataSet, Studymodel, getStudyKeys(""));
        }
+}
 
 
-       void vvQPacsConnection::selectSeries(const QModelIndex &index)
-       {
-               Seriesmodel->removeRows(0, Seriesmodel->rowCount(),QModelIndex());
-               QVariant elt= Studymodel->data(index.sibling(index.row(),3));
-               QVariant elt2= Patientmodel->data(index.sibling(patientTreeView->selectionModel()->selectedRows().first().row(),1));
+void vvQPacsConnection::selectSeries(const QModelIndex &index)
+{
+       m_level =gdcm::eSeries;
+       Seriesmodel->removeRows(0, Seriesmodel->rowCount(),QModelIndex());
+       QVariant elt= Studymodel->data(index.sibling(index.row(),3));
+       QVariant elt2= Patientmodel->data(index.sibling(ui.patientTreeView->selectionModel()->selectedRows().first().row(),1));
 
-               //manageImagesFilter(true);
-               gdcm::EQueryLevel theLevel = gdcm::eSeries;
-               gdcm::ERootType theRoot  = gdcm::ePatientRootType;//ePatientRootType;
-               std::vector<gdcm::DataSet> theDataSet;
-               std::vector< std::pair<gdcm::Tag, std::string> > keys;
-               
-               //Patient Unique key
-               keys.push_back(std::make_pair(gdcm::Tag(0x0010,0x0020), m_patient));
 
-               //Study Unique Key
-               keys.push_back(std::make_pair(gdcm::Tag(0x0020,0x000d), elt.toString().toStdString()));
+       std::vector<gdcm::DataSet> theDataSet;
+       std::vector< std::pair<gdcm::Tag, std::string> > keys;
 
-               
-               // Modality
-               keys.push_back(std::make_pair(gdcm::Tag(0x0008,0x0060), elt.toString().toStdString()));
-               // Description
-               keys.push_back(std::make_pair(gdcm::Tag(0x0008,0x0060), elt.toString().toStdString()));
-               // Acceptance NUmber????
-               keys.push_back(std::make_pair(gdcm::Tag(0x0020,0x000e), elt.toString().toStdString()));
-               
-               gdcm::SmartPointer<gdcm::BaseRootQuery> theQuery =  gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys);
-               keys.clear();
-               // Modality
-               keys.push_back(std::make_pair(gdcm::Tag(0x0008,0x0060), elt.toString().toStdString()));
-               // Description
-               keys.push_back(std::make_pair(gdcm::Tag(0x0008,0x0060), elt.toString().toStdString()));
-               // Acceptance NUmber????
-               keys.push_back(std::make_pair(gdcm::Tag(0x0020,0x000e), elt.toString().toStdString()));
+       //Patient Unique key
+       keys.push_back(std::make_pair(gdcm::Tag(0x0010,0x0020), m_patient));
 
+       //Study Unique Key
+       keys.push_back(std::make_pair(gdcm::Tag(0x0020,0x000d), elt.toString().toStdString()));
 
 
-               gdcm::CompositeNetworkFunctions::CFind("127.0.0.1", 5678, theQuery, theDataSet, "CREATIS", "CONQUESTSRV1");
-               convertDataSet(theDataSet, Seriesmodel, keys);
+       // Modality
+       keys.push_back(std::make_pair(gdcm::Tag(0x0008,0x0060), elt.toString().toStdString()));
+       // Description
+       keys.push_back(std::make_pair(gdcm::Tag(0x0008,0x0060), elt.toString().toStdString()));
+       // Acceptance NUmber????
+       keys.push_back(std::make_pair(gdcm::Tag(0x0020,0x000e), elt.toString().toStdString()));
+       m_query = mquery.composeQuerySeries(keys);
+       if ( gdcm::CompositeNetworkFunctions::CFind(m_adress.c_str(), atoi(m_port.c_str()), m_query, theDataSet, "CREATIS", m_nickname.c_str()), "C:\\Boost")
+       {
+               keys.clear();
+       // Modality
+       keys.push_back(std::make_pair(gdcm::Tag(0x0008,0x0060), elt.toString().toStdString()));
+       // Description
+       keys.push_back(std::make_pair(gdcm::Tag(0x0008,0x0060), elt.toString().toStdString()));
+       // Acceptance NUmber????
+       keys.push_back(std::make_pair(gdcm::Tag(0x0020,0x000e), elt.toString().toStdString()));
+               convertDataSet(theDataSet, Seriesmodel, getSeriesKeys(""));
        }
+}
 
-       void vvQPacsConnection::selectImages(const QModelIndex &index)
-       {
-               Imagesmodel->removeRows(0, Imagesmodel->rowCount(),QModelIndex());
-               QVariant elt= Seriesmodel->data(index.sibling(index.row(),2));
-               QVariant elt2= Patientmodel->data(index.sibling(patientTreeView->selectionModel()->selectedRows().first().row(),1));
+void vvQPacsConnection::selectImages(const QModelIndex &index)
+{
+       m_level = gdcm::eImage;
+       Imagesmodel->removeRows(0, Imagesmodel->rowCount(),QModelIndex());
+       QVariant elt= Seriesmodel->data(index.sibling(index.row(),2));
+       QVariant elt2= Patientmodel->data(index.sibling(ui.patientTreeView->selectionModel()->selectedRows().first().row(),1));
 
-               //manageImagesFilter(true);
-               gdcm::EQueryLevel theLevel = gdcm::eImageOrFrame;
-               gdcm::ERootType theRoot  = gdcm::ePatientRootType;//ePatientRootType;
-               std::vector<gdcm::DataSet> theDataSet;
-               std::vector< std::pair<gdcm::Tag, std::string> > keys;
-               
-               gdcm::Tag tagsd(0x0010,0x0020);
-               keys.push_back(std::make_pair(tagsd, m_patient));
+       //manageImagesFilter(true);
+       gdcm::EQueryLevel theLevel = gdcm::eImage;
+       gdcm::ERootType theRoot  = gdcm::ePatientRootType;//ePatientRootType;
+       std::vector<gdcm::DataSet> theDataSet;
+       std::vector< std::pair<gdcm::Tag, std::string> > keys;
 
-               gdcm::Tag tagss(0x0020,0x000e);
-               keys.push_back(std::make_pair(tagss, elt.toString().toStdString()));
-               //= getStudyKeys(elt.toString().toStdString());
-               
-               // Study Description
-               gdcm::Tag tagsdc(0x0020,0x0013);
-               keys.push_back(std::make_pair(tagsdc, ""));
-               
+       gdcm::Tag tagsd(0x0010,0x0020);
+       keys.push_back(std::make_pair(tagsd, m_patient));
 
-               gdcm::SmartPointer<gdcm::BaseRootQuery> theQuery =  gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys);
-               keys.clear();
-               // Study Description
+       gdcm::Tag tagss(0x0020,0x000e);
+       keys.push_back(std::make_pair(tagss, elt.toString().toStdString()));
+       //= getStudyKeys(elt.toString().toStdString());
 
-               keys.push_back(std::make_pair(tagsdc, ""));
-               
+       // Image Description
+       gdcm::Tag tagsdc(0x0020,0x0013);
+       keys.push_back(std::make_pair(tagsdc, ""));
+               gdcm::Tag tagsic(0x0008,0x0018);
 
-               gdcm::CompositeNetworkFunctions::CFind("127.0.0.1", 5678, theQuery, theDataSet, "CREATIS", "CONQUESTSRV1");
-               convertDataSet(theDataSet, Seriesmodel, keys);
-       }
 
+       keys.push_back(std::make_pair(tagsic, ""));
 
-       void vvQPacsConnection::manageStudiesFilter(bool i_enable)
-       {
-               text_PHYS->setEnabled(i_enable);
-               text_SDESC->setEnabled(i_enable);
-               dateTab->setEnabled(i_enable);
+       gdcm::SmartPointer<gdcm::BaseRootQuery> theQuery =  gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys);
+       keys.clear();
+       // SOP Instance UID 
+       
 
-       }
 
-       void vvQPacsConnection::manageSeriesFilter(bool i_enable)
+       keys.push_back(std::make_pair(tagsdc, ""));
+keys.push_back(std::make_pair(tagsic, ""));
+
+       gdcm::CompositeNetworkFunctions::CFind(m_adress.c_str(), atoi(m_port.c_str()), theQuery, theDataSet, "CREATIS", m_nickname.c_str());
+       convertDataSet(theDataSet, Imagesmodel, keys);
+}
+
+
+void vvQPacsConnection::manageStudiesFilter(bool i_enable)
+{
+       ui.text_PHYS->setEnabled(i_enable);
+       ui.text_SDESC->setEnabled(i_enable);
+       ui.dateTab->setEnabled(i_enable);
+
+}
+
+void vvQPacsConnection::manageSeriesFilter(bool i_enable)
+{
+       ui.modalityTab->setEnabled(i_enable);
+}
+
+std::vector< std::pair<gdcm::Tag, std::string> > vvQPacsConnection::getPatientKeys(const std::string i_patname, const std::string i_patid)
+{
+       std::vector< std::pair<gdcm::Tag, std::string> > keys;
+       // Patient Name
+       gdcm::Tag tag(0x0010,0x0010);
+       keys.push_back(std::make_pair(tag, i_patname));
+
+       //// Patient ID
+       gdcm::Tag tagpid(0x0010,0x0020);
+       keys.push_back(std::make_pair(tagpid, i_patid));
+       return keys;
+}
+
+std::vector< std::pair<gdcm::Tag, std::string> > vvQPacsConnection::getStudyKeys(const std::string i_val)
+{
+       std::vector< std::pair<gdcm::Tag, std::string> > keys;
+       // Study Description
+       gdcm::Tag tagsdc(0x0008,0x1030);
+       keys.push_back(std::make_pair(tagsdc, ""));
+       // Study date
+       gdcm::Tag tagdb(0x0008,0x0020);
+       keys.push_back(std::make_pair(tagdb, ""));
+       // Study Hour
+       gdcm::Tag tagsdh(0x0008,0x0030);
+       keys.push_back(std::make_pair(tagsdh, ""));
+       // Study Instance UID
+       gdcm::Tag tagsid(0x0020,0x000d);
+       keys.push_back(std::make_pair(tagsid, i_val));
+
+       return keys;
+}
+
+
+std::vector< std::pair<gdcm::Tag, std::string> > vvQPacsConnection::getSeriesKeys(const std::string i_val)
+{
+       std::vector< std::pair<gdcm::Tag, std::string> > keys;
+       // Modality
+       gdcm::Tag tagsm(0x0008,0x0060);
+       keys.push_back(std::make_pair(tagsm, ""));
+       // Study date
+       gdcm::Tag tagdb(0x0008,0x103e);
+       keys.push_back(std::make_pair(tagdb, ""));
+       // Study Hour
+       gdcm::Tag tagsdh(0x0020,0x000e);
+       keys.push_back(std::make_pair(tagsdh, ""));
+       // Study Instance UID
+       gdcm::Tag tagsid(0x0020,0x1209);
+       keys.push_back(std::make_pair(tagsid, i_val));
+
+       return keys;
+}
+std::vector< std::pair<gdcm::Tag, std::string> > vvQPacsConnection::getKeys()
+{
+       std::vector< std::pair<gdcm::Tag, std::string> > keys;
+       // Patient Name
+       gdcm::Tag tag(0x0010,0x0010);
+       keys.push_back(std::make_pair(tag, ""));
+
+       //// Patient ID
+       gdcm::Tag tagpid(0x0010,0x0020);
+       keys.push_back(std::make_pair(tagpid, ""));
+
+       // Modality
+       gdcm::Tag tagmod(0x0008,0x0061);
+       keys.push_back(std::make_pair(tagmod, ""));
+
+       // date of birth
+       gdcm::Tag tagdb(0x0010,0x0030);
+       keys.push_back(std::make_pair(tagdb, ""));
+
+       // Study Date
+       gdcm::Tag tagsd(0x0020,0x000D);
+       keys.push_back(std::make_pair(tagsd, ""));
+
+       //// Study Time
+       //gdcm::Tag tagst(8,30);
+       //keys.push_back(std::make_pair(tagst, ""));
+
+       //// Study Description
+       //gdcm::Tag tagsdc(8,1030);
+       //keys.push_back(std::make_pair(tagsdc, ""));
+
+       //// Accession n°
+       //gdcm::Tag tagacc(8,50);
+       //keys.push_back(std::make_pair(tagacc, ""));
+
+       return keys;
+}
+
+void vvQPacsConnection::on_check_ModAll_clicked(bool state)
+{
+       ui.check_MR->setEnabled(!state);
+       ui.check_CR->setEnabled(!state);
+       ui.check_OT->setEnabled(!state);
+       ui.check_RF->setEnabled(!state);
+       ui.check_SC->setEnabled(!state);
+       ui.check_CT->setEnabled(!state);
+       ui.check_US->setEnabled(!state);
+       ui.check_NM->setEnabled(!state);
+       ui.check_DR->setEnabled(!state);
+       ui.check_US->setEnabled(!state);
+       ui.check_NM->setEnabled(!state);
+       ui.check_DR->setEnabled(!state);
+       ui.check_SR->setEnabled(!state);
+       ui.check_XA->setEnabled(!state);
+       ui.check_MG->setEnabled(!state);
+       if(state)
        {
-               modalityTab->setEnabled(i_enable);
+               ui.check_MR->setChecked(state);
+               ui.check_CR->setChecked(state);
+               ui.check_OT->setChecked(state);
+               ui.check_RF->setChecked(state);
+               ui.check_SC->setChecked(state);
+               ui.check_CT->setChecked(state);
+               ui.check_US->setChecked(state);
+               ui.check_NM->setChecked(state);
+               ui.check_DR->setChecked(state);
+               ui.check_US->setChecked(state);
+               ui.check_NM->setChecked(state);
+               ui.check_DR->setChecked(state);
+               ui.check_SR->setChecked(state);
+               ui.check_XA->setChecked(state);
+               ui.check_MG->setChecked(state);
        }
 
-       std::vector< std::pair<gdcm::Tag, std::string> > vvQPacsConnection::getPatientKeys(const std::string i_val)
+}
+
+void vvQPacsConnection::chooseServer(int index)
+{
+       std::map < std::string, std:: string> values = getDicomServer(ui.networkCombo->currentText());
+       m_port = values["PORT"];
+       m_aetitle = values["AETITLE"];
+       m_adress= values["ADRESS"];
+       m_nickname = values["nickname"];
+       ui.AdressEdit->setText(QString(m_adress.c_str()));
+       ui.AETitleEdit->setText(QString(m_aetitle.c_str()));
+       ui.NameEdit->setText(QString(m_nickname.c_str()));
+       ui.PortEdit->setText(QString(m_port.c_str()));
+}
+
+void vvQPacsConnection::on_importButton_clicked()
        {
-               std::vector< std::pair<gdcm::Tag, std::string> > keys;
-               // Patient Name
-                gdcm::Tag tag(0x0010,0x0010);
-               keys.push_back(std::make_pair(tag, ""));
-
-               //// Patient ID
-               gdcm::Tag tagpid(0x0010,0x0020);
-               keys.push_back(std::make_pair(tagpid, i_val));
-               return keys;
-       }
-
-       std::vector< std::pair<gdcm::Tag, std::string> > vvQPacsConnection::getStudyKeys(const std::string i_val)
-       {
-               std::vector< std::pair<gdcm::Tag, std::string> > keys;
-               // Study Description
-               gdcm::Tag tagsdc(0x0008,0x1030);
-               keys.push_back(std::make_pair(tagsdc, ""));
-               // Study date
-               gdcm::Tag tagdb(0x0008,0x0020);
-               keys.push_back(std::make_pair(tagdb, ""));
-               // Study Hour
-               gdcm::Tag tagsdh(0x0008,0x0030);
-               keys.push_back(std::make_pair(tagsdh, ""));
-               // Study Instance UID
-               gdcm::Tag tagsid(0x0020,0x000d);
-               keys.push_back(std::make_pair(tagsid, i_val));
-
-               return keys;
-       }
-
+               int sel = 0;
+               //QModelIndexList list = ui.imagesTreeView-selectedIndexes();
+               QModelIndexList indices =  ui.imagesTreeView->selectionModel()->selectedRows(); 
+               QModelIndexList::iterator it = indices.begin();
+               for(; it != indices.end(); it++)
+                       sel = it->row();
+               QModelIndex index;
+               QVariant elt= Patientmodel->data(index.sibling(ui.patientTreeView->selectionModel()->selectedRows().first().row(),1));
+               
 
-       std::vector< std::pair<gdcm::Tag, std::string> > vvQPacsConnection::getSeriesKeys(const std::string i_val)
-       {
-               std::vector< std::pair<gdcm::Tag, std::string> > keys;
-               // Modality
-               gdcm::Tag tagsm(0x0008,0x0060);
-               keys.push_back(std::make_pair(tagsm, ""));
-               // Study date
-               gdcm::Tag tagdb(0x0008,0x103e);
-               keys.push_back(std::make_pair(tagdb, ""));
-               // Study Hour
-               gdcm::Tag tagsdh(0x0020,0x000e);
-               keys.push_back(std::make_pair(tagsdh, ""));
-               // Study Instance UID
-               gdcm::Tag tagsid(0x0020,0x1209);
-               keys.push_back(std::make_pair(tagsid, i_val));
-
-               return keys;
-       }
-       std::vector< std::pair<gdcm::Tag, std::string> > vvQPacsConnection::getKeys()
-       {
+               gdcm::ERootType theRoot  = gdcm::ePatientRootType;//ePatientRootType;
+               std::vector<gdcm::DataSet> theDataSet;
                std::vector< std::pair<gdcm::Tag, std::string> > keys;
-               // Patient Name
-                gdcm::Tag tag(0x0010,0x0010);
-               keys.push_back(std::make_pair(tag, ""));
-
-               //// Patient ID
-               gdcm::Tag tagpid(0x0010,0x0020);
-               keys.push_back(std::make_pair(tagpid, ""));
-
-               // Modality
-               gdcm::Tag tagmod(0x0008,0x0061);
-               keys.push_back(std::make_pair(tagmod, ""));
 
-               // date of birth
-               gdcm::Tag tagdb(0x0010,0x0030);
-               keys.push_back(std::make_pair(tagdb, ""));
 
-               // Study Date
-               gdcm::Tag tagsd(0x0020,0x000D);
-               keys.push_back(std::make_pair(tagsd, ""));
+               // Study Description
+       //      gdcm::Tag tagsdc(0x0010,0x0020);
+               //keys.push_back(std::make_pair(tagsdc, elt.toString().toStdString()));
 
-               //// Study Time
-               //gdcm::Tag tagst(8,30);
-               //keys.push_back(std::make_pair(tagst, ""));
+       
+       // Study Description
 
-               //// Study Description
-               //gdcm::Tag tagsdc(8,1030);
-               //keys.push_back(std::make_pair(tagsdc, ""));
 
-               //// Accession n°
-               //gdcm::Tag tagacc(8,50);
-               //keys.push_back(std::make_pair(tagacc, ""));
+               //gdcm::SmartPointer<gdcm::BaseRootQuery> theQuery =  gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, m_level ,fillMoveKeys(), true);
 
-               return keys;
+               bool didItWork =  gdcm::CompositeNetworkFunctions::CMove(m_adress.c_str(),atoi(m_port.c_str()), m_query, getDicomClientPort(),
+      getDicomClientAETitle().c_str(), m_aetitle.c_str(),"D:\\move" );
+                gdcm::Directory theDir;
+               theDir.Load("D:\\move");
+          m_files =    theDir.GetFilenames();
+          accept();
        }
 
-       void vvQPacsConnection::on_check_ModAll_clicked(bool state)
+std::vector <std::string> vvQPacsConnection::getFileNames()
+{
+       std::vector <std::string> filenames;
+       gdcm::Directory::FilenamesType::iterator it = m_files.begin();
+       for (;it != m_files.end(); it++)
+               filenames.push_back(it->c_str());
+       return filenames;
+}
+std::vector< std::pair<gdcm::Tag, std::string> > vvQPacsConnection::fillMoveKeys()
+{
+       std::vector< std::pair<gdcm::Tag, std::string> > keys;
+       switch(m_level)
        {
-               check_MR->setEnabled(!state);
-               check_CR->setEnabled(!state);
-               check_OT->setEnabled(!state);
-               check_RF->setEnabled(!state);
-               check_SC->setEnabled(!state);
-               check_CT->setEnabled(!state);
-               check_US->setEnabled(!state);
-               check_NM->setEnabled(!state);
-               check_DR->setEnabled(!state);
-               check_US->setEnabled(!state);
-               check_NM->setEnabled(!state);
-               check_DR->setEnabled(!state);
-               check_SR->setEnabled(!state);
-               check_XA->setEnabled(!state);
-               check_MG->setEnabled(!state);
-               if(state)
-               {
-                       check_MR->setChecked(state);
-                       check_CR->setChecked(state);
-                       check_OT->setChecked(state);
-                       check_RF->setChecked(state);
-                       check_SC->setChecked(state);
-                       check_CT->setChecked(state);
-                       check_US->setChecked(state);
-                       check_NM->setChecked(state);
-                       check_DR->setChecked(state);
-                       check_US->setChecked(state);
-                       check_NM->setChecked(state);
-                       check_DR->setChecked(state);
-                       check_SR->setChecked(state);
-                       check_XA->setChecked(state);
-                       check_MG->setChecked(state);
-               }
+       case gdcm::ePatient:
+                       //keys.push_back(getPatientKeys("",""));
+                       break;
+       }
 
-       }
\ No newline at end of file
+       return keys;
+}
\ No newline at end of file