sunwen/DCMV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove InstancesVecType

Browse Source
This commit is contained in:
Krad
2022-03-03 14:07:04 +08:00
parent f31e0857b7
commit 8b0068b1ed
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/include/global/QGlobals.h
View File

@@ -363,7 +363,7 @@ private:
}; };
typedef std::vector <SeriesImageSet*> InstancesVecType; //typedef std::vector <SeriesImageSet*> InstancesVecType;
typedef struct SeriesInfo typedef struct SeriesInfo
{ {
@@ -374,8 +374,12 @@ typedef struct SeriesInfo
std::string unique_id; std::string unique_id;
DicomTagInfo_t* tag_info; DicomTagInfo_t* tag_info;
thumbnailImage* thumb_nail; thumbnailImage* thumb_nail;
InstancesVecType* instances; // InstancesVecType* instances;
SeriesInfo() : pixmap_valid(false), unique_id(""), tag_info(nullptr), thumb_nail(nullptr), instances(nullptr) {} SeriesInfo() : pixmap_valid(false), unique_id(""), tag_info(nullptr), thumb_nail(nullptr) {}
~SeriesInfo(){
delete tag_info;
//delete thumb_nail;
}
}SeriesInfo_t; }SeriesInfo_t;
typedef std::map<std::string, SeriesInfo_t*> SeriesMapType; typedef std::map<std::string, SeriesInfo_t*> SeriesMapType;

21
src/src/export/exportdialog.cpp
View File

@@ -79,16 +79,17 @@ void ExportDialog::onBtnExportClicked()
} }
else if (ui->rbAllOpendSeries->isChecked())// all opened series else if (ui->rbAllOpendSeries->isChecked())// all opened series
{ {
InstancesVecType instanceVec; //disable this function
DicomLoader::GetInstance()->getOpenedInstancesVec(instanceVec); // InstancesVecType instanceVec;
for (int i = 0; i < instanceVec.size(); i++) // DicomLoader::GetInstance()->getOpenedInstancesVec(instanceVec);
{ // for (int i = 0; i < instanceVec.size(); i++)
SeriesImageSet *instance = instanceVec.at(i); // {
if (instance != nullptr) // SeriesImageSet *instance = instanceVec.at(i);
{ // if (instance != nullptr)
options.inputData.push_back(instance->getCurSeriesName()); // {
} // options.inputData.push_back(instance->getCurSeriesName());
} // }
// }
} }
if (ui->rbJPEG->isChecked()) if (ui->rbJPEG->isChecked())