Mercurial > hg > orthanc-stone

changeset 934:094d10ed7ec2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
VolumeSceneLayerSource dtor now clears the layer
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 29 Jul 2019 13:46:29 +0200
parents f75f6cb69c1b
children 401808e7ff2e
files Framework/Scene2D/Scene2D.cpp Framework/Volumes/VolumeSceneLayerSource.cpp Framework/Volumes/VolumeSceneLayerSource.h
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Scene2D/Scene2D.cpp	Fri Jul 26 20:09:42 2019 +0200
+++ b/Framework/Scene2D/Scene2D.cpp	Mon Jul 29 13:46:29 2019 +0200
@@ -132,7 +132,7 @@
 
     if (found != content_.end())
     {
-      LOG(INFO) << "DeleteLayer --found-- (" << depth << ")";
+      LOG(TRACE) << "DeleteLayer --found-- (" << depth << ")";
       assert(found->second != NULL);
       delete found->second;
       content_.erase(found);
--- a/Framework/Volumes/VolumeSceneLayerSource.cpp	Fri Jul 26 20:09:42 2019 +0200
+++ b/Framework/Volumes/VolumeSceneLayerSource.cpp	Mon Jul 29 13:46:29 2019 +0200
@@ -55,6 +55,10 @@
     }
   }
 
+  VolumeSceneLayerSource::~VolumeSceneLayerSource()
+  {
+    ClearLayer();
+  }
 
   void VolumeSceneLayerSource::RemoveConfigurator()
   {
--- a/Framework/Volumes/VolumeSceneLayerSource.h	Fri Jul 26 20:09:42 2019 +0200
+++ b/Framework/Volumes/VolumeSceneLayerSource.h	Mon Jul 29 13:46:29 2019 +0200
@@ -53,6 +53,8 @@
                            int layerDepth,
                            const boost::shared_ptr<IVolumeSlicer>& slicer);
 
+    ~VolumeSceneLayerSource();
+
     const IVolumeSlicer& GetSlicer() const
     {
       return *slicer_;