X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvQPacsConnection.cxx;h=6033825c0a01ee407e399cbed9a28108e3afad3d;hb=4eb6f95e59a7602564b15f9d0715650dc91442a2;hp=3717c5f469298ef457cd9eda94d5fd4f301476d8;hpb=f869efb41519738f03a7526b2f1262f5a4729894;p=clitk.git diff --git a/vv/vvQPacsConnection.cxx b/vv/vvQPacsConnection.cxx index 3717c5f..6033825 100644 --- a/vv/vvQPacsConnection.cxx +++ b/vv/vvQPacsConnection.cxx @@ -81,14 +81,14 @@ void vvQPacsConnection::on_scanButton_clicked() { m_level =gdcm::ePatient; std::vector theDataSet; - f_query = getQueryPatient(ui.patientName->toPlainText().toStdString(), ui.patientID->toPlainText().toStdString()); + 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) { - convertDataSet(theDataSet,Patientmodel,getPatientKeys("","")); + convertDataSet(theDataSet,Patientmodel,mQFactory.getPatientKeys("","")); } // end cfindwork } // end didItwork } @@ -169,7 +169,7 @@ 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; @@ -192,71 +192,54 @@ void vvQPacsConnection::cleanTree() void vvQPacsConnection::selectStudies(const QModelIndex &index) { - + 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()); - QVariant elt= Patientmodel->data(index.sibling(index.row(),1)); - m_patient=elt.toString().toStdString(); manageSeriesFilter(true); - - std::vector theDataSet; - m_query = getQueryPatient("",m_patient); - f_query = getQueryforStudy(m_patient, false); - - - if ( 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()) ) - { - convertDataSet(theDataSet, Studymodel, getQueryKeysforStudy("",true)); - } + convertDataSet( findQuery( mQFactory.getQueryforStudy(m_patient, false)) , Studymodel, mQFactory.getQueryKeysforStudy("",true)); } +void vvQPacsConnection::clearMove() +{ +} 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()); - - - std::vector theDataSet; - - m_query = getQueryforSeries(m_patient,m_study, false); - f_query =getQueryforSeries(m_patient,m_study, false); - if ( 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())) - { + convertDataSet( findQuery( mQFactory.getQueryforSeries(m_patient,m_study, false)), Seriesmodel, mQFactory.getSeriesKeys("","",true)); - convertDataSet(theDataSet, Seriesmodel, 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()); + convertDataSet( findQuery( mQFactory.getQueryforImages(m_patient,m_study, m_series, false) ), Imagesmodel, mQFactory.getQueryKeysforImages("","","",true)); + +} - - //manageImagesFilter(true); +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); - std::vector theDataSet; - std::vector< std::pair > keys; - f_query =getQueryforImages(m_patient,m_study, m_series, false); - m_query =getQueryforImages(m_patient,m_study, m_series, false); - if( 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())) - { - convertDataSet(theDataSet, Imagesmodel, getQueryKeysforImages("","","",true)); - } } +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); @@ -270,28 +253,6 @@ void vvQPacsConnection::manageSeriesFilter(bool i_enable) ui.modalityTab->setEnabled(i_enable); } -vvQuery vvQPacsConnection::getQueryPatient(const std::string i_patname, const std::string i_patid) -{ - vvQuery query; - query.theRoot = gdcm::ePatientRootType; - query.theLevel = gdcm::ePatient; - query.keys = getPatientKeys(i_patname, i_patid); - return query; - -} - -std::vector< std::pair > vvQPacsConnection::getPatientKeys(const std::string i_patname, const std::string i_patid) -{ - std::vector< std::pair > 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 > vvQPacsConnection::getStudyKeys(const std::string i_val) { @@ -312,36 +273,6 @@ std::vector< std::pair > vvQPacsConnection::getStudyKeys return keys; } -vvQuery vvQPacsConnection::getQueryforSeries(const std::string patient_id, const std::string series_id, bool bdisplay) -{ - vvQuery query; - query.theRoot = gdcm::ePatientRootType; - query.theLevel = gdcm::eSeries; - query.keys = getSeriesKeys(patient_id, series_id, bdisplay); - return query; -} -std::vector< std::pair > vvQPacsConnection::getSeriesKeys(const std::string patient_id, const std::string study_id, bool bdisplay) -{ - std::vector< std::pair > keys; - // Modality - keys.push_back(std::make_pair(gdcm::Tag(0x0008,0x0060), "")); - // Study date - - keys.push_back(std::make_pair(gdcm::Tag(0x0008,0x103e),"")); -// Series Instance UID - keys.push_back(std::make_pair(gdcm::Tag(0x0020,0x000e), "")); - - - - if(!bdisplay) - { - // Study Instance UID - gdcm::Tag tagsid(0x0020,0x1209); - keys.push_back(std::make_pair(tagsid, study_id)); - } - - return keys; -} std::vector< std::pair > vvQPacsConnection::getKeys() { std::vector< std::pair > keys; @@ -433,16 +364,35 @@ void vvQPacsConnection::chooseServer(int index) void vvQPacsConnection::on_importButton_clicked() { - + setCursor(QCursor(Qt::WaitCursor)); + QString path = QDir::homePath() +QString::fromStdString("/.move"); + 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(m_query.theRoot, m_query.theLevel ,m_query.keys,true), getDicomClientPort(), - getDicomClientAETitle().c_str(), m_aetitle.c_str(),"D:\\move" ); + gdcm::CompositeNetworkFunctions::ConstructQuery(mQFactory.getMoveQuery().theRoot, mQFactory.getMoveQuery().theLevel ,mQFactory.getMoveQuery().keys,true), + getDicomClientPort(), getDicomClientAETitle().c_str(), m_aetitle.c_str(), path.toStdString().c_str() ); gdcm::Directory theDir; - theDir.Load("D:\\move"); + theDir.Load(path.toStdString().c_str()); m_files = theDir.GetFilenames(); + accept(); + setCursor(QCursor(Qt::ArrowCursor)); } + + std::vector vvQPacsConnection::getFileNames() { std::vector filenames; @@ -463,74 +413,3 @@ std::vector< std::pair > vvQPacsConnection::fillMoveKeys return keys; } - -vvQuery vvQPacsConnection::getQueryforStudy(const std::string patient_id, bool bdisplay) -{ - vvQuery query; - query.keys = getQueryKeysforStudy( patient_id, bdisplay); - query.theRoot = gdcm::ePatientRootType; - query.theLevel = gdcm::eStudy; - return query; -} - -std::vector< std::pair > vvQPacsConnection::getQueryKeysforStudy(const std::string patient_id, bool bdisplay) -{ - std::vector< std::pair > 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 UID - gdcm::Tag tagsid(0x020,0x000d); - keys.push_back(std::make_pair(tagsid, "")); - - if (!bdisplay) - { - // Patient ID - gdcm::Tag tagsd(0x0010,0x0020); - keys.push_back(std::make_pair(tagsd, patient_id)); - } - - return keys; -} - -vvQuery vvQPacsConnection::getQueryforImages(const std::string patient_id, const std::string study_id, const std::string series_id,bool bdisplay) -{ - vvQuery query; - query.keys = getQueryKeysforImages( patient_id, study_id, series_id, bdisplay); - query.theRoot = gdcm::ePatientRootType; - query.theLevel = gdcm::eImage; - return query; -} - -std::vector< std::pair > vvQPacsConnection::getQueryKeysforImages(const std::string patient_id, const std::string study_id, const std::string series_id,bool bdisplay) -{ - - std::vector< std::pair > keys; - - if (!bdisplay) - { - //Patient UID - keys.push_back(std::make_pair(gdcm::Tag (0x0010,0x0020), patient_id)); - - //Study UID - // keys.push_back(std::make_pair(gdcm::Tag(0x0020,0x000d), study_id)); - - //Series UID - keys.push_back(std::make_pair(gdcm::Tag(0x0020,0x000e), series_id)); - } - // Image Description - - keys.push_back(std::make_pair(gdcm::Tag(0x0020,0x0013), "")); - //SOP Instance UID - keys.push_back(std::make_pair(gdcm::Tag(0x0008,0x0018), "")); - return keys; -} \ No newline at end of file