Clearing property list works if you remove the data nodes upon disconnect.

Author: Thomas Kilgus

Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.cpp

@@ -65,14 +65,7 @@ bool ToFCameraMITKPlayerDevice::DisconnectCamera()
   if (ok)
   {
     m_CameraConnected = false;
-//    m_PropertyList->DeleteProperty("HasAmplitudeImage");
-//    m_PropertyList->DeleteProperty("HasIntensityImage");
-//    m_PropertyList->DeleteProperty("HasRGBImage");
-//    m_PropertyList->DeleteProperty("DistanceImageFileName");
-//    m_PropertyList->DeleteProperty("AmplitudeImageFileName");
-//    m_PropertyList->DeleteProperty("IntensityImageFileName");
-//    m_PropertyList->DeleteProperty("RGBImageFileName");
-//    m_PropertyList->DeleteProperty("RGBImageHasDifferentResolution");
+    m_PropertyList->Clear();
   }
   return ok;
 }

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

@@ -150,7 +150,7 @@ void QmitkToFConnectionWidget::OnConnectCamera()
       {
         MITK_INFO<< "Kinect is connected here";
         //If the particular property is selected, the suitable data-node will be generated
-        this->m_ToFImageGrabber->SetBoolProperty("RGB", m_Controls->m_KinectParameterWidget->IsAcquisitionModeRGB());//--------------------------------------------------------
+        this->m_ToFImageGrabber->SetBoolProperty("RGB", m_Controls->m_KinectParameterWidget->IsAcquisitionModeRGB());
         this->m_ToFImageGrabber->SetBoolProperty("IR", m_Controls->m_KinectParameterWidget->IsAcquisitionModeIR());
       }
 

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

@@ -245,6 +245,16 @@ void QmitkToFUtilView::ResetGUIToDefault()
 
 void QmitkToFUtilView::OnToFCameraDisconnected()
 {
+  this->GetDataStorage()->Remove(m_DistanceImageNode);
+  if(m_RGBImageNode)
+    this->GetDataStorage()->Remove(m_RGBImageNode);
+  if(m_AmplitudeImageNode)
+    this->GetDataStorage()->Remove(m_AmplitudeImageNode);
+  if(m_IntensityImageNode)
+    this->GetDataStorage()->Remove(m_IntensityImageNode);
+  if(m_SurfaceNode)
+    this->GetDataStorage()->Remove(m_SurfaceNode);
+
   m_Controls->m_ToFRecorderWidget->OnStop();
   m_Controls->m_ToFRecorderWidget->setEnabled(false);
   m_Controls->m_ToFVisualisationSettingsWidget->setEnabled(false);