X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvQPacsConnection.cxx;h=4ae0d33b9981bdddc7a31e98e2f2aa0b55c16b7f;hb=30133023f12212c84e7b4e9318f1055ec3176af1;hp=9cc4c9c4013e3c687ea924a57019b6f7add26dac;hpb=0a5abf9398aa0c578f014b52ca992943ca653f72;p=clitk.git diff --git a/vv/vvQPacsConnection.cxx b/vv/vvQPacsConnection.cxx index 9cc4c9c..4ae0d33 100644 --- a/vv/vvQPacsConnection.cxx +++ b/vv/vvQPacsConnection.cxx @@ -7,43 +7,74 @@ #include #include "vvPacsSettingsDialog.h" #include "vvUtils.h" +#include +#include +#include vvQPacsConnection::vvQPacsConnection(QWidget *i_parent) :QDialog(i_parent) { ui.setupUi(this); - setWindowTitle(QString::fromUtf8("PACS CONNECTIONHHHH")); + setWindowTitle(QString::fromUtf8("PACS CONNECTION")); 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.setChecked(true); - //ui.on_check_ModAll_clicked(true); - QIcon icon; - icon.addFile("basket_download.png",QSize(),QIcon::Normal,QIcon::Off); - ui.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); - ui.optionsButton->setIcon(icon); - icon.addFile("bullet_info.png",QSize(),QIcon::Normal,QIcon::Off); - ui.helpButton->setIcon(icon); - + ui.check_ModAll->setEnabled(true); + ui.networkCombo->addItem(""); ui.networkCombo->addItems(getDicomServers()); - connect(ui.networkCombo,SIGNAL(currentIndexChanged(int)),this,SLOT(connectServer(int))); - connect(ui.scanButton,SIGNAL(clicked()),this,SLOT(on_scanButton_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())); + connect(ui.exitButton,SIGNAL(clicked()),this,SLOT(close())); + update(); } +// Exit window +bool vvQPacsConnection::close() +{ + QApplication::restoreOverrideCursor(); + return QWidget::close(); +} + +// 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() +{ + int indexCombo = ui.networkCombo->currentIndex(); + removeDicomServer(m_nickname); + AddDicomServer(ui.NameEdit->text().toStdString(),ui.AETitleEdit->text().toStdString(),ui.AdressEdit->text().toStdString(),ui.PortEdit->text().toStdString()); + ui.networkCombo->clear(); + ui.networkCombo->addItem(QString()); + ui.networkCombo->addItems(getDicomServers()); + ui.networkCombo->setCurrentIndex(indexCombo); +} + +// 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.networkCombo->show(); + 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() @@ -56,52 +87,29 @@ void vvQPacsConnection::on_clearButton_clicked() void vvQPacsConnection::on_scanButton_clicked() { - + cleanTree(); manageStudiesFilter(true); - bool didItWork = gdcm::CompositeNetworkFunctions::CEcho(m_adress.c_str(), atoi(m_port.c_str()), "CREATIS", m_nickname.c_str() ); - std::vector< std::pair > keys = getKeys(); - gdcm::EQueryLevel theLevel = gdcm::eStudy; - gdcm::ERootType theRoot = gdcm::eStudyRootType;//ePatientRootType; - - std::vector theDataSet; - theLevel = gdcm::ePatient; - theRoot = gdcm::ePatientRootType;//ePatientRootType; - gdcm::SmartPointer theQuery = gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,getPatientKeys("")); - gdcm::CompositeNetworkFunctions::CFind(m_adress.c_str(), atoi(m_port.c_str()), theQuery, theDataSet, "CREATIS", m_nickname.c_str()); - std::vector::iterator it_ds = theDataSet.begin(); - - for(; it_ds != theDataSet.end(); it_ds++) + // test first if echo works + bool didItWork = gdcm::CompositeNetworkFunctions::CEcho(m_adress.c_str(), atoi(m_port.c_str()), getDicomClientAETitle().c_str(), m_nickname.c_str() ); + if (didItWork) { - QList items; - const gdcm::DataSet ds = (*it_ds); - std::vector< std::pair >::iterator it_key = keys.begin(); - int ind = 0; - for(; it_key != keys.end(); it_key++, ind++) + m_level =gdcm::ePatient; + std::vector theDataSet; + f_query = mQFactory.getQueryPatient(ui.patientName->toPlainText().toStdString(), ui.patientID->toPlainText().toStdString()); + + bool cfindWork = gdcm::CompositeNetworkFunctions::CFind(m_adress.c_str(), atoi(m_port.c_str()), + gdcm::CompositeNetworkFunctions::ConstructQuery(f_query.theRoot, f_query.theLevel ,f_query.keys), + theDataSet, getDicomClientAETitle().c_str() , m_nickname.c_str()); + if( cfindWork) { - 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); - } + convertDataSet(theDataSet,Patientmodel,mQFactory.getPatientKeys("","")); + } // end cfindwork + } // end didItwork } +/// show Options DialogBox to set a new Dicom Server void vvQPacsConnection::on_optionsButton_clicked() { vvPacsSettingsDialog *dg = new vvPacsSettingsDialog(this); @@ -110,7 +118,7 @@ void vvQPacsConnection::on_optionsButton_clicked() void vvQPacsConnection::convertDataSet(std::vector i_ds, QStandardItemModel *i_model, std::vector< std::pair > keys) { - gdcm::Tag tagdb(0x0008,0x0020); + std::vector::iterator it_ds = i_ds.begin(); for(; it_ds != i_ds.end(); it_ds++) { @@ -126,16 +134,7 @@ void vvQPacsConnection::convertDataSet(std::vector i_ds, QStandar 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 { @@ -149,10 +148,9 @@ void vvQPacsConnection::convertDataSet(std::vector i_ds, QStandar } i_model->appendRow(items); } - } - +// TreeViews creation void vvQPacsConnection::createTreeView() { // Patient Tree View @@ -171,6 +169,7 @@ void vvQPacsConnection::createTreeView() Studylist.push_back(tr("DESCRIPTION")); Studylist.push_back(tr("DATE")); Studylist.push_back(tr("HOUR")); + Studylist.push_back(tr("STUDY ID")); Studymodel->setHorizontalHeaderLabels(Studylist); ui.studyTreeView->setModel(Studymodel); connect(ui.studyTreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(selectSeries(QModelIndex))); @@ -185,118 +184,77 @@ void vvQPacsConnection::createTreeView() Seriesmodel->setHorizontalHeaderLabels(Serieslist); ui.seriesTreeView->setModel(Seriesmodel); connect(ui.seriesTreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(selectImages(QModelIndex))); - + connect(ui.imagesTreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(selectImage(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); } -void vvQPacsConnection::selectStudies(const QModelIndex &index) +// clean the different model Trees +void vvQPacsConnection::cleanTree() { - 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 theDataSet; - std::vector< std::pair > keys; + Patientmodel->removeRows(0,Patientmodel->rowCount()); + Studymodel->removeRows(0,Patientmodel->rowCount()); + Seriesmodel->removeRows(0,Patientmodel->rowCount()); + Imagesmodel->removeRows(0,Patientmodel->rowCount()); - // 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 theQuery = gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys); - gdcm::CompositeNetworkFunctions::CFind(m_adress.c_str(), atoi(m_port.c_str()), theQuery, theDataSet, "CREATIS", m_nickname.c_str()); - convertDataSet(theDataSet, Studymodel, getStudyKeys("")); } - -void vvQPacsConnection::selectSeries(const QModelIndex &index) +void vvQPacsConnection::selectStudies(const QModelIndex &index) { - 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 theDataSet; - std::vector< std::pair > keys; + m_patient= Patientmodel->data(index.sibling(index.row(),1)).toString().toStdString(); + Studymodel->removeRows(0, Studymodel->rowCount(),QModelIndex()); + Seriesmodel->removeRows(0, Seriesmodel->rowCount(),QModelIndex()); + Imagesmodel->removeRows(0, Imagesmodel->rowCount(),QModelIndex()); + manageSeriesFilter(true); + convertDataSet( findQuery( mQFactory.getQueryforStudy(m_patient, false)) , Studymodel, mQFactory.getQueryKeysforStudy("",true)); +} - //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())); +void vvQPacsConnection::clearMove() +{ +} - // 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 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())); - - gdcm::CompositeNetworkFunctions::CFind(m_adress.c_str(), atoi(m_port.c_str()), theQuery, theDataSet, "CREATIS", m_nickname.c_str()); - convertDataSet(theDataSet, Seriesmodel, keys); +void vvQPacsConnection::selectSeries(const QModelIndex &index) +{ + m_study= Studymodel->data(index.sibling(index.row(),3)).toString().toStdString(); + Seriesmodel->removeRows(0, Seriesmodel->rowCount()); + Imagesmodel->removeRows(0, Imagesmodel->rowCount()); + convertDataSet( findQuery( mQFactory.getQueryforSeries(m_patient,m_study, false)), Seriesmodel, mQFactory.getSeriesKeys("","",true)); + } void vvQPacsConnection::selectImages(const QModelIndex &index) { + m_series = Seriesmodel->data(index.sibling(index.row(),2)).toString().toStdString(); 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::eImage; - gdcm::ERootType theRoot = gdcm::ePatientRootType;//ePatientRootType; - std::vector theDataSet; - std::vector< std::pair > keys; - - gdcm::Tag tagsd(0x0010,0x0020); - keys.push_back(std::make_pair(tagsd, m_patient)); - - 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, "")); - + convertDataSet( findQuery( mQFactory.getQueryforImages(m_patient,m_study, m_series, false) ), Imagesmodel, mQFactory.getQueryKeysforImages("","","",true)); + +} - gdcm::SmartPointer theQuery = gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys); - keys.clear(); - // Study Description +void vvQPacsConnection::selectImage(const QModelIndex &index) +{ + std::string _image = Imagesmodel->data(index.sibling(index.row(),1)).toString().toStdString(); + mQFactory.setQueryforImage(m_patient,m_study, m_series, _image); + +} - keys.push_back(std::make_pair(tagsdc, "")); - gdcm::CompositeNetworkFunctions::CFind(m_adress.c_str(), atoi(m_port.c_str()), theQuery, theDataSet, "CREATIS", m_nickname.c_str()); - convertDataSet(theDataSet, Imagesmodel, keys); +std::vector vvQPacsConnection::findQuery(vvQuery i_query) +{ + std::vector theDataSet; + gdcm::CompositeNetworkFunctions::CFind(m_adress.c_str(), atoi(m_port.c_str()), + gdcm::CompositeNetworkFunctions::ConstructQuery(i_query.theRoot, i_query.theLevel,i_query.keys), theDataSet, + getDicomClientAETitle().c_str(), m_nickname.c_str()); + return theDataSet; } - void vvQPacsConnection::manageStudiesFilter(bool i_enable) { ui.text_PHYS->setEnabled(i_enable); @@ -310,18 +268,6 @@ void vvQPacsConnection::manageSeriesFilter(bool i_enable) ui.modalityTab->setEnabled(i_enable); } -std::vector< std::pair > vvQPacsConnection::getPatientKeys(const std::string i_val) -{ - std::vector< std::pair > 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 > vvQPacsConnection::getStudyKeys(const std::string i_val) { @@ -342,25 +288,6 @@ std::vector< std::pair > vvQPacsConnection::getStudyKeys return keys; } - -std::vector< std::pair > vvQPacsConnection::getSeriesKeys(const std::string i_val) -{ - std::vector< std::pair > 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 > vvQPacsConnection::getKeys() { std::vector< std::pair > keys; @@ -392,7 +319,7 @@ std::vector< std::pair > vvQPacsConnection::getKeys() //gdcm::Tag tagsdc(8,1030); //keys.push_back(std::make_pair(tagsdc, "")); - //// Accession n° + //// Accession //gdcm::Tag tagacc(8,50); //keys.push_back(std::make_pair(tagacc, "")); @@ -437,7 +364,7 @@ void vvQPacsConnection::on_check_ModAll_clicked(bool state) } -void vvQPacsConnection::connectServer(int index) +void vvQPacsConnection::chooseServer(int index) { std::map < std::string, std:: string> values = getDicomServer(ui.networkCombo->currentText()); m_port = values["PORT"]; @@ -452,20 +379,71 @@ void vvQPacsConnection::connectServer(int index) void vvQPacsConnection::on_importButton_clicked() { - QModelIndex index; - QVariant elt= Patientmodel->data(index.sibling(ui.patientTreeView->selectionModel()->selectedRows().first().row(),1)); - - gdcm::EQueryLevel theLevel = gdcm::ePatient; - gdcm::ERootType theRoot = gdcm::ePatientRootType;//ePatientRootType; - std::vector theDataSet; - std::vector< std::pair > keys; - - // Study Description - gdcm::Tag tagsdc(0x0010,0x0020); - keys.push_back(std::make_pair(tagsdc, elt.toString().toStdString())); - gdcm::SmartPointer theQuery = gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys); - // gdcm::CompositeNetworkFunctions::CFind("127.0.0.1", 5678, theQuery, theDataSet, "CREATIS", "CONQUESTSRV1"); - - bool didItWork = gdcm::CompositeNetworkFunctions::CMove(m_adress.c_str(),atoi(m_port.c_str()), theQuery, 0, - "CREATIS", m_nickname.c_str(), "d:\\temp_pacs_import\\" ); - } \ No newline at end of file + setCursor(QCursor(Qt::WaitCursor)); + QString path = QString::fromStdString(getCMoveDirectory()); + QDir dirpath (path); + if (dirpath.exists()) + { + QFileInfoList list = dirpath.entryInfoList( QDir::Files); + QFileInfoList::iterator it_file = dirpath.entryInfoList( QDir::Files).begin(); + for(int i = 0; i < list.length() ; i++) + { + QFile::remove(list.at(i).filePath()); + } + } + else + { + dirpath.mkdir(path); + } + bool didItWork = gdcm::CompositeNetworkFunctions::CMove(m_adress.c_str(),atoi(m_port.c_str()), + gdcm::CompositeNetworkFunctions::ConstructQuery(mQFactory.getMoveQuery().theRoot, mQFactory.getMoveQuery().theLevel ,mQFactory.getMoveQuery().keys, gdcm::eMove), + 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(); + + typedef itk::GDCMSeriesFileNames NamesGeneratorType; + NamesGeneratorType::Pointer nameGenerator = NamesGeneratorType::New(); + nameGenerator->SetUseSeriesDetails(true); + + //ds gerer recursive moi-meme pour progress ... + nameGenerator->SetInputDirectory(path.toStdString()); + + // insert in table + typedef std::vector SeriesIdContainer; + const SeriesIdContainer & seriesUID = nameGenerator->GetSeriesUIDs(); + std::map* > mListOfSeriesFilenames; + + + m_fileseries.clear(); + + for (unsigned int i=0; iGetFileNames(seriesUID[i])); + } + + accept(); + setCursor(QCursor(Qt::ArrowCursor)); + } + + + +std::vector vvQPacsConnection::getFileNames(int i_series) +{ + std::vector filenames; + 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; +} +std::vector< std::pair > vvQPacsConnection::fillMoveKeys() +{ + std::vector< std::pair > keys; + switch(m_level) + { + case gdcm::ePatient: + //keys.push_back(getPatientKeys("","")); + break; + } + + return keys; +}