diff --git a/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp b/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp
index 9c591db1ac..6c3d3fffbc 100644
--- a/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp
+++ b/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp
@@ -1,663 +1,663 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 // Blueberry
 #include <mitkIRenderingManager.h>
 #include <mitkIRenderWindowPart.h>
 #include <mitkILinkedRenderWindowPart.h>
 
 
 // Qmitk
 #include "QmitkToFUtilView.h"
 #include <QmitkStdMultiWidget.h>
 #include <QmitkTextOverlay.h>
 
 // Qt
 #include <QMessageBox>
 #include <QString>
 
 //QT headers
 #include <qmessagebox.h>
 #include <qfiledialog.h>
 #include <qcombobox.h>
 
 // MITK
 #include <mitkBaseRenderer.h>
 #include <mitkGlobalInteraction.h>
 #include <mitkLookupTableProperty.h>
 #include <mitkToFDistanceImageToPointSetFilter.h>
 #include <mitkTransferFunction.h>
 #include <mitkTransferFunctionProperty.h>
 
 #include <mitkToFDeviceFactoryManager.h>
 #include <mitkToFCameraDevice.h>
 #include <mitkCameraIntrinsicsProperty.h>
 
 //itk headers
 #include <itksys/SystemTools.hxx>
 
 // VTK
 #include <vtkCamera.h>
 
 // ITK
 #include <itkCommand.h>
 #include <mitkRenderingModeProperty.h>
 
 const std::string QmitkToFUtilView::VIEW_ID = "org.mitk.views.tofutil";
 
 //Constructor
 QmitkToFUtilView::QmitkToFUtilView()
-    : QmitkAbstractView()
-    , m_Controls(NULL), m_MultiWidget( NULL )
-    , m_MitkDistanceImage(NULL), m_MitkAmplitudeImage(NULL), m_MitkIntensityImage(NULL), m_Surface(NULL)
-    , m_DistanceImageNode(NULL), m_AmplitudeImageNode(NULL), m_IntensityImageNode(NULL), m_RGBImageNode(NULL), m_SurfaceNode(NULL)
-    , m_ToFImageRecorder(NULL), m_ToFImageGrabber(NULL), m_ToFDistanceImageToSurfaceFilter(NULL), m_ToFCompositeFilter(NULL)
-    , m_2DDisplayCount(0)
-    , m_RealTimeClock(NULL)
-    , m_StepsForFramerate(100)
-    , m_2DTimeBefore(0.0)
-    , m_2DTimeAfter(0.0)
-    , m_CameraIntrinsics(NULL)
+  : QmitkAbstractView()
+  , m_Controls(NULL), m_MultiWidget( NULL )
+  , m_MitkDistanceImage(NULL), m_MitkAmplitudeImage(NULL), m_MitkIntensityImage(NULL), m_Surface(NULL)
+  , m_DistanceImageNode(NULL), m_AmplitudeImageNode(NULL), m_IntensityImageNode(NULL), m_RGBImageNode(NULL), m_SurfaceNode(NULL)
+  , m_ToFImageRecorder(NULL), m_ToFImageGrabber(NULL), m_ToFDistanceImageToSurfaceFilter(NULL), m_ToFCompositeFilter(NULL)
+  , m_2DDisplayCount(0)
+  , m_RealTimeClock(NULL)
+  , m_StepsForFramerate(100)
+  , m_2DTimeBefore(0.0)
+  , m_2DTimeAfter(0.0)
+  , m_CameraIntrinsics(NULL)
 {
-    this->m_Frametimer = new QTimer(this);
+  this->m_Frametimer = new QTimer(this);
 
-    this->m_ToFDistanceImageToSurfaceFilter = mitk::ToFDistanceImageToSurfaceFilter::New();
-    this->m_ToFCompositeFilter = mitk::ToFCompositeFilter::New();
-    this->m_ToFImageRecorder = mitk::ToFImageRecorder::New();
-    this->m_ToFSurfaceVtkMapper3D = mitk::ToFSurfaceVtkMapper3D::New();
+  this->m_ToFDistanceImageToSurfaceFilter = mitk::ToFDistanceImageToSurfaceFilter::New();
+  this->m_ToFCompositeFilter = mitk::ToFCompositeFilter::New();
+  this->m_ToFImageRecorder = mitk::ToFImageRecorder::New();
+  this->m_ToFSurfaceVtkMapper3D = mitk::ToFSurfaceVtkMapper3D::New();
 }
 
 //Destructor, specifically calling OnToFCameraStopped() and OnToFCammeraDiconnected()
 QmitkToFUtilView::~QmitkToFUtilView()
 {
-    OnToFCameraStopped();
-    OnToFCameraDisconnected();
+  OnToFCameraStopped();
+  OnToFCameraDisconnected();
 }
 
 //Createing the PartControl Signal-Slot principal
 void QmitkToFUtilView::CreateQtPartControl( QWidget *parent )
 {
-    // build up qt view, unless already done
-    if ( !m_Controls )
-    {
-        // create GUI widgets from the Qt Designer's .ui file
-        m_Controls = new Ui::QmitkToFUtilViewControls;
-        m_Controls->setupUi( parent );
-
-        //Looking for Input and Defining reaction
-        connect(m_Frametimer, SIGNAL(timeout()), this, SLOT(OnUpdateCamera()));
-
-        connect( (QObject*)(m_Controls->m_ToFConnectionWidget), SIGNAL(KinectAcquisitionModeChanged()), this, SLOT(OnKinectAcquisitionModeChanged()) ); // Todo in Widget2
-        connect( (QObject*)(m_Controls->m_ToFConnectionWidget), SIGNAL(ToFCameraConnected()), this, SLOT(OnToFCameraConnected()) );
-        connect( (QObject*)(m_Controls->m_ToFConnectionWidget), SIGNAL(ToFCameraDisconnected()), this, SLOT(OnToFCameraDisconnected()) );
-        connect( (QObject*)(m_Controls->m_ToFConnectionWidget), SIGNAL(ToFCameraSelected(const QString)), this, SLOT(OnToFCameraSelected(const QString)) );
-        connect( (QObject*)(m_Controls->m_ToFRecorderWidget), SIGNAL(ToFCameraStarted()), this, SLOT(OnToFCameraStarted()) );
-        connect( (QObject*)(m_Controls->m_ToFRecorderWidget), SIGNAL(ToFCameraStopped()), this, SLOT(OnToFCameraStopped()) );
-        connect( (QObject*)(m_Controls->m_ToFRecorderWidget), SIGNAL(RecordingStarted()), this, SLOT(OnToFCameraStopped()) );
-        connect( (QObject*)(m_Controls->m_ToFRecorderWidget), SIGNAL(RecordingStopped()), this, SLOT(OnToFCameraStarted()) );
-        connect( (QObject*)(m_Controls->m_SurfaceCheckBox), SIGNAL(toggled(bool)), this, SLOT(OnSurfaceCheckboxChecked(bool)) );
-        connect( (QObject*)(m_Controls->m_TextureCheckBox), SIGNAL(toggled(bool)), this, SLOT(OnTextureCheckBoxChecked(bool)) );
-        connect( (QObject*)(m_Controls->m_KinectTextureCheckBox), SIGNAL(toggled(bool)), this, SLOT(OnKinectRGBTextureCheckBoxChecked(bool)) );
+  // build up qt view, unless already done
+  if ( !m_Controls )
+  {
+    // create GUI widgets from the Qt Designer's .ui file
+    m_Controls = new Ui::QmitkToFUtilViewControls;
+    m_Controls->setupUi( parent );
+
+    //Looking for Input and Defining reaction
+    connect(m_Frametimer, SIGNAL(timeout()), this, SLOT(OnUpdateCamera()));
+
+    connect( (QObject*)(m_Controls->m_ToFConnectionWidget), SIGNAL(KinectAcquisitionModeChanged()), this, SLOT(OnKinectAcquisitionModeChanged()) ); // Todo in Widget2
+    connect( (QObject*)(m_Controls->m_ToFConnectionWidget), SIGNAL(ToFCameraConnected()), this, SLOT(OnToFCameraConnected()) );
+    connect( (QObject*)(m_Controls->m_ToFConnectionWidget), SIGNAL(ToFCameraDisconnected()), this, SLOT(OnToFCameraDisconnected()) );
+    connect( (QObject*)(m_Controls->m_ToFConnectionWidget), SIGNAL(ToFCameraSelected(const QString)), this, SLOT(OnToFCameraSelected(const QString)) );
+    connect( (QObject*)(m_Controls->m_ToFRecorderWidget), SIGNAL(ToFCameraStarted()), this, SLOT(OnToFCameraStarted()) );
+    connect( (QObject*)(m_Controls->m_ToFRecorderWidget), SIGNAL(ToFCameraStopped()), this, SLOT(OnToFCameraStopped()) );
+    connect( (QObject*)(m_Controls->m_ToFRecorderWidget), SIGNAL(RecordingStarted()), this, SLOT(OnToFCameraStopped()) );
+    connect( (QObject*)(m_Controls->m_ToFRecorderWidget), SIGNAL(RecordingStopped()), this, SLOT(OnToFCameraStarted()) );
+    connect( (QObject*)(m_Controls->m_SurfaceCheckBox), SIGNAL(toggled(bool)), this, SLOT(OnSurfaceCheckboxChecked(bool)) );
+    connect( (QObject*)(m_Controls->m_TextureCheckBox), SIGNAL(toggled(bool)), this, SLOT(OnTextureCheckBoxChecked(bool)) );
+    connect( (QObject*)(m_Controls->m_KinectTextureCheckBox), SIGNAL(toggled(bool)), this, SLOT(OnKinectRGBTextureCheckBoxChecked(bool)) );
 
-    }
+  }
 }
 
 //SetFocus-Method -> actually seting Focus to the Recorder
 void QmitkToFUtilView::SetFocus()
 {
-    m_Controls->m_ToFRecorderWidget->setFocus();
+  m_Controls->m_ToFRecorderWidget->setFocus();
 }
 
 //Activated-Method->Generating RenderWindow
 void QmitkToFUtilView::Activated()
 {
-    //get the current RenderWindowPart or open a new one if there is none
-    if(this->GetRenderWindowPart(OPEN))
+  //get the current RenderWindowPart or open a new one if there is none
+  if(this->GetRenderWindowPart(OPEN))
+  {
+    mitk::ILinkedRenderWindowPart* linkedRenderWindowPart = dynamic_cast<mitk::ILinkedRenderWindowPart*>(this->GetRenderWindowPart());
+    if(linkedRenderWindowPart == 0)
+    {
+      MITK_ERROR << "No linked StdMultiWidget avaiable!!!";
+    }
+    else
+    {
+      linkedRenderWindowPart->EnableSlicingPlanes(false);
+    }
+    GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetSliceNavigationController()->SetDefaultViewDirection(mitk::SliceNavigationController::Axial);
+    GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetSliceNavigationController()->SliceLockedOn();
+    GetRenderWindowPart()->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController()->SetDefaultViewDirection(mitk::SliceNavigationController::Axial);
+    GetRenderWindowPart()->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController()->SliceLockedOn();
+    GetRenderWindowPart()->GetQmitkRenderWindow("coronal")->GetSliceNavigationController()->SetDefaultViewDirection(mitk::SliceNavigationController::Axial);
+    GetRenderWindowPart()->GetQmitkRenderWindow("coronal")->GetSliceNavigationController()->SliceLockedOn();
+
+    this->GetRenderWindowPart()->GetRenderingManager()->InitializeViews();
+
+    this->UseToFVisibilitySettings(true);
+
+    if (this->m_ToFCompositeFilter)
     {
-        mitk::ILinkedRenderWindowPart* linkedRenderWindowPart = dynamic_cast<mitk::ILinkedRenderWindowPart*>(this->GetRenderWindowPart());
-        if(linkedRenderWindowPart == 0)
-        {
-            MITK_ERROR << "No linked StdMultiWidget avaiable!!!";
-        }
-        else
-        {
-            linkedRenderWindowPart->EnableSlicingPlanes(false);
-        }
-        GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetSliceNavigationController()->SetDefaultViewDirection(mitk::SliceNavigationController::Axial);
-        GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetSliceNavigationController()->SliceLockedOn();
-        GetRenderWindowPart()->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController()->SetDefaultViewDirection(mitk::SliceNavigationController::Axial);
-        GetRenderWindowPart()->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController()->SliceLockedOn();
-        GetRenderWindowPart()->GetQmitkRenderWindow("coronal")->GetSliceNavigationController()->SetDefaultViewDirection(mitk::SliceNavigationController::Axial);
-        GetRenderWindowPart()->GetQmitkRenderWindow("coronal")->GetSliceNavigationController()->SliceLockedOn();
-
-        this->GetRenderWindowPart()->GetRenderingManager()->InitializeViews();
-
-        this->UseToFVisibilitySettings(true);
-
-        if (this->m_ToFCompositeFilter)
-        {
-            m_Controls->m_ToFCompositeFilterWidget->SetToFCompositeFilter(this->m_ToFCompositeFilter);
-        }
-        if (this->GetDataStorage())
-        {
-            m_Controls->m_ToFCompositeFilterWidget->SetDataStorage(this->GetDataStorage());
-        }
-
-        if (this->m_ToFImageGrabber.IsNull())
-        {
-            m_Controls->m_ToFRecorderWidget->setEnabled(false);
-            m_Controls->m_ToFVisualisationSettingsWidget->setEnabled(false);
-            m_Controls->m_ToFCompositeFilterWidget->setEnabled(false);
-            m_Controls->tofMeasurementWidget->setEnabled(false);
-            m_Controls->SurfacePropertiesBox->setEnabled(false);
-        }
+      m_Controls->m_ToFCompositeFilterWidget->SetToFCompositeFilter(this->m_ToFCompositeFilter);
     }
+    if (this->GetDataStorage())
+    {
+      m_Controls->m_ToFCompositeFilterWidget->SetDataStorage(this->GetDataStorage());
+    }
+
+    if (this->m_ToFImageGrabber.IsNull())
+    {
+      m_Controls->m_ToFRecorderWidget->setEnabled(false);
+      m_Controls->m_ToFVisualisationSettingsWidget->setEnabled(false);
+      m_Controls->m_ToFCompositeFilterWidget->setEnabled(false);
+      m_Controls->tofMeasurementWidget->setEnabled(false);
+      m_Controls->SurfacePropertiesBox->setEnabled(false);
+    }
+  }
 }
 
 //ZomnnieView-Method -> Resetting GUI to default. Why not just QmitkToFUtilView()?!
 void QmitkToFUtilView::ActivatedZombieView(berry::IWorkbenchPartReference::Pointer /*zombieView*/)
 {
-    ResetGUIToDefault();
+  ResetGUIToDefault();
 }
 
 void QmitkToFUtilView::Deactivated()
 {
 }
 
 void QmitkToFUtilView::Visible()
 {
 }
 
 //Reset of the ToFUtilView
 void QmitkToFUtilView::Hidden()
 {
-    ResetGUIToDefault();
+  ResetGUIToDefault();
 }
 
 void QmitkToFUtilView::OnToFCameraConnected()
 {
-    MITK_DEBUG <<"OnToFCameraConnected";
-    this->m_2DDisplayCount = 0;
+  MITK_DEBUG <<"OnToFCameraConnected";
+  this->m_2DDisplayCount = 0;
+
+  this->m_ToFImageGrabber = m_Controls->m_ToFConnectionWidget->GetToFImageGrabber();
+
+  // initialize surface generation
+  this->m_ToFDistanceImageToSurfaceFilter = mitk::ToFDistanceImageToSurfaceFilter::New();
+  this->m_ToFSurfaceVtkMapper3D = mitk::ToFSurfaceVtkMapper3D::New();
+
+  // initialize ToFImageRecorder and ToFRecorderWidget
+  this->m_ToFImageRecorder = mitk::ToFImageRecorder::New();
+  this->m_ToFImageRecorder->SetCameraDevice(this->m_ToFImageGrabber->GetCameraDevice());
+  m_Controls->m_ToFRecorderWidget->SetParameter(this->m_ToFImageGrabber, this->m_ToFImageRecorder);
+  m_Controls->m_ToFRecorderWidget->setEnabled(true);
+  m_Controls->m_ToFRecorderWidget->ResetGUIToInitial();
+  m_Controls->m_ToFVisualisationSettingsWidget->setEnabled(false);
+
+  // initialize ToFCompositeFilterWidget
+  this->m_ToFCompositeFilter = mitk::ToFCompositeFilter::New();
+  if (this->m_ToFCompositeFilter)
+  {
+    m_Controls->m_ToFCompositeFilterWidget->SetToFCompositeFilter(this->m_ToFCompositeFilter);
+  }
+  if (this->GetDataStorage())
+  {
+    m_Controls->m_ToFCompositeFilterWidget->SetDataStorage(this->GetDataStorage());
+  }
 
-    this->m_ToFImageGrabber = m_Controls->m_ToFConnectionWidget->GetToFImageGrabber();
+  // initialize measurement widget
+  m_Controls->tofMeasurementWidget->InitializeWidget(this->GetRenderWindowPart()->GetQmitkRenderWindows(),this->GetDataStorage(), this->m_ToFDistanceImageToSurfaceFilter->GetCameraIntrinsics());
 
-    // initialize surface generation
-    this->m_ToFDistanceImageToSurfaceFilter = mitk::ToFDistanceImageToSurfaceFilter::New();
-    this->m_ToFSurfaceVtkMapper3D = mitk::ToFSurfaceVtkMapper3D::New();
+  this->m_RealTimeClock = mitk::RealTimeClock::New();
+  this->m_2DTimeBefore = this->m_RealTimeClock->GetCurrentStamp();
 
-    // initialize ToFImageRecorder and ToFRecorderWidget
-    this->m_ToFImageRecorder = mitk::ToFImageRecorder::New();
-    this->m_ToFImageRecorder->SetCameraDevice(this->m_ToFImageGrabber->GetCameraDevice());
-    m_Controls->m_ToFRecorderWidget->SetParameter(this->m_ToFImageGrabber, this->m_ToFImageRecorder);
-    m_Controls->m_ToFRecorderWidget->setEnabled(true);
-    m_Controls->m_ToFRecorderWidget->ResetGUIToInitial();
-    m_Controls->m_ToFVisualisationSettingsWidget->setEnabled(false);
+  this->RequestRenderWindowUpdate();
+}
 
-    // initialize ToFCompositeFilterWidget
-    this->m_ToFCompositeFilter = mitk::ToFCompositeFilter::New();
-    if (this->m_ToFCompositeFilter)
+void QmitkToFUtilView::ResetGUIToDefault()
+{
+  if(this->GetRenderWindowPart())
+  {
+    mitk::ILinkedRenderWindowPart* linkedRenderWindowPart = dynamic_cast<mitk::ILinkedRenderWindowPart*>(this->GetRenderWindowPart());
+    if(linkedRenderWindowPart == 0)
     {
-        m_Controls->m_ToFCompositeFilterWidget->SetToFCompositeFilter(this->m_ToFCompositeFilter);
+      MITK_ERROR << "No linked StdMultiWidget avaiable!!!";
     }
-    if (this->GetDataStorage())
+    else
     {
-        m_Controls->m_ToFCompositeFilterWidget->SetDataStorage(this->GetDataStorage());
+      linkedRenderWindowPart->EnableSlicingPlanes(true);
     }
+    GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetSliceNavigationController()->SetDefaultViewDirection(mitk::SliceNavigationController::Axial);
+    GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetSliceNavigationController()->SliceLockedOff();
+    GetRenderWindowPart()->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController()->SetDefaultViewDirection(mitk::SliceNavigationController::Sagittal);
+    GetRenderWindowPart()->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController()->SliceLockedOff();
+    GetRenderWindowPart()->GetQmitkRenderWindow("coronal")->GetSliceNavigationController()->SetDefaultViewDirection(mitk::SliceNavigationController::Frontal);
+    GetRenderWindowPart()->GetQmitkRenderWindow("coronal")->GetSliceNavigationController()->SliceLockedOff();
 
-    // initialize measurement widget
-    m_Controls->tofMeasurementWidget->InitializeWidget(this->GetRenderWindowPart()->GetQmitkRenderWindows(),this->GetDataStorage(), this->m_ToFDistanceImageToSurfaceFilter->GetCameraIntrinsics());
-
-    this->m_RealTimeClock = mitk::RealTimeClock::New();
-    this->m_2DTimeBefore = this->m_RealTimeClock->GetCurrentStamp();
+    this->UseToFVisibilitySettings(false);
 
+    //global reinit
+    this->GetRenderWindowPart()->GetRenderingManager()->InitializeViews();
     this->RequestRenderWindowUpdate();
-}
-
-void QmitkToFUtilView::ResetGUIToDefault()
-{
-    if(this->GetRenderWindowPart())
-    {
-        mitk::ILinkedRenderWindowPart* linkedRenderWindowPart = dynamic_cast<mitk::ILinkedRenderWindowPart*>(this->GetRenderWindowPart());
-        if(linkedRenderWindowPart == 0)
-        {
-            MITK_ERROR << "No linked StdMultiWidget avaiable!!!";
-        }
-        else
-        {
-            linkedRenderWindowPart->EnableSlicingPlanes(true);
-        }
-        GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetSliceNavigationController()->SetDefaultViewDirection(mitk::SliceNavigationController::Axial);
-        GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetSliceNavigationController()->SliceLockedOff();
-        GetRenderWindowPart()->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController()->SetDefaultViewDirection(mitk::SliceNavigationController::Sagittal);
-        GetRenderWindowPart()->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController()->SliceLockedOff();
-        GetRenderWindowPart()->GetQmitkRenderWindow("coronal")->GetSliceNavigationController()->SetDefaultViewDirection(mitk::SliceNavigationController::Frontal);
-        GetRenderWindowPart()->GetQmitkRenderWindow("coronal")->GetSliceNavigationController()->SliceLockedOff();
-
-        this->UseToFVisibilitySettings(false);
-
-        //global reinit
-        this->GetRenderWindowPart()->GetRenderingManager()->InitializeViews();
-        this->RequestRenderWindowUpdate();
-    }
+  }
 }
 
 void QmitkToFUtilView::OnToFCameraDisconnected()
 {
-    m_Controls->m_ToFRecorderWidget->OnStop();
-    m_Controls->m_ToFRecorderWidget->setEnabled(false);
-    m_Controls->m_ToFVisualisationSettingsWidget->setEnabled(false);
-    m_Controls->tofMeasurementWidget->setEnabled(false);
-    m_Controls->SurfacePropertiesBox->setEnabled(false);
-    //clean up measurement widget
-    m_Controls->tofMeasurementWidget->CleanUpWidget();
+  m_Controls->m_ToFRecorderWidget->OnStop();
+  m_Controls->m_ToFRecorderWidget->setEnabled(false);
+  m_Controls->m_ToFVisualisationSettingsWidget->setEnabled(false);
+  m_Controls->tofMeasurementWidget->setEnabled(false);
+  m_Controls->SurfacePropertiesBox->setEnabled(false);
+  //clean up measurement widget
+  m_Controls->tofMeasurementWidget->CleanUpWidget();
 }
 
 void QmitkToFUtilView::OnKinectAcquisitionModeChanged()
 {
-    if (m_ToFCompositeFilter.IsNotNull()&&m_ToFImageGrabber.IsNotNull())
+  if (m_ToFCompositeFilter.IsNotNull()&&m_ToFImageGrabber.IsNotNull())
+  {
+    if (m_SelectedCamera.contains("Kinect"))
     {
-        if (m_SelectedCamera.contains("Kinect"))
-        {
-            if (m_ToFImageGrabber->GetBoolProperty("RGB"))
-            {
-                this->m_RGBImageNode = ReplaceNodeData("RGB image",this->m_ToFImageGrabber->GetOutput(3));
-                this->m_ToFDistanceImageToSurfaceFilter->SetInput(3,this->m_ToFImageGrabber->GetOutput(3));
-            }
-            else if (m_ToFImageGrabber->GetBoolProperty("IR"))
-            {
-                this->m_MitkAmplitudeImage = m_ToFCompositeFilter->GetOutput(1);
-                this->m_AmplitudeImageNode = ReplaceNodeData("Amplitude image",m_MitkAmplitudeImage);
-            }
-        }
-        this->UseToFVisibilitySettings(true);
+      if (m_ToFImageGrabber->GetBoolProperty("RGB"))
+      {
+        this->m_RGBImageNode = ReplaceNodeData("RGB image",this->m_ToFImageGrabber->GetOutput(3));
+        this->m_ToFDistanceImageToSurfaceFilter->SetInput(3,this->m_ToFImageGrabber->GetOutput(3));
+      }
+      else if (m_ToFImageGrabber->GetBoolProperty("IR"))
+      {
+        this->m_MitkAmplitudeImage = m_ToFCompositeFilter->GetOutput(1);
+        this->m_AmplitudeImageNode = ReplaceNodeData("Amplitude image",m_MitkAmplitudeImage);
+      }
     }
+    this->UseToFVisibilitySettings(true);
+  }
 }
 
 void QmitkToFUtilView::OnToFCameraStarted()
 {
   if (m_ToFImageGrabber.IsNotNull())
   {
     // initialize camera intrinsics
     if (this->m_ToFImageGrabber->GetProperty("CameraIntrinsics"))
     {
       m_CameraIntrinsics = dynamic_cast<mitk::CameraIntrinsicsProperty*>(this->m_ToFImageGrabber->GetProperty("CameraIntrinsics"))->GetValue();
       MITK_INFO << m_CameraIntrinsics->ToString();
     }
     else
     {
       m_CameraIntrinsics = NULL;
       MITK_ERROR << "No camera intrinsics were found!";
     }
     // initial update of image grabber
     this->m_ToFImageGrabber->Update();
 
     this->m_ToFCompositeFilter->SetInput(0,this->m_ToFImageGrabber->GetOutput(0));
     this->m_ToFCompositeFilter->SetInput(1,this->m_ToFImageGrabber->GetOutput(1));
     this->m_ToFCompositeFilter->SetInput(2,this->m_ToFImageGrabber->GetOutput(2));
 
     // initial update of composite filter
     this->m_ToFCompositeFilter->Update();
     this->m_MitkDistanceImage = m_ToFCompositeFilter->GetOutput(0);
     this->m_DistanceImageNode = ReplaceNodeData("Distance image",m_MitkDistanceImage);
 
     std::string rgbFileName;
     m_ToFImageGrabber->GetCameraDevice()->GetStringProperty("RGBImageFileName",rgbFileName);
 
     bool hasRGBImage = false;
     m_ToFImageGrabber->GetCameraDevice()->GetBoolProperty("HasRGBImage",hasRGBImage);
 
     bool hasIntensityImage = false;
     m_ToFImageGrabber->GetCameraDevice()->GetBoolProperty("HasIntensityImage",hasIntensityImage);
 
     bool hasAmplitudeImage = false;
     m_ToFImageGrabber->GetCameraDevice()->GetBoolProperty("HasAmplitudeImage",hasAmplitudeImage);
 
     bool KinectReconstructionMode = false;
     m_ToFImageGrabber->GetCameraDevice()->GetBoolProperty("KinectReconstructionMode",KinectReconstructionMode);
     if(KinectReconstructionMode)
     {
       //set the reconstruction mode for kinect
       this->m_ToFDistanceImageToSurfaceFilter->SetReconstructionMode(mitk::ToFDistanceImageToSurfaceFilter::Kinect);
     }
 
     if(hasRGBImage || (rgbFileName!=""))
     {
       if(m_ToFImageGrabber->GetBoolProperty("IR"))
       {
-         this->m_MitkAmplitudeImage = m_ToFCompositeFilter->GetOutput(1);
+        this->m_MitkAmplitudeImage = m_ToFCompositeFilter->GetOutput(1);
       }
       else
       {
-         this->m_RGBImageNode = ReplaceNodeData("RGB image",this->m_ToFImageGrabber->GetOutput(3));
+        this->m_RGBImageNode = ReplaceNodeData("RGB image",this->m_ToFImageGrabber->GetOutput(3));
       }
     }
     else
     {
       this->m_RGBImageNode = NULL;
     }
 
     if(hasAmplitudeImage)
     {
       this->m_MitkAmplitudeImage = m_ToFCompositeFilter->GetOutput(1);
       this->m_AmplitudeImageNode = ReplaceNodeData("Amplitude image",m_MitkAmplitudeImage);
     }
 
     if(hasIntensityImage)
     {
       this->m_MitkIntensityImage = m_ToFCompositeFilter->GetOutput(2);
       this->m_IntensityImageNode = ReplaceNodeData("Intensity image",m_MitkIntensityImage);
     }
 
-//    if ((rgbFileName!="") || hasRGBImage)
-//    {
+    //    if ((rgbFileName!="") || hasRGBImage)
+    //    {
 
-//    }
-//    else
-//    {
+    //    }
+    //    else
+    //    {
 
 
-//    }
-//    this->m_AmplitudeImageNode = ReplaceNodeData("Amplitude image",m_MitkAmplitudeImage);
-//    this->m_IntensityImageNode = ReplaceNodeData("Intensity image",m_MitkIntensityImage);
+    //    }
+    //    this->m_AmplitudeImageNode = ReplaceNodeData("Amplitude image",m_MitkAmplitudeImage);
+    //    this->m_IntensityImageNode = ReplaceNodeData("Intensity image",m_MitkIntensityImage);
 
     this->m_ToFDistanceImageToSurfaceFilter->SetInput(0,m_MitkDistanceImage);
     this->m_ToFDistanceImageToSurfaceFilter->SetInput(1,m_MitkAmplitudeImage);
     this->m_ToFDistanceImageToSurfaceFilter->SetInput(2,m_MitkIntensityImage);
     this->m_Surface = this->m_ToFDistanceImageToSurfaceFilter->GetOutput(0);
     this->m_SurfaceNode = ReplaceNodeData("Surface",m_Surface);
 
     this->UseToFVisibilitySettings(true);
 
     m_Controls->m_ToFCompositeFilterWidget->UpdateFilterParameter();
     // initialize visualization widget
     m_Controls->m_ToFVisualisationSettingsWidget->Initialize(this->m_DistanceImageNode, this->m_AmplitudeImageNode, this->m_IntensityImageNode);
     // set distance image to measurement widget
     m_Controls->tofMeasurementWidget->SetDistanceImage(m_MitkDistanceImage);
 
     this->m_Frametimer->start(0);
 
     m_Controls->m_ToFVisualisationSettingsWidget->setEnabled(true);
     m_Controls->m_ToFCompositeFilterWidget->setEnabled(true);
     m_Controls->tofMeasurementWidget->setEnabled(true);
     m_Controls->SurfacePropertiesBox->setEnabled(true);
 
     if (m_Controls->m_TextureCheckBox->isChecked())
     {
       OnTextureCheckBoxChecked(true);
     }
     if (m_Controls->m_KinectTextureCheckBox->isChecked())
     {
       OnKinectRGBTextureCheckBoxChecked(true);
     }
   }
   m_Controls->m_TextureCheckBox->setEnabled(true);
 }
 
 void QmitkToFUtilView::OnToFCameraStopped()
 {
-    m_Controls->m_ToFVisualisationSettingsWidget->setEnabled(false);
-    m_Controls->m_ToFCompositeFilterWidget->setEnabled(false);
-    m_Controls->SurfacePropertiesBox->setEnabled(false);
+  m_Controls->m_ToFVisualisationSettingsWidget->setEnabled(false);
+  m_Controls->m_ToFCompositeFilterWidget->setEnabled(false);
+  m_Controls->SurfacePropertiesBox->setEnabled(false);
 
-    this->m_Frametimer->stop();
+  this->m_Frametimer->stop();
 }
 
 void QmitkToFUtilView::OnToFCameraSelected(const QString selected)
 {
-    m_SelectedCamera = selected;
-    if ((selected.contains("CamBoard"))||(selected.contains("O3D")))
-    {
-        MITK_INFO<<"Surface representation currently not available for CamBoard and O3. Intrinsic parameters missing.";
-        this->m_Controls->m_SurfaceCheckBox->setEnabled(false);
-        this->m_Controls->m_TextureCheckBox->setEnabled(false);
-        this->m_Controls->m_KinectTextureCheckBox->setEnabled(false);
-        this->m_Controls->m_SurfaceCheckBox->setChecked(false);
-        this->m_Controls->m_TextureCheckBox->setChecked(false);
-        this->m_Controls->m_KinectTextureCheckBox->setChecked(false);
-    }
-    else
-    {
-        this->m_Controls->m_SurfaceCheckBox->setEnabled(true);
-        this->m_Controls->m_TextureCheckBox->setEnabled(true);
-        this->m_Controls->m_KinectTextureCheckBox->setEnabled(true);
-    }
+  m_SelectedCamera = selected;
+  if ((selected.contains("CamBoard"))||(selected.contains("O3D")))
+  {
+    MITK_INFO<<"Surface representation currently not available for CamBoard and O3. Intrinsic parameters missing.";
+    this->m_Controls->m_SurfaceCheckBox->setEnabled(false);
+    this->m_Controls->m_TextureCheckBox->setEnabled(false);
+    this->m_Controls->m_KinectTextureCheckBox->setEnabled(false);
+    this->m_Controls->m_SurfaceCheckBox->setChecked(false);
+    this->m_Controls->m_TextureCheckBox->setChecked(false);
+    this->m_Controls->m_KinectTextureCheckBox->setChecked(false);
+  }
+  else
+  {
+    this->m_Controls->m_SurfaceCheckBox->setEnabled(true);
+    this->m_Controls->m_TextureCheckBox->setEnabled(true);
+    this->m_Controls->m_KinectTextureCheckBox->setEnabled(true);
+  }
 }
 
 void QmitkToFUtilView::OnSurfaceCheckboxChecked(bool checked)
 {
-    if(checked)
-    {
-        //initialize the surface once
-        MITK_DEBUG << "OnSurfaceCheckboxChecked true";
-        this->m_SurfaceNode->SetData(this->m_Surface);
-        this->m_SurfaceNode->SetMapper(mitk::BaseRenderer::Standard3D, m_ToFSurfaceVtkMapper3D);
-
-        //we need to initialize (reinit) the surface, to make it fit into the renderwindow
-        this->GetRenderWindowPart()->GetRenderingManager()->InitializeViews(
-                    this->m_Surface->GetTimeSlicedGeometry(), mitk::RenderingManager::REQUEST_UPDATE_3DWINDOWS, true);
-
-        //the default camera position is rather unfortunate,
-        //that's why we set our own position according to the surface center
-        mitk::Point3D surfaceCenter= this->m_Surface->GetGeometry()->GetCenter();
-        vtkCamera* camera3d = GetRenderWindowPart()->GetQmitkRenderWindow("3d")->GetRenderer()->GetVtkRenderer()->GetActiveCamera();
-        //1m distance to camera should be a nice default value for most cameras
-        camera3d->SetPosition(0,0,-1000);
-        camera3d->SetViewUp(0,-1,0);
-        camera3d->SetFocalPoint(0,0,surfaceCenter[2]);
-        camera3d->SetViewAngle(40);
-        camera3d->SetClippingRange(1, 10000);
-    }
+  if(checked)
+  {
+    //initialize the surface once
+    MITK_DEBUG << "OnSurfaceCheckboxChecked true";
+    this->m_SurfaceNode->SetData(this->m_Surface);
+    this->m_SurfaceNode->SetMapper(mitk::BaseRenderer::Standard3D, m_ToFSurfaceVtkMapper3D);
+
+    //we need to initialize (reinit) the surface, to make it fit into the renderwindow
+    this->GetRenderWindowPart()->GetRenderingManager()->InitializeViews(
+          this->m_Surface->GetTimeSlicedGeometry(), mitk::RenderingManager::REQUEST_UPDATE_3DWINDOWS, true);
+
+    //the default camera position is rather unfortunate,
+    //that's why we set our own position according to the surface center
+    mitk::Point3D surfaceCenter= this->m_Surface->GetGeometry()->GetCenter();
+    vtkCamera* camera3d = GetRenderWindowPart()->GetQmitkRenderWindow("3d")->GetRenderer()->GetVtkRenderer()->GetActiveCamera();
+    //1m distance to camera should be a nice default value for most cameras
+    camera3d->SetPosition(0,0,-1000);
+    camera3d->SetViewUp(0,-1,0);
+    camera3d->SetFocalPoint(0,0,surfaceCenter[2]);
+    camera3d->SetViewAngle(40);
+    camera3d->SetClippingRange(1, 10000);
+  }
 }
 
 void QmitkToFUtilView::OnUpdateCamera()
 {
-    //##### Code for surface #####
-    if (m_Controls->m_SurfaceCheckBox->isChecked())
+  //##### Code for surface #####
+  if (m_Controls->m_SurfaceCheckBox->isChecked())
+  {
+    // update surface
+    m_ToFDistanceImageToSurfaceFilter->SetTextureIndex(m_Controls->m_ToFVisualisationSettingsWidget->GetSelectedImageIndex());
+
+    //if the user wants to see the texture, it has to be updated for every frame
+    if(m_Controls->m_KinectTextureCheckBox->isChecked() && (m_SelectedCamera.contains("Kinect")) && (m_ToFImageGrabber->GetBoolProperty("RGB")))
     {
-        // update surface
-        m_ToFDistanceImageToSurfaceFilter->SetTextureIndex(m_Controls->m_ToFVisualisationSettingsWidget->GetSelectedImageIndex());
-
-        //if the user wants to see the texture, it has to be updated for every frame
-        if(m_Controls->m_KinectTextureCheckBox->isChecked() && (m_SelectedCamera.contains("Kinect")) && (m_ToFImageGrabber->GetBoolProperty("RGB")))
-        {
-            //remove the vtkScalarsToColors object, if there was one.
-            this->m_ToFSurfaceVtkMapper3D->SetVtkScalarsToColors(NULL);
-            //set RGB-iamge as texture
-            this->m_ToFSurfaceVtkMapper3D->SetTexture((this->m_ToFImageGrabber->GetOutput(3)->GetVtkImageData()));
-        }
-        else
-        {
-            //we have to delete the texture, if there was one.
-            this->m_ToFSurfaceVtkMapper3D->SetTexture(NULL);
-            //get the colortransferfunction from the visualization widget
-            this->m_ToFSurfaceVtkMapper3D->SetVtkScalarsToColors(m_Controls->m_ToFVisualisationSettingsWidget->GetSelectedColorTransferFunction());
-        }
-        //update pipeline
-        this->m_Surface->Update();
+      //remove the vtkScalarsToColors object, if there was one.
+      this->m_ToFSurfaceVtkMapper3D->SetVtkScalarsToColors(NULL);
+      //set RGB-iamge as texture
+      this->m_ToFSurfaceVtkMapper3D->SetTexture((this->m_ToFImageGrabber->GetOutput(3)->GetVtkImageData()));
     }
-    //##### End code for surface #####
     else
     {
-        // update pipeline
-        this->m_MitkDistanceImage->Update();
+      //we have to delete the texture, if there was one.
+      this->m_ToFSurfaceVtkMapper3D->SetTexture(NULL);
+      //get the colortransferfunction from the visualization widget
+      this->m_ToFSurfaceVtkMapper3D->SetVtkScalarsToColors(m_Controls->m_ToFVisualisationSettingsWidget->GetSelectedColorTransferFunction());
     }
+    //update pipeline
+    this->m_Surface->Update();
+  }
+  //##### End code for surface #####
+  else
+  {
+    // update pipeline
+    this->m_MitkDistanceImage->Update();
+  }
 
-    this->RequestRenderWindowUpdate();
+  this->RequestRenderWindowUpdate();
 
-    this->m_2DDisplayCount++;
-    if ((this->m_2DDisplayCount % this->m_StepsForFramerate) == 0)
-    {
-        this->m_2DTimeAfter = this->m_RealTimeClock->GetCurrentStamp() - this->m_2DTimeBefore;
-        MITK_INFO << " 2D-Display-framerate (fps): " << this->m_StepsForFramerate / (this->m_2DTimeAfter/1000);
-        this->m_2DTimeBefore = this->m_RealTimeClock->GetCurrentStamp();
-    }
+  this->m_2DDisplayCount++;
+  if ((this->m_2DDisplayCount % this->m_StepsForFramerate) == 0)
+  {
+    this->m_2DTimeAfter = this->m_RealTimeClock->GetCurrentStamp() - this->m_2DTimeBefore;
+    MITK_INFO << " 2D-Display-framerate (fps): " << this->m_StepsForFramerate / (this->m_2DTimeAfter/1000);
+    this->m_2DTimeBefore = this->m_RealTimeClock->GetCurrentStamp();
+  }
 }
 
 void QmitkToFUtilView::OnTextureCheckBoxChecked(bool checked)
 {
-    if(m_SurfaceNode.IsNotNull())
+  if(m_SurfaceNode.IsNotNull())
+  {
+    if (checked)
+    {
+      this->m_SurfaceNode->SetBoolProperty("scalar visibility", true);
+    }
+    else
     {
-        if (checked)
-        {
-            this->m_SurfaceNode->SetBoolProperty("scalar visibility", true);
-        }
-        else
-        {
-            this->m_SurfaceNode->SetBoolProperty("scalar visibility", false);
-        }
+      this->m_SurfaceNode->SetBoolProperty("scalar visibility", false);
     }
+  }
 }
 
 void QmitkToFUtilView::OnKinectRGBTextureCheckBoxChecked(bool checked)
 {
-    if((m_SelectedCamera.contains("Kinect")) && (m_ToFImageGrabber->GetBoolProperty("RGB")))
+  if((m_SelectedCamera.contains("Kinect")) && (m_ToFImageGrabber->GetBoolProperty("RGB")))
+  {
+    if (checked)
     {
-        if (checked)
-        {
-            //define the dimensions of the texture
-            this->m_ToFDistanceImageToSurfaceFilter->SetTextureImageWidth(this->m_ToFImageGrabber->GetOutput(3)->GetDimension(0));
-            this->m_ToFDistanceImageToSurfaceFilter->SetTextureImageHeight(this->m_ToFImageGrabber->GetOutput(3)->GetDimension(1));
-        }
+      //define the dimensions of the texture
+      this->m_ToFDistanceImageToSurfaceFilter->SetTextureImageWidth(this->m_ToFImageGrabber->GetOutput(3)->GetDimension(0));
+      this->m_ToFDistanceImageToSurfaceFilter->SetTextureImageHeight(this->m_ToFImageGrabber->GetOutput(3)->GetDimension(1));
     }
+  }
 }
 
 void QmitkToFUtilView::OnChangeCoronalWindowOutput(int index)
 {
-    this->OnToFCameraStopped();
-    if(index == 0)
-    {
-        if(this->m_IntensityImageNode.IsNotNull())
-            this->m_IntensityImageNode->SetVisibility(false);
-        if(this->m_RGBImageNode.IsNotNull())
-            this->m_RGBImageNode->SetVisibility(true);
-    }
-    else if(index == 1)
-    {
-        if(this->m_IntensityImageNode.IsNotNull())
-            this->m_IntensityImageNode->SetVisibility(true);
-        if(this->m_RGBImageNode.IsNotNull())
-            this->m_RGBImageNode->SetVisibility(false);
-    }
-    this->RequestRenderWindowUpdate();
-    this->OnToFCameraStarted();
+  this->OnToFCameraStopped();
+  if(index == 0)
+  {
+    if(this->m_IntensityImageNode.IsNotNull())
+      this->m_IntensityImageNode->SetVisibility(false);
+    if(this->m_RGBImageNode.IsNotNull())
+      this->m_RGBImageNode->SetVisibility(true);
+  }
+  else if(index == 1)
+  {
+    if(this->m_IntensityImageNode.IsNotNull())
+      this->m_IntensityImageNode->SetVisibility(true);
+    if(this->m_RGBImageNode.IsNotNull())
+      this->m_RGBImageNode->SetVisibility(false);
+  }
+  this->RequestRenderWindowUpdate();
+  this->OnToFCameraStarted();
 }
 
 mitk::DataNode::Pointer QmitkToFUtilView::ReplaceNodeData( std::string nodeName, mitk::BaseData* data )
 {
 
-    mitk::DataNode::Pointer node = this->GetDataStorage()->GetNamedNode(nodeName);
-    if (node.IsNull())
-    {
-        node = mitk::DataNode::New();
-        node->SetData(data);
-        node->SetName(nodeName);
-        node->SetBoolProperty("binary",false);
-        this->GetDataStorage()->Add(node);
-    }
-    else
-    {
-        node->SetData(data);
-    }
-    return node;
+  mitk::DataNode::Pointer node = this->GetDataStorage()->GetNamedNode(nodeName);
+  if (node.IsNull())
+  {
+    node = mitk::DataNode::New();
+    node->SetData(data);
+    node->SetName(nodeName);
+    node->SetBoolProperty("binary",false);
+    this->GetDataStorage()->Add(node);
+  }
+  else
+  {
+    node->SetData(data);
+  }
+  return node;
 }
 
 void QmitkToFUtilView::UseToFVisibilitySettings(bool useToF)
 {
   //We need this property for every node.
   mitk::RenderingModeProperty::Pointer renderingModePropertyForTransferFunction = mitk::RenderingModeProperty::New(mitk::RenderingModeProperty::COLORTRANSFERFUNCTION_COLOR);
 
   // set node properties
   if (m_DistanceImageNode.IsNotNull())
   {
     this->m_DistanceImageNode->SetProperty( "visible" , mitk::BoolProperty::New( true ));
     this->m_DistanceImageNode->SetVisibility( !useToF, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("sagittal")->GetRenderWindow() ) );
     this->m_DistanceImageNode->SetVisibility( !useToF, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("coronal")->GetRenderWindow() ) );
     this->m_DistanceImageNode->SetVisibility( !useToF, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("3d")->GetRenderWindow() ) );
     this->m_DistanceImageNode->SetProperty("Image Rendering.Mode", renderingModePropertyForTransferFunction);
   }
   if (m_AmplitudeImageNode.IsNotNull())
   {
     if ((m_SelectedCamera.contains("Kinect"))&&(m_ToFImageGrabber->GetBoolProperty("RGB")))
     {
       this->m_AmplitudeImageNode->SetProperty( "visible" , mitk::BoolProperty::New( false ));
     }
     else
     {
       this->m_AmplitudeImageNode->SetProperty( "visible" , mitk::BoolProperty::New( true ));
     }
     this->m_AmplitudeImageNode->SetVisibility( !useToF, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetRenderWindow() ) );
     this->m_AmplitudeImageNode->SetVisibility( !useToF, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("coronal")->GetRenderWindow() ) );
     this->m_AmplitudeImageNode->SetVisibility( !useToF, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("3d")->GetRenderWindow() ) );
     this->m_AmplitudeImageNode->SetProperty("Image Rendering.Mode", renderingModePropertyForTransferFunction);
   }
   if (m_IntensityImageNode.IsNotNull())
   {
     if (m_SelectedCamera.contains("Kinect"))
     {
       this->m_IntensityImageNode->SetProperty( "visible" , mitk::BoolProperty::New( false ));
     }
     else
     {
       this->m_IntensityImageNode->SetProperty( "visible" , mitk::BoolProperty::New( true ));
       this->m_IntensityImageNode->SetVisibility( !useToF, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetRenderWindow() ) );
       this->m_IntensityImageNode->SetVisibility( !useToF, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("sagittal")->GetRenderWindow() ) );
       this->m_IntensityImageNode->SetVisibility( !useToF, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("3d")->GetRenderWindow() ) );
-    this->m_IntensityImageNode->SetProperty("Image Rendering.Mode", renderingModePropertyForTransferFunction);
+      this->m_IntensityImageNode->SetProperty("Image Rendering.Mode", renderingModePropertyForTransferFunction);
     }
   }
   if ((m_RGBImageNode.IsNotNull()))
   {
     if ((m_SelectedCamera.contains("Kinect"))&&(m_ToFImageGrabber->GetBoolProperty("IR")))
     {
       this->m_RGBImageNode->SetProperty( "visible" , mitk::BoolProperty::New( false ));
     }
     else
     {
       this->m_RGBImageNode->SetProperty( "visible" , mitk::BoolProperty::New( true ));
       this->m_RGBImageNode->SetVisibility( !useToF, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetRenderWindow() ) );
       this->m_RGBImageNode->SetVisibility( !useToF, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("sagittal")->GetRenderWindow() ) );
       this->m_RGBImageNode->SetVisibility( !useToF, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("3d")->GetRenderWindow() ) );
     }
   }
   // initialize images
   if (m_MitkDistanceImage.IsNotNull())
   {
     this->GetRenderWindowPart()->GetRenderingManager()->InitializeViews(
           this->m_MitkDistanceImage->GetTimeSlicedGeometry(), mitk::RenderingManager::REQUEST_UPDATE_2DWINDOWS, true);
   }
   if(this->m_SurfaceNode.IsNotNull())
   {
     QHash<QString, QmitkRenderWindow*> renderWindowHashMap = this->GetRenderWindowPart()->GetQmitkRenderWindows();
     QHashIterator<QString, QmitkRenderWindow*> i(renderWindowHashMap);
     while (i.hasNext()){
       i.next();
       this->m_SurfaceNode->SetVisibility( false, mitk::BaseRenderer::GetInstance(i.value()->GetRenderWindow()) );
     }
     this->m_SurfaceNode->SetVisibility( true, mitk::BaseRenderer::GetInstance(GetRenderWindowPart()->GetQmitkRenderWindow("3d")->GetRenderWindow() ) );
   }
   //disable/enable gradient background
   this->GetRenderWindowPart()->EnableDecorations(!useToF, QStringList(QString("background")));
 
   if((this->m_RGBImageNode.IsNotNull()))
   {
     bool RGBImageHasDifferentResolution = false;
     m_ToFImageGrabber->GetCameraDevice()->GetBoolProperty("RGBImageHasDifferentResolution",RGBImageHasDifferentResolution);
     if(RGBImageHasDifferentResolution)
     {
       //update the display geometry by using the RBG image node. Only for renderwindow coronal
       mitk::RenderingManager::GetInstance()->InitializeView( GetRenderWindowPart()->GetRenderWindow("coronal")->GetRenderWindow(), this->m_RGBImageNode->GetData()->GetGeometry() );
     }
   }
 }
diff --git a/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h b/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h
index 86f31022e3..f7f1067ec8 100644
--- a/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h
+++ b/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h
@@ -1,193 +1,193 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #ifndef QmitkToFUtilView_h
 #define QmitkToFUtilView_h
 
 #include <QmitkOverlayController.h>
 #include <QmitkAbstractView.h>
 #include <berryIWorkbenchPartReference.h>
 #include <mitkIZombieViewPart.h>
 
 
 #include <ui_QmitkToFUtilViewControls.h>
 
 class QTimer;
 
 #include <mitkRealTimeClock.h>
 #include <mitkToFImageGrabber.h>
 #include <mitkOpenCVVideoSource.h>
 #include <mitkSurface.h>
 #include <mitkToFDistanceImageToSurfaceFilter.h>
 #include <mitkToFSurfaceVtkMapper3D.h>
 #include <mitkToFImageRecorder.h>
 #include <mitkToFCompositeFilter.h>
 #include <mitkCameraIntrinsics.h>
 
 /*!
   \brief QmitkToFUtilView
 
   Application that allows simple playing, recording, visualization, processing and measurement of Time-of-Flight (ToF) data.
   Currently the following features are implemented:
   <ul>
   <li>Connecting and showing ToF data from various cameras (PMD CamCube 2/3, PMD CamBoard, PMD O3, MESA SwissRanger)</li>
   <li>Recording and playing of ToF data</li>
   <li>Color coded visualization of ToF images</li>
   <li>Preprocessing of the distance data: Threshold, median, average and bilateral filtering; surface generation</li>
   <li>Simple measurement and PointSet definition</li>
   </ul>
 
   \sa QmitkFunctionality
   \ingroup Functionalities
 */
 class QmitkToFUtilView : public QmitkAbstractView, public mitk::IZombieViewPart
 {
-    // this is needed for all Qt objects that should have a Qt meta-object
-    // (everything that derives from QObject and wants to have signal/slots)
-    Q_OBJECT
+  // this is needed for all Qt objects that should have a Qt meta-object
+  // (everything that derives from QObject and wants to have signal/slots)
+  Q_OBJECT
 
 public:
 
-    static const std::string VIEW_ID;
+  static const std::string VIEW_ID;
 
-    QmitkToFUtilView();
-    ~QmitkToFUtilView();
+  QmitkToFUtilView();
+  ~QmitkToFUtilView();
 
 
-    virtual void CreateQtPartControl(QWidget *parent);
-    /// \brief Called when the functionality is activated.
-    virtual void Activated();
-    /// \brief Called when the functionality is deactivated. In this case the zombie view of this functionality becomes active!
-    virtual void ActivatedZombieView(berry::IWorkbenchPartReference::Pointer zombieView);
+  virtual void CreateQtPartControl(QWidget *parent);
+  /// \brief Called when the functionality is activated.
+  virtual void Activated();
+  /// \brief Called when the functionality is deactivated. In this case the zombie view of this functionality becomes active!
+  virtual void ActivatedZombieView(berry::IWorkbenchPartReference::Pointer zombieView);
 
-    virtual void Deactivated();
-    virtual void Visible();
-    virtual void Hidden();
+  virtual void Deactivated();
+  virtual void Visible();
+  virtual void Hidden();
 
-    void SetFocus();
+  void SetFocus();
 
 protected slots:
 
-    /*!
+  /*!
     \brief Slot triggered from the timer to update the images and visualization
     */
-    void OnUpdateCamera();
-    /*!
+  void OnUpdateCamera();
+  /*!
     \brief Slot called when the "Connect" button of the ConnectionWidget is pressed
     */
-    void OnToFCameraConnected();
-    /*!
+  void OnToFCameraConnected();
+  /*!
     \brief Slot called when the "Disconnect" button of the ConnectionWidget is pressed
     */
-    void OnToFCameraDisconnected();
-    /*!
+  void OnToFCameraDisconnected();
+  /*!
     \brief Slot called when the camera selection in the ConnectionWidget has changed
     */
-    void OnToFCameraSelected(const QString selected);
-    /*!
+  void OnToFCameraSelected(const QString selected);
+  /*!
     \brief Slot called when the "Start" button of the RecorderWidget is pressed
     */
-    void OnToFCameraStarted();
-    /*!
+  void OnToFCameraStarted();
+  /*!
     \brief Slot called when the "Stop" button of the RecorderWidget is pressed
     */
-    void OnToFCameraStopped();
-    /*!
+  void OnToFCameraStopped();
+  /*!
     \brief Slot invoked when the texture checkbox is checked. Enables the scalar visibility of the surface
     */
-    /**
+  /**
      * @brief OnSurfaceCheckboxChecked Slot beeing called, if the "surface"-checkbox is clicked. This method initializes the surface once, if it is necessary.
      * @param checked Is it checked or not?
      */
-    void OnSurfaceCheckboxChecked(bool checked);
+  void OnSurfaceCheckboxChecked(bool checked);
 
-    void OnTextureCheckBoxChecked(bool checked);
-    /*!
+  void OnTextureCheckBoxChecked(bool checked);
+  /*!
     \brief Slot invoked when the video texture checkbox is checked. Enables the texture of the surface
     */
-    void OnKinectRGBTextureCheckBoxChecked(bool checked);
-    /*!
+  void OnKinectRGBTextureCheckBoxChecked(bool checked);
+  /*!
     \brief Slot invoked when user alters the coronal window input from RGB to Intensity or vice versa.
     */
-    void OnChangeCoronalWindowOutput(int index);
-    /*!
+  void OnChangeCoronalWindowOutput(int index);
+  /*!
     \brief Slot invoked when acquisition mode of Kinect is changed
     */
-    void OnKinectAcquisitionModeChanged();
+  void OnKinectAcquisitionModeChanged();
 
 protected:
 
-    /*!
+  /*!
     \brief initialize the visibility settings of ToF data (images + surface)
     \param useToF true: distance image: widget1, amplitude image: widget 2, intensity image: widget 3; false: standard
     */
-    void UseToFVisibilitySettings(bool useToF);
+  void UseToFVisibilitySettings(bool useToF);
 
-    Ui::QmitkToFUtilViewControls* m_Controls;
+  Ui::QmitkToFUtilViewControls* m_Controls;
 
-    QmitkStdMultiWidget* m_MultiWidget;
+  QmitkStdMultiWidget* m_MultiWidget;
 
-    QTimer* m_Frametimer; ///< Timer used to continuously update the images
+  QTimer* m_Frametimer; ///< Timer used to continuously update the images
 
-    QString m_SelectedCamera; ///< String holding the selected camera
+  QString m_SelectedCamera; ///< String holding the selected camera
 
-    mitk::Image::Pointer m_MitkDistanceImage; ///< member holding a pointer to the distance image of the selected camera
-    mitk::Image::Pointer m_MitkAmplitudeImage; ///< member holding a pointer to the amplitude image of the selected camera
-    mitk::Image::Pointer m_MitkIntensityImage; ///< member holding a pointer to the intensity image of the selected camera
-    mitk::Surface::Pointer m_Surface; ///< member holding a pointer to the surface generated from the distance image of the selected camera
+  mitk::Image::Pointer m_MitkDistanceImage; ///< member holding a pointer to the distance image of the selected camera
+  mitk::Image::Pointer m_MitkAmplitudeImage; ///< member holding a pointer to the amplitude image of the selected camera
+  mitk::Image::Pointer m_MitkIntensityImage; ///< member holding a pointer to the intensity image of the selected camera
+  mitk::Surface::Pointer m_Surface; ///< member holding a pointer to the surface generated from the distance image of the selected camera
 
-    mitk::DataNode::Pointer m_DistanceImageNode; ///< DataNode holding the distance image of the selected camera
-    mitk::DataNode::Pointer m_AmplitudeImageNode; ///< DataNode holding the amplitude image of the selected camera
-    mitk::DataNode::Pointer m_IntensityImageNode; ///< DataNode holding the intensity image of the selected camera
-    mitk::DataNode::Pointer m_RGBImageNode; ///< DataNode holding the rgb image of the selected camera
-    mitk::DataNode::Pointer m_SurfaceNode; ///< DataNode holding the surface generated from the distanc image of the selected camera
+  mitk::DataNode::Pointer m_DistanceImageNode; ///< DataNode holding the distance image of the selected camera
+  mitk::DataNode::Pointer m_AmplitudeImageNode; ///< DataNode holding the amplitude image of the selected camera
+  mitk::DataNode::Pointer m_IntensityImageNode; ///< DataNode holding the intensity image of the selected camera
+  mitk::DataNode::Pointer m_RGBImageNode; ///< DataNode holding the rgb image of the selected camera
+  mitk::DataNode::Pointer m_SurfaceNode; ///< DataNode holding the surface generated from the distanc image of the selected camera
 
-    // ToF processing and recording filter
-    mitk::ToFImageRecorder::Pointer m_ToFImageRecorder; ///< ToF image recorder used for lossless recording of ToF image data
-    mitk::ToFImageGrabber::Pointer m_ToFImageGrabber; ///< Source of a ToF image processing pipeline. Provides pointers to distance, amplitude and intensity image
-    mitk::ToFDistanceImageToSurfaceFilter::Pointer m_ToFDistanceImageToSurfaceFilter; ///< Filter for calculating a surface representation from a given distance image
-    mitk::ToFCompositeFilter::Pointer m_ToFCompositeFilter; ///< Filter combining several processing steps (thresholding, Median filtering, Bilateral filtering)
+  // ToF processing and recording filter
+  mitk::ToFImageRecorder::Pointer m_ToFImageRecorder; ///< ToF image recorder used for lossless recording of ToF image data
+  mitk::ToFImageGrabber::Pointer m_ToFImageGrabber; ///< Source of a ToF image processing pipeline. Provides pointers to distance, amplitude and intensity image
+  mitk::ToFDistanceImageToSurfaceFilter::Pointer m_ToFDistanceImageToSurfaceFilter; ///< Filter for calculating a surface representation from a given distance image
+  mitk::ToFCompositeFilter::Pointer m_ToFCompositeFilter; ///< Filter combining several processing steps (thresholding, Median filtering, Bilateral filtering)
 
-    int m_2DDisplayCount; ///< member used to determine whether frame rate output should be shown
-    // members for calculating the frame rate
-    mitk::RealTimeClock::Pointer m_RealTimeClock; ///< real time clock used to calculate the display framerate
-    int m_StepsForFramerate; ///< number of steps used for calculating the display framerate
-    double m_2DTimeBefore; ///< holds the time stamp at the beginning of the display framerate measurement
-    double m_2DTimeAfter; ///< holds the time stamp at the end of the display framerate measurement
+  int m_2DDisplayCount; ///< member used to determine whether frame rate output should be shown
+  // members for calculating the frame rate
+  mitk::RealTimeClock::Pointer m_RealTimeClock; ///< real time clock used to calculate the display framerate
+  int m_StepsForFramerate; ///< number of steps used for calculating the display framerate
+  double m_2DTimeBefore; ///< holds the time stamp at the beginning of the display framerate measurement
+  double m_2DTimeAfter; ///< holds the time stamp at the end of the display framerate measurement
 
-    mitk::CameraIntrinsics::Pointer m_CameraIntrinsics; ///< member holding the intrinsic parameters of the camera
+  mitk::CameraIntrinsics::Pointer m_CameraIntrinsics; ///< member holding the intrinsic parameters of the camera
 private:
 
-    /*!
+  /*!
     \brief helper method to replace data of the specified node. If node does not exist it will be created
     \param nodeName Name of the node
     \param data Data object to be replaced
     \return returns the node
     */
-    mitk::DataNode::Pointer ReplaceNodeData(std::string nodeName, mitk::BaseData* data);
+  mitk::DataNode::Pointer ReplaceNodeData(std::string nodeName, mitk::BaseData* data);
 
-    void ProcessVideoTransform();
+  void ProcessVideoTransform();
 
-    /*!
+  /*!
       \brief Reset all GUI related things to default. E.g. show sagittal and coronal slices in the renderwindows.
       */
-    void ResetGUIToDefault();
+  void ResetGUIToDefault();
 
-    mitk::ToFSurfaceVtkMapper3D::Pointer m_ToFSurfaceVtkMapper3D;
+  mitk::ToFSurfaceVtkMapper3D::Pointer m_ToFSurfaceVtkMapper3D;
 };
 
 #endif // _QMITKTOFUTILVIEW_H_INCLUDED