X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvQDicomSeriesSelector.cxx;h=d5444cdbe5b168317880b97895b8f741f7379045;hb=632adadb8b9230458aeab8ddccc736d674edc87a;hp=34c8e2192873eb61b8a91657ed09e87c9d53fdb3;hpb=ca6a1bf1319c88ce8717ad804c76c69cd6fcb87f;p=clitk.git diff --git a/vv/vvQDicomSeriesSelector.cxx b/vv/vvQDicomSeriesSelector.cxx index 34c8e21..d5444cd 100644 --- a/vv/vvQDicomSeriesSelector.cxx +++ b/vv/vvQDicomSeriesSelector.cxx @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr This software is distributed WITHOUT ANY WARRANTY; without even @@ -14,13 +14,13 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -======================================================================-====*/ +===========================================================================**/ #ifndef VVDICOMSERIESSELECTOR_CXX #define VVDICOMSERIESSELECTOR_CXX #include #include #include -#if GDCM_MAJOR_VERSION == 2 +#if GDCM_MAJOR_VERSION >= 2 #include #include #include @@ -58,6 +58,8 @@ vvDicomSeriesSelector::vvDicomSeriesSelector(QWidget* parent) this, SLOT(itemSelectionChanged())); connect(ui.mDicomDetailsListWidget, SIGNAL(itemSelectionChanged()), this, SLOT(itemDetailsSelectionChanged())); + connect(ui.mIsMatrixCheckBox, SIGNAL(stateChanged(int)), + this, SLOT(itemMatrixSelectionChanged(int))); // Initialization /* if (config::get_current_path() != QString(0)) @@ -67,6 +69,8 @@ vvDicomSeriesSelector::vvDicomSeriesSelector(QWidget* parent) mPreviousPath = mFoldername; ui.mFolderLineEdit->setText(mFoldername); + ui.mIsMatrixCheckBox->setChecked(0); + mPatientCoordinateSystem = false; // ui.mTableWidget->setRowCount(0); } //==================================================================== @@ -94,8 +98,12 @@ void vvDicomSeriesSelector::close() void vvDicomSeriesSelector::BrowseButtonRelease() { QFileDialog dialog(this); + QStringList filters; + filters << "DICOM files (*.dcm)" + << "All files (*)"; dialog.setFileMode(QFileDialog::AnyFile); - dialog.setFilter("DICOM files (*.dcm); All files (*)"); + dialog.setNameFilters(filters); + //dialog.setFilter(tr("DICOM files (*.dcm); All files (*)")); mFoldername = dialog.getExistingDirectory(this, "Select a folder to find DICOM image", mPreviousPath); @@ -136,11 +144,9 @@ void vvDicomSeriesSelector::SearchButtonRelease() mListOfSeriesFilenames[seriesUID[i]] = filenames; // store first header -#if GDCM_MAJOR_VERSION == 2 - gdcm::ImageReader reader; - reader.SetFileName( (*filenames)[0].c_str() ); - reader.Read(); - mDicomHeader[seriesUID[i]] = &reader.GetFile(); +#if GDCM_MAJOR_VERSION >= 2 + mDicomHeader[seriesUID[i]].SetFileName( (*filenames)[0].c_str() ); + mDicomHeader[seriesUID[i]].Read(); #else gdcm::File *header = new gdcm::File(); header->SetFileName((*filenames)[0]); @@ -204,7 +210,7 @@ void vvDicomSeriesSelector::itemSelectionChanged() if (mDicomInfo[mCurrentSerie] == "") { // QString m; // m = QString("Patient : %1
").arg(mDicomHeader[s]->GetEntryValue(0x0010,0x0010).c_str()); // Patient's name - DD(mCurrentSerie) + mDicomInfo[mCurrentSerie] = MakeDicomInfo(mCurrentSerie, mDicomHeader[mCurrentSerie]); } ui.mDicomInfoPanel->setText(mDicomInfo[mCurrentSerie]); @@ -227,20 +233,20 @@ void vvDicomSeriesSelector::itemDetailsSelectionChanged() if (isize()) { if (mDicomDetails[(*mFilenames)[i]] == "") { std::ostringstream s; - mDicomHeader[mCurrentSerie]->Print(s); - QString l; - gdcm::File * header = mDicomHeader[mCurrentSerie]; -#if GDCM_MAJOR_VERSION == 2 + +#if GDCM_MAJOR_VERSION >= 2 + mDicomHeader[mCurrentSerie].GetFile().Print(s); + const gdcm::File& header = mDicomHeader[mCurrentSerie].GetFile(); gdcm::StringFilter sf; - sf.SetFile( *header ); - gdcm::DataSet &ds = header->GetDataSet(); + sf.SetFile( header ); + const gdcm::DataSet &ds = header.GetDataSet(); gdcm::DataSet::ConstIterator it = ds.Begin(); for (; it != ds.End(); ++it ) { const gdcm::DataElement & ref = *it; const gdcm::Tag & tag = ref.GetTag(); - gdcm::VR vr = gdcm::DataSetHelper::ComputeVR(*header, ds, tag); + gdcm::VR vr = gdcm::DataSetHelper::ComputeVR(header, ds, tag); if ( vr & ( gdcm::VR::OB | gdcm::VR::OF | gdcm::VR::OW | gdcm::VR::SQ | gdcm::VR::UN ) ) { // What is the behavior for binary stuff ? @@ -257,6 +263,8 @@ void vvDicomSeriesSelector::itemDetailsSelectionChanged() } } #else + mDicomHeader[mCurrentSerie]->Print(s); + gdcm::File * header = mDicomHeader[mCurrentSerie]; gdcm::DocEntry * e = header->GetFirstEntry(); while (e) { if (e->GetName() != "gdcm::Unknown") { @@ -276,11 +284,11 @@ void vvDicomSeriesSelector::itemDetailsSelectionChanged() //==================================================================== //==================================================================== -QString vvDicomSeriesSelector::MakeDicomInfo(std::string & s, gdcm::File *header) +#if GDCM_MAJOR_VERSION >= 2 +QString vvDicomSeriesSelector::MakeDicomInfo(std::string & s, const gdcm::Reader& header) { QString n = QString("%1").arg(mListOfSeriesFilenames[s]->size()); -#if GDCM_MAJOR_VERSION == 2 - const gdcm::File &f = *header; + const gdcm::File &f = header.GetFile(); std::vector thespacing = gdcm::ImageHelper::GetSpacingValue(f); std::vector theorigin = gdcm::ImageHelper::GetOriginValue(f); @@ -299,18 +307,23 @@ QString vvDicomSeriesSelector::MakeDicomInfo(std::string & s, gdcm::File *header QString ss = //AddInfo( "Serie ID : ", s)+ - AddInfo(header, "Patient : ", 0x0010,0x0010)+ + AddInfo(&header.GetFile(), "Patient : ", 0x0010,0x0010)+ AddInfo( "Folder : ", QFileInfo((*mFilenames)[0].c_str()).canonicalPath().toStdString())+ - AddInfo(header, "Series Description : ", 0x0008,0x103e)+ - AddInfo(header, "Modality : ", 0x0008,0x0060)+ - AddInfo(header, "# images : ", 0x0020,0x0013)+ + AddInfo(&header.GetFile(), "Series Description : ", 0x0008,0x103e)+ + AddInfo(&header.GetFile(), "Modality : ", 0x0008,0x0060)+ + AddInfo(&header.GetFile(), "# images : ", 0x0020,0x0013)+ AddInfo( "# files : ", n.toStdString())+ AddInfo( "Size : ", size.toStdString())+ AddInfo( "Spacing : ", spacing.toStdString())+ AddInfo( "Origin : ", origin.toStdString())+ - AddInfo(header, "Pixel size : ", 0x0028,0x0100)+ - AddInfo( "Pixel type : ", 0); + AddInfo(&header.GetFile(), "Pixel size : ", 0x0028,0x0100)+ + AddInfo( "Pixel type : ", ""); + return ss; +} #else +QString vvDicomSeriesSelector::MakeDicomInfo(std::string & s, gdcm::File *header) +{ + QString n = QString("%1").arg(mListOfSeriesFilenames[s]->size()); QString size = QString("%1x%2x%3") .arg(header->GetXSize()) .arg(header->GetYSize()) @@ -336,22 +349,22 @@ QString vvDicomSeriesSelector::MakeDicomInfo(std::string & s, gdcm::File *header AddInfo( "Origin : ", origin.toStdString())+ AddInfo(header, "Pixel size : ", 0x0028,0x0100)+ AddInfo( "Pixel type : ", header->GetPixelType()); -#endif return ss; } +#endif //==================================================================== //==================================================================== -QString vvDicomSeriesSelector::AddInfo(gdcm::File *header, QString n, uint16_t group, uint16_t elem) +QString vvDicomSeriesSelector::AddInfo(const gdcm::File *header, QString n, uint16_t group, uint16_t elem) { -#if GDCM_MAJOR_VERSION == 2 +#if GDCM_MAJOR_VERSION >= 2 gdcm::StringFilter sf; sf.SetFile( *header ); gdcm::Tag t( group, elem ); std::string s = sf.ToString( t ); return AddInfo(n.toStdString(), s); #else - return AddInfo(n.toStdString(), header->GetEntryValue(group, elem)); + return AddInfo(n.toStdString(), const_cast(header)->GetEntryValue(group, elem)); #endif } //==================================================================== @@ -368,7 +381,7 @@ QString vvDicomSeriesSelector::AddInfo(std::string n, std::string m) //==================================================================== void vvDicomSeriesSelector::AddSerieToTheTable(int i, std::vector & filenames) { -#if GDCM_MAJOR_VERSION == 2 +#if GDCM_MAJOR_VERSION >= 2 #else gdcm::File *header = new gdcm::File(); header->SetFileName(filenames[0]); @@ -392,4 +405,13 @@ void vvDicomSeriesSelector::AddSerieToTheTable(int i, std::vector & } //==================================================================== + +//==================================================================== +void vvDicomSeriesSelector::itemMatrixSelectionChanged(int state) +{ + mPatientCoordinateSystem = state; +} +//==================================================================== + + #endif // VVDICOMSERIESSELECTOR_CXX