fix: fix delete measure crash bug

src/src/Rendering/Measure/MeasureStore.cpp

@@ -9,22 +9,23 @@ MeasureStore *MeasureStore::instance = nullptr;
 
 void MeasureStore::Store(QString SeriesUid, int plane, int slice, Measure *measure) {
     if (!store.contains(SeriesUid)) {
-        store[SeriesUid] = QMap<int, QMap<int, QList<Measure *>>>();
+        store[SeriesUid] = QMap<int, QMap<int, std::shared_ptr<QList<Measure *>>>>();
     }
     if (!store[SeriesUid].contains(plane)) {
-        store[SeriesUid][plane] = QMap<int, QList<Measure *>>();
+        store[SeriesUid][plane] = QMap<int, std::shared_ptr<QList<Measure *>>>();
     }
     if (!store[SeriesUid][plane].contains(slice)) {
-        store[SeriesUid][plane][slice] = QList<Measure *>();
+        std::shared_ptr< QList<Measure *>> p(new QList<Measure *>());
+        store[SeriesUid][plane][slice] = p;
     }
     measure->SetMeasureID(
-            QString("%1-%2-%3-%4").arg(SeriesUid).arg(plane).arg(slice).arg(store[SeriesUid][plane][slice].size()));
+            QString("%1-%2-%3-%4").arg(SeriesUid).arg(plane).arg(slice).arg(store[SeriesUid][plane][slice]->size()));
     qDebug() << "store MeasureID:" << measure->GetMeasureID();
-    store[SeriesUid][plane][slice].push_back(measure);
+    store[SeriesUid][plane][slice]->push_back(measure);
-    qDebug() << "measure count:" << store[SeriesUid][plane][slice].size();
+    // qDebug() << "measure count:" << store[SeriesUid][plane][slice].size();
 }
 
-QList<Measure *> *MeasureStore::GetMeasures(QString SeriesUid, int plane, int slice) {
+std::shared_ptr<QList<Measure *>> MeasureStore::GetMeasures(QString SeriesUid, int plane, int slice) {
 
 //    qDebug() << "measure SeriesUid:" << SeriesUid << ", plane:" << plane << ", slice:" << slice;
     if (!store.contains(SeriesUid))
@@ -33,32 +34,33 @@ QList<Measure *> *MeasureStore::GetMeasures(QString SeriesUid, int plane, int sl
         return nullptr;
     if (!store[SeriesUid][plane].contains(slice))
         return nullptr;
-    qDebug() << "measure count:" << store[SeriesUid][plane][slice].size();
+    qDebug() << "measure count:" << store[SeriesUid][plane][slice]->size();
-    return &store[SeriesUid][plane][slice];
+    return store[SeriesUid][plane][slice];
 }
 
 void MeasureStore::Remove(Measure *measure) {
     QString id = measure->GetMeasureID();
     QStringList list = id.split("-");
     measure->ForceDelete();
-    store[list[0]][list[1].toInt()][list[2].toInt()].removeOne(measure);
+    store[list[0]][list[1].toInt()][list[2].toInt()]->removeOne(measure);
 
 }
 
 void MeasureStore::RemoveAllInSlice(QString SeriesUid, int plane, int slice) {
-    for (auto item:store[SeriesUid][plane][slice]) {
+    for (auto item:(*store[SeriesUid][plane][slice])) {
         item->ForceDelete();
     }
-    store[SeriesUid][plane][slice].clear();
+    store[SeriesUid][plane][slice]->clear();
+    store[SeriesUid][plane].remove(slice);
 }
 
 void MeasureStore::RemoveAllInSeries(QString SeriesUid) {
     for (auto series:store[SeriesUid]) {
         for (auto plane :series) {
-            for (auto item: plane) {
+            for (auto item: *plane) {
                 item->ForceDelete();
             }
-            plane.clear();
+            plane->clear();
         }
         series.clear();
     }
@@ -69,13 +71,13 @@ void MeasureStore::Clear() {
     for (auto item: store) {
         for (auto plane :item) {
             for (auto list :plane) {
-                for (auto m : list) {
+                for (auto m : *list) {
                     if (m) {
                         m->ForceDelete();
                         m = nullptr;
                     }
                 }
-                list.clear();
+                list->clear();
             }
         }
     }

src/src/Rendering/Measure/MeasureStore.h

@@ -9,6 +9,7 @@ class Measure;
 #include <unordered_map>
 #include <QMap>
 #include <QList>
+#include <memory>
 
 class MeasureStore {
 public:
@@ -29,10 +30,10 @@ public:
 
     void Clear();
 
-    QList<Measure *> *GetMeasures(QString SeriesUid, int plane, int slice);
+    std::shared_ptr<QList<Measure *>> GetMeasures(QString SeriesUid, int plane, int slice);
 
 private:
-    QMap<QString, QMap<int, QMap<int, QList<Measure *>>>> store;
+    QMap<QString, QMap<int, QMap<int, std::shared_ptr<QList<Measure *>>>>> store;
     static MeasureStore *instance;
 };
 

src/src/Rendering/Viewer/DICOMImageViewer.cxx

@@ -1133,17 +1133,20 @@ void DICOMImageViewer::LoadMeasures(bool forceReload) {
 void DICOMImageViewer::ReloadCurrentSliceMeasure() {
     list = measureStore->GetMeasures(SERIES_UID, this->SliceIJK, ImageMapper->GetSliceNumber());
 
-    if (list) {
+    if (list.use_count()>1) {
         for (int i = 0; i < list->length(); i++) {
             auto item = list->value(i);
             auto d = dynamic_cast<DraggableActor *>(item);
             if (d) d->SetRenderer(GetRenderer());
         }
     }
+    else{
+        list.reset();
+    }
 }
 
 void DICOMImageViewer::ClearCurrentSliceMeasure() const {
-    if (list) {
+    if (list.use_count()>1) {
         for (int i = 0; i < list->length(); i++) {
             auto item = list->value(i);
             auto d = dynamic_cast<DraggableActor *>(item);

src/src/Rendering/Viewer/DICOMImageViewer.h

@@ -1,6 +1,7 @@
 #ifndef infinitiViewer_h
 #define infinitiViewer_h
 
+#include <memory>
 #include "vtkInteractionImageModule.h" // For export macro
 #include "vtkObject.h"
 #include "vector"
@@ -423,7 +424,7 @@ private:
     //for convert vtkEvent to Qt signal
     vtkSignalRaiser raiser;
 
-    QList<Measure *> *list = nullptr;
+    std::shared_ptr<QList<Measure *>> list;
 
     MeasureStore *measureStore;