#include <QDateTime>
#include "vvPacsSettingsDialog.h"
#include "vvUtils.h"
-
+#include <algorithm>
vvQPacsConnection::vvQPacsConnection(QWidget *i_parent)
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() );
+ bool didItWork = gdcm::CompositeNetworkFunctions::CEcho(m_adress.c_str(), atoi(m_port.c_str()), getDicomClientAETitle().c_str(), m_nickname.c_str() );
if (didItWork)
{
m_level =gdcm::ePatient;
std::vector<gdcm::DataSet> theDataSet;
- gdcm::EQueryLevel theLevel = gdcm::ePatient;
- gdcm::ERootType theRoot = gdcm::ePatientRootType;//ePatientRootType;
- 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());
+ 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
}
-
+/// show Options DialogBox to set a new Dicom Server
void vvQPacsConnection::on_optionsButton_clicked()
{
vvPacsSettingsDialog *dg = new vvPacsSettingsDialog(this);
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++)
{
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)));
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;
void vvQPacsConnection::selectStudies(const QModelIndex &index)
{
- m_level =gdcm::eStudy;
+
+ m_patient= Patientmodel->data(index.sibling(index.row(),1)).toString().toStdString();
Studymodel->removeRows(0, Studymodel->rowCount(),QModelIndex());
- QVariant elt= Patientmodel->data(index.sibling(index.row(),1));
- m_patient=elt.toString().toStdString();
+ Seriesmodel->removeRows(0, Seriesmodel->rowCount(),QModelIndex());
+ Imagesmodel->removeRows(0, Imagesmodel->rowCount(),QModelIndex());
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()) )
- {
- convertDataSet(theDataSet, Studymodel, getStudyKeys(""));
- }
+ convertDataSet( findQuery( mQFactory.getQueryforStudy(m_patient, false)) , Studymodel, mQFactory.getQueryKeysforStudy("",true));
}
-void vvQPacsConnection::selectSeries(const QModelIndex &index)
+void vvQPacsConnection::clearMove()
{
- 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));
-
-
- 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()));
+}
- // 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::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_level = gdcm::eImage;
+ 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<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));
-
- gdcm::Tag tagss(0x0020,0x000e);
- keys.push_back(std::make_pair(tagss, elt.toString().toStdString()));
- //= getStudyKeys(elt.toString().toStdString());
-
- // Image Description
- gdcm::Tag tagsdc(0x0020,0x0013);
- keys.push_back(std::make_pair(tagsdc, ""));
- gdcm::Tag tagsic(0x0008,0x0018);
-
-
- keys.push_back(std::make_pair(tagsic, ""));
+ convertDataSet( findQuery( mQFactory.getQueryforImages(m_patient,m_study, m_series, false) ), Imagesmodel, mQFactory.getQueryKeysforImages("","","",true));
+
+}
- gdcm::SmartPointer<gdcm::BaseRootQuery> theQuery = gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, theLevel ,keys);
- keys.clear();
- // SOP Instance UID
+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, ""));
-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);
+std::vector<gdcm::DataSet> vvQPacsConnection::findQuery(vvQuery i_query)
+{
+ std::vector<gdcm::DataSet> 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);
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)
{
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;
void vvQPacsConnection::on_importButton_clicked()
{
- 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));
-
-
- 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()));
-
-
- // Study Description
-
-
- //gdcm::SmartPointer<gdcm::BaseRootQuery> theQuery = gdcm::CompositeNetworkFunctions::ConstructQuery(theRoot, m_level ,fillMoveKeys(), true);
-
- 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");
+ 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(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(path.toStdString().c_str());
m_files = theDir.GetFilenames();
+ std::sort (m_files.begin(), m_files.end()); // make sure names are in lexicographical order
+
accept();
+ setCursor(QCursor(Qt::ArrowCursor));
}
+
+
std::vector <std::string> vvQPacsConnection::getFileNames()
{
std::vector <std::string> filenames;
}
return keys;
-}
\ No newline at end of file
+}
git://git.creatis.insa-lyon.fr / clitk.git / blobdiff