diff --git a/src/include/global/QGlobals.h b/src/include/global/QGlobals.h index 7f07f9c..adadbe3 100644 --- a/src/include/global/QGlobals.h +++ b/src/include/global/QGlobals.h @@ -363,7 +363,7 @@ private: }; -typedef std::vector InstancesVecType; +//typedef std::vector InstancesVecType; typedef struct SeriesInfo { @@ -374,8 +374,12 @@ typedef struct SeriesInfo std::string unique_id; DicomTagInfo_t* tag_info; thumbnailImage* thumb_nail; - InstancesVecType* instances; - SeriesInfo() : pixmap_valid(false), unique_id(""), tag_info(nullptr), thumb_nail(nullptr), instances(nullptr) {} +// InstancesVecType* instances; + SeriesInfo() : pixmap_valid(false), unique_id(""), tag_info(nullptr), thumb_nail(nullptr) {} + ~SeriesInfo(){ + delete tag_info; + //delete thumb_nail; + } }SeriesInfo_t; typedef std::map SeriesMapType; diff --git a/src/src/export/exportdialog.cpp b/src/src/export/exportdialog.cpp index 78b96ea..b405f14 100644 --- a/src/src/export/exportdialog.cpp +++ b/src/src/export/exportdialog.cpp @@ -79,16 +79,17 @@ void ExportDialog::onBtnExportClicked() } else if (ui->rbAllOpendSeries->isChecked())// all opened series { - InstancesVecType instanceVec; - DicomLoader::GetInstance()->getOpenedInstancesVec(instanceVec); - for (int i = 0; i < instanceVec.size(); i++) - { - SeriesImageSet *instance = instanceVec.at(i); - if (instance != nullptr) - { - options.inputData.push_back(instance->getCurSeriesName()); - } - } + //disable this function +// InstancesVecType instanceVec; +// DicomLoader::GetInstance()->getOpenedInstancesVec(instanceVec); +// for (int i = 0; i < instanceVec.size(); i++) +// { +// SeriesImageSet *instance = instanceVec.at(i); +// if (instance != nullptr) +// { +// options.inputData.push_back(instance->getCurSeriesName()); +// } +// } } if (ui->rbJPEG->isChecked())