diff --git a/Modules/DicomRT/autoload/IO/mitkDicomRTIOMimeTypes.cpp b/Modules/DicomRT/autoload/IO/mitkDicomRTIOMimeTypes.cpp
index 06bda58c5b..5b327e0a78 100644
--- a/Modules/DicomRT/autoload/IO/mitkDicomRTIOMimeTypes.cpp
+++ b/Modules/DicomRT/autoload/IO/mitkDicomRTIOMimeTypes.cpp
@@ -1,263 +1,266 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #include "mitkDicomRTIOMimeTypes.h"
 
 #include "mitkIOMimeTypes.h"
 
 #include "mitkDICOMDCMTKTagScanner.h"
 #include "mitkDICOMTagPath.h"
 #include "mitkDICOMTagsOfInterestService.h"
 #include <mitkDICOMFileReaderSelector.h>
 #include <mitkDICOMFileReader.h>
 
 #include <itksys/SystemTools.hxx>
 
 #include <usModuleContext.h>
 #include <usGetModuleContext.h>
 #include <usServiceProperties.h>
 #include <usServiceRegistration.h>
 
 namespace mitk
 {
 
 std::vector<CustomMimeType*> DicomRTIOMimeTypes::Get()
 {
   std::vector<CustomMimeType*> mimeTypes;
 
   // order matters here (descending rank for mime types)
   mimeTypes.push_back(DICOMRT_DOSE_MIMETYPE().Clone());
   mimeTypes.push_back(DICOMRT_PLAN_MIMETYPE().Clone());
   mimeTypes.push_back(DICOMRT_STRUCT_MIMETYPE().Clone());
 
   return mimeTypes;
 }
 
 // Mime Types
 
 DicomRTIOMimeTypes::RTDoseMimeType::RTDoseMimeType()
   : CustomMimeType(DICOMRT_DOSE_MIMETYPE_NAME())
 {
   std::string category = "DICOMRT";
   this->SetCategory(category);
   this->SetComment("RTDose");
 
   this->AddExtension("dcm");
 }
 
 bool DicomRTIOMimeTypes::RTDoseMimeType::AppliesTo(const std::string &path) const
 {
   bool canRead( CustomMimeType::AppliesTo(path) );
 
   if (!canRead) {
     return false;
   }
 
   if (!canReadByDicomFileReader(path)) {
     return false;
   }
 
   auto modality = GetModality(path);
 
   if (modality == "RTDOSE") {
     return true;
   }
   else {
     return false;
     }
 }
 
 std::string DicomRTIOMimeTypes::GetModality(const std::string & path)
 {
   mitk::IDICOMTagsOfInterest* toiSrv = GetDicomTagsOfInterestService();
 
   auto tagsOfInterest = toiSrv->GetTagsOfInterest();
 
   DICOMTagPathList tagsOfInterestList;
   for (const auto& tag : tagsOfInterest) {
     tagsOfInterestList.push_back(tag.first);
   }
 
   mitk::DICOMDCMTKTagScanner::Pointer scanner = mitk::DICOMDCMTKTagScanner::New();
   scanner->SetInputFiles({ path });
   scanner->AddTagPaths(tagsOfInterestList);
   scanner->Scan();
 
   mitk::DICOMDatasetAccessingImageFrameList frames = scanner->GetFrameInfoList();
+  std::string modality = "";
+  if (frames.empty())
+    return modality;
   auto findings = frames.front()->GetTagValueAsString(DICOMTagPath(0x0008, 0x0060));
 
-  std::string modality = findings.front().value;
+  modality = findings.front().value;
   return modality;
 }
 
 bool DicomRTIOMimeTypes::canReadByDicomFileReader(const std::string & filename)
 {
   mitk::DICOMFileReaderSelector::Pointer selector = mitk::DICOMFileReaderSelector::New();
   selector->LoadBuiltIn3DConfigs();
   selector->SetInputFiles({ filename });
 
   mitk::DICOMFileReader::Pointer reader = selector->GetFirstReaderWithMinimumNumberOfOutputImages();
 
   if (reader.IsNull()) {
     return false;
   }
   else {
     return true;
   }
 }
 
 DicomRTIOMimeTypes::RTDoseMimeType* DicomRTIOMimeTypes::RTDoseMimeType::Clone() const
 {
   return new RTDoseMimeType(*this);
 }
 
 DicomRTIOMimeTypes::RTStructMimeType::RTStructMimeType()
   : CustomMimeType(DICOMRT_STRUCT_MIMETYPE_NAME())
 {
   std::string category = "DICOMRT";
   this->SetCategory(category);
   this->SetComment("RTStruct");
 
   this->AddExtension("dcm");
 }
 
 bool DicomRTIOMimeTypes::RTStructMimeType::AppliesTo(const std::string &path) const
 {
   bool canRead(CustomMimeType::AppliesTo(path));
 
   if (!canRead) {
     return false;
   }
 
   auto modality = GetModality(path);
   if (modality == "RTSTRUCT") {
     return true;
   }
   else {
     return false;
   }
 }
 
 DicomRTIOMimeTypes::RTStructMimeType* DicomRTIOMimeTypes::RTStructMimeType::Clone() const
 {
   return new RTStructMimeType(*this);
 }
 
 DicomRTIOMimeTypes::RTPlanMimeType::RTPlanMimeType()
   : CustomMimeType(DICOMRT_PLAN_MIMETYPE_NAME())
 {
   std::string category = "DICOMRT";
   this->SetCategory(category);
   this->SetComment("RTPLAN");
 
   this->AddExtension("dcm");
 }
 
 bool DicomRTIOMimeTypes::RTPlanMimeType::AppliesTo(const std::string &path) const
 {
   bool canRead(CustomMimeType::AppliesTo(path));
 
   if (!canRead) {
     return false;
   }
 
   auto modality = GetModality(path);
     if (modality == "RTPLAN") {
       return true;
     }
     else {
       return false;
     }
 }
 
 DicomRTIOMimeTypes::RTPlanMimeType* DicomRTIOMimeTypes::RTPlanMimeType::Clone() const
 {
   return new RTPlanMimeType(*this);
 }
 
 
 DicomRTIOMimeTypes::RTDoseMimeType DicomRTIOMimeTypes::DICOMRT_DOSE_MIMETYPE()
 {
   return RTDoseMimeType();
 }
 
 DicomRTIOMimeTypes::RTStructMimeType DicomRTIOMimeTypes::DICOMRT_STRUCT_MIMETYPE()
 {
   return RTStructMimeType();
 }
 
 DicomRTIOMimeTypes::RTPlanMimeType DicomRTIOMimeTypes::DICOMRT_PLAN_MIMETYPE()
 {
   return RTPlanMimeType();
 }
 
 // Names
 std::string DicomRTIOMimeTypes::DICOMRT_DOSE_MIMETYPE_NAME()
 {
   static std::string name = IOMimeTypes::DEFAULT_BASE_NAME() + ".dicomrt.dose";
   return name;
 }
 
 std::string DicomRTIOMimeTypes::DICOMRT_STRUCT_MIMETYPE_NAME()
 {
   static std::string name = IOMimeTypes::DEFAULT_BASE_NAME() + ".dicomrt.struct";
   return name;
 }
 
 std::string DicomRTIOMimeTypes::DICOMRT_PLAN_MIMETYPE_NAME()
 {
   static std::string name = IOMimeTypes::DEFAULT_BASE_NAME() + ".dicomrt.plan";
   return name;
 }
 
 // Descriptions
 
 std::string DicomRTIOMimeTypes::DICOMRT_DOSE_MIMETYPE_DESCRIPTION()
 {
   static std::string description = "RTDOSE reader";
   return description;
 }
 
 std::string DicomRTIOMimeTypes::DICOMRT_STRUCT_MIMETYPE_DESCRIPTION()
 {
   static std::string description = "RTSTRUCT reader";
   return description;
 }
 
 std::string DicomRTIOMimeTypes::DICOMRT_PLAN_MIMETYPE_DESCRIPTION()
 {
   static std::string description = "RTPLAN reader";
   return description;
 }
 
 mitk::IDICOMTagsOfInterest* DicomRTIOMimeTypes::GetDicomTagsOfInterestService()
 {
   mitk::IDICOMTagsOfInterest* result = nullptr;
 
   std::vector<us::ServiceReference<mitk::IDICOMTagsOfInterest> > toiRegisters = us::GetModuleContext()->GetServiceReferences<mitk::IDICOMTagsOfInterest>();
   if (!toiRegisters.empty())
   {
     if (toiRegisters.size() > 1)
     {
       MITK_WARN << "Multiple DICOM tags of interest services found. Using just one.";
     }
     result = us::GetModuleContext()->GetService<mitk::IDICOMTagsOfInterest>(toiRegisters.front());
   }
 
   return result;
 }
 
 }
diff --git a/Modules/ImageStatistics/mitkImageStatisticsContainerManager.cpp b/Modules/ImageStatistics/mitkImageStatisticsContainerManager.cpp
index 5604196d58..847916deca 100644
--- a/Modules/ImageStatistics/mitkImageStatisticsContainerManager.cpp
+++ b/Modules/ImageStatistics/mitkImageStatisticsContainerManager.cpp
@@ -1,95 +1,94 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #include "mitkImageStatisticsContainerManager.h"
 
 #include "mitkNodePredicateAnd.h"
 #include "mitkNodePredicateOr.h"
 #include "mitkNodePredicateDataType.h"
 #include "mitkNodePredicateNot.h"
 #include "mitkStatisticsToImageRelationRule.h"
 #include "mitkStatisticsToMaskRelationRule.h"
 
 mitk::ImageStatisticsContainer::ConstPointer mitk::ImageStatisticsContainerManager::GetImageStatistics(const mitk::DataStorage* dataStorage, const mitk::BaseData* image, const mitk::BaseData* mask)
 {
   if (!dataStorage) {
     mitkThrow() << "data storage is nullptr!";
   }
   if (!image) {
     mitkThrow() << "Image is nullptr";
   }
 
   mitk::NodePredicateBase::ConstPointer predicate = GetPredicateForSources(image, mask);;
 
   if (predicate) {
     auto nodePredicateImageStatisticsContainer = mitk::NodePredicateDataType::New(ImageStatisticsContainer::GetStaticNameOfClass());
     predicate = mitk::NodePredicateAnd::New(predicate, nodePredicateImageStatisticsContainer);
 
     auto statisticContainerCandidateNodes = dataStorage->GetSubset(predicate);
     mitk::DataStorage::SetOfObjects::Pointer statisticContainerCandidateNodesFiltered;
 
     statisticContainerCandidateNodesFiltered = mitk::DataStorage::SetOfObjects::New();
     for (const auto& node : *statisticContainerCandidateNodes) {
-      auto nodeData = node->GetData();
       statisticContainerCandidateNodesFiltered->push_back(node);
     }
     
     if (statisticContainerCandidateNodesFiltered->empty()) {
       return nullptr;
     }
 
     auto newestElement = statisticContainerCandidateNodesFiltered->front();
     if (statisticContainerCandidateNodesFiltered->size() > 1) {
         //in case of multiple found statistics, return only newest one
         auto newestIter = std::max_element(std::begin(*statisticContainerCandidateNodesFiltered), std::end(*statisticContainerCandidateNodesFiltered), [](mitk::DataNode::Pointer a, mitk::DataNode::Pointer b) {
           return a->GetData()->GetMTime() < b->GetData()->GetMTime();
         });
         newestElement = *newestIter;
         MITK_WARN << "multiple statistics (" << statisticContainerCandidateNodesFiltered->size() << ") for image/mask found. Returning only newest one.";
         for (const auto& node : *statisticContainerCandidateNodesFiltered) {
           MITK_DEBUG << node->GetName() << ", timestamp: " << node->GetData()->GetMTime();
         }
       }
       return dynamic_cast<mitk::ImageStatisticsContainer*>(newestElement->GetData());
   }
   else {
     return nullptr;
   }
 }
 
 mitk::NodePredicateBase::ConstPointer mitk::ImageStatisticsContainerManager::GetPredicateForSources(const mitk::BaseData* image, const mitk::BaseData* mask)
 {
   if (!image) {
     mitkThrow() << "Image is nullptr";
   }
 
   auto imageRule = mitk::StatisticsToImageRelationRule::New();
   mitk::NodePredicateBase::ConstPointer predicate = imageRule->GetSourcesDetector(image);
 
   auto maskRule = mitk::StatisticsToMaskRelationRule::New();
   if (mask)
   {
     auto maskPredicate = maskRule->GetSourcesDetector(mask);
     predicate = mitk::NodePredicateAnd::New(predicate, maskPredicate);
   }
   else
   {
     auto maskPredicate = mitk::NodePredicateNot::New(maskRule->GetConnectedSourcesDetector());
     predicate = mitk::NodePredicateAnd::New(predicate, maskPredicate);
   }
 
   return predicate;
 }
diff --git a/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsTableModel.cpp b/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsTableModel.cpp
index e714e79f37..641b9f87c4 100644
--- a/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsTableModel.cpp
+++ b/Modules/ImageStatisticsUI/Qmitk/QmitkImageStatisticsTableModel.cpp
@@ -1,323 +1,323 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #include "QmitkImageStatisticsTableModel.h"
 #include "mitkProportionalTimeGeometry.h"
 #include "mitkStatisticsToImageRelationRule.h"
 #include "mitkImageStatisticsContainerManager.h"
 #include "itkMutexLockHolder.h"
 #include "itkSimpleFastMutexLock.h"
 
 
 QmitkImageStatisticsTableModel::QmitkImageStatisticsTableModel(QObject *parent) :
   QmitkAbstractDataStorageModel(parent)
 {}
 
 QmitkImageStatisticsTableModel
 ::~QmitkImageStatisticsTableModel()
 {
   // set data storage to nullptr so that the event listener gets removed
   this->SetDataStorage(nullptr);
 };
 
 void QmitkImageStatisticsTableModel::DataStorageChanged()
 {
   emit beginResetModel();
   UpdateByDataStorage();
   emit endResetModel();
 }
 
 void QmitkImageStatisticsTableModel::NodePredicateChanged()
 {
   emit beginResetModel();
   UpdateByDataStorage();
   emit endResetModel();
 }
 
 
 int QmitkImageStatisticsTableModel::rowCount(const QModelIndex &parent) const
 {
   if (parent.isValid())
   {
     return 0;
   }
   return m_StatisticNames.size();
 }
 
 int QmitkImageStatisticsTableModel::columnCount(const QModelIndex &parent) const
 {
   if (parent.isValid())
     return 0;
 
   if (m_ViewMode == ViewMode::imageXStatistic)
   {
     return static_cast<int>(m_TimeStepResolvedImageNodes.size());
   }
   else
   {
     mitkThrow() << "View mode ImageXMask is not implemented yet";
   }
 }
 
 std::pair<mitk::ImageStatisticsContainer::ConstPointer, unsigned int> QmitkImageStatisticsTableModel::GetRelevantStatsticsByIndex(const QModelIndex &index) const
 {
   auto result = std::make_pair<mitk::ImageStatisticsContainer::ConstPointer, unsigned int>(nullptr, 0);
 
   if (m_ViewMode == ViewMode::imageXStatistic)
   {
     if (index.column() < static_cast<int>(m_TimeStepResolvedImageNodes.size()))
     {
       auto selectedImage = m_TimeStepResolvedImageNodes.at(static_cast<size_t>(index.column()));
 
       //get the right statistic
       auto rule = mitk::StatisticsToImageRelationRule::New();
       for (mitk::ImageStatisticsContainer::ConstPointer container : m_Statistics)
       {
         if (rule->HasRelation(container, selectedImage.first->GetData()) >= mitk::PropertyRelationRuleBase::RelationType::Connected_Data)
         {
           return std::make_pair(container, selectedImage.second);
         }
       }
     }
   }
   else
   {
     mitkThrow() << "View mode ImageXMask is not implemented yet";
   }
 
   return result;
 }
 
 QVariant QmitkImageStatisticsTableModel::data(const QModelIndex &index, int role) const
 {
   if (!index.isValid())
     return QVariant();
 
   QVariant result;
   if (m_ViewMode == ViewMode::imageXStatistic) {
 
     auto containerInfo = GetRelevantStatsticsByIndex(index);
 
     if (containerInfo.first.IsNotNull() && index.row() < rowCount(QModelIndex()))
     {
       if (Qt::DisplayRole == role)
       {
         auto statsObj = containerInfo.first->GetStatisticsForTimeStep(containerInfo.second);
         auto statisticKey = m_StatisticNames.at(index.row());
         std::stringstream ss;
         if (statsObj.HasStatistic(statisticKey))
         {
           ss << statsObj.GetValueNonConverted(statisticKey);
         }
         else
         {
           ss << "N/A";
         }
         result = QVariant(QString::fromStdString(ss.str()));
       }
       else if (Qt::UserRole == role)
       {
         result = QVariant(index.row());
       }
 
     }
   }
 
   return result;
 }
 
 QModelIndex QmitkImageStatisticsTableModel::index(int row, int column, const QModelIndex &parent) const
 {
   bool hasIndex = this->hasIndex(row, column, parent);
   if (hasIndex)
   {
     return this->createIndex(row, column);
   }
 
   return QModelIndex();
 }
 
 QModelIndex QmitkImageStatisticsTableModel::parent(const QModelIndex &/*child*/) const
 {
   return QModelIndex();
 }
 
 
 Qt::ItemFlags QmitkImageStatisticsTableModel::flags(const QModelIndex &index) const
 {
   Qt::ItemFlags flags = QAbstractItemModel::flags(index);
 
   return flags;
 }
 
 QVariant QmitkImageStatisticsTableModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
   if ((Qt::DisplayRole == role) && (Qt::Horizontal == orientation))
   {
     if (!m_TimeStepResolvedImageNodes.empty()) {
       if (m_ViewMode == ViewMode::imageXStatistic) {
         std::stringstream ss;
         auto imageInfo = m_TimeStepResolvedImageNodes.at(section);
         ss << imageInfo.first->GetName();
         if (imageInfo.first->GetData() && imageInfo.first->GetData()->GetTimeSteps() > 1)
         {
           ss << " #" << imageInfo.second;
         }
         if (!m_MaskNodes.empty() && m_MaskNodes.size() == m_ImageNodes.size()) {
           auto maskInfo = m_TimeStepResolvedMaskNodes.at(section);
           ss << " / " << maskInfo.first->GetName();
         }
         return QVariant(ss.str().c_str());
       }
     }
   }
   else if ((Qt::DisplayRole == role) && (Qt::Vertical == orientation)) {
       if (m_ViewMode == ViewMode::imageXStatistic) {
         return QVariant(m_StatisticNames.at(section).c_str());
       }
   }
   return QVariant();
 }
 
 void QmitkImageStatisticsTableModel::SetImageNodes(const std::vector<mitk::DataNode::ConstPointer>& nodes)
 {
   std::vector<std::pair<mitk::DataNode::ConstPointer, unsigned int> > tempNodes;
   for (const auto& node: nodes)
   {
     auto data = node->GetData();
     if (data)
     {
       auto timeSteps = data->GetTimeSteps();
       for (unsigned int i = 0; i < timeSteps; i++)
       {
         tempNodes.push_back(std::make_pair(node, i));
       }
     }
   }
 
   emit beginResetModel();
   m_TimeStepResolvedImageNodes = std::move(tempNodes);
   m_ImageNodes = nodes;
   UpdateByDataStorage();
   emit endResetModel();
 }
 
 void QmitkImageStatisticsTableModel::SetMaskNodes(const std::vector<mitk::DataNode::ConstPointer>& nodes)
 {
   std::vector<std::pair<mitk::DataNode::ConstPointer, unsigned int>> tempNodes;
   for (const auto &node : nodes)
   {
     auto data = node->GetData();
     if (data)
     {
       auto timeSteps = data->GetTimeSteps();
       //special case: apply one mask to each timestep of an 4D image
       if (timeSteps == 1 && m_TimeStepResolvedImageNodes.size() > 1)
       {
         timeSteps = m_TimeStepResolvedImageNodes.size();
       }
       for (unsigned int i = 0; i < timeSteps; i++)
       {
         tempNodes.push_back(std::make_pair(node, i));
       }
     }
   }
 
   emit beginResetModel();
   m_TimeStepResolvedMaskNodes = std::move(tempNodes);
   m_MaskNodes = nodes;
   UpdateByDataStorage();
   emit endResetModel();
 }
 
 void QmitkImageStatisticsTableModel::SetViewMode(ViewMode m)
 {
   emit beginResetModel();
   m_ViewMode = m;
   emit endResetModel();
 }
 
 void QmitkImageStatisticsTableModel::Clear()
 {
   emit beginResetModel();
   m_Statistics.clear();
   m_ImageNodes.clear();
   m_TimeStepResolvedImageNodes.clear();
   m_MaskNodes.clear();
   m_StatisticNames.clear();
   emit endResetModel();
 }
 
 void QmitkImageStatisticsTableModel::UpdateByDataStorage()
 {
   StatisticsContainerVector newStatistics;
   
   auto datamanager = m_DataStorage.Lock();
 
   if (datamanager.IsNotNull())
   {
     for (const auto& image : m_ImageNodes)
     {
       if (m_MaskNodes.empty())
       {
         auto stats = mitk::ImageStatisticsContainerManager::GetImageStatistics(datamanager, image->GetData());
         if (stats.IsNotNull())
         {
           newStatistics.emplace_back(stats);
         }
       }
       else
       {
         for (const auto& mask : m_MaskNodes)
         {
           auto stats = mitk::ImageStatisticsContainerManager::GetImageStatistics(datamanager, image->GetData(), mask->GetData());
           if (stats.IsNotNull())
           {
             newStatistics.emplace_back(stats);
           }
         }
       }
     }
   }
 
   {
     itk::MutexLockHolder<itk::SimpleFastMutexLock> locked(m_Mutex);
     m_Statistics = newStatistics;
   }
 
   m_StatisticNames = mitk::GetAllStatisticNames(m_Statistics);
 }
 
-void QmitkImageStatisticsTableModel::NodeRemoved(const mitk::DataNode *node)
+void QmitkImageStatisticsTableModel::NodeRemoved(const mitk::DataNode *)
 {
   emit beginResetModel();
   UpdateByDataStorage();
   emit endResetModel();
 }
 
-void QmitkImageStatisticsTableModel::NodeAdded(const mitk::DataNode *node)
+void QmitkImageStatisticsTableModel::NodeAdded(const mitk::DataNode *)
 {
   emit beginResetModel();
   UpdateByDataStorage();
   emit endResetModel();
 }
 
-void QmitkImageStatisticsTableModel::NodeChanged(const mitk::DataNode *node)
+void QmitkImageStatisticsTableModel::NodeChanged(const mitk::DataNode *)
 {
   emit beginResetModel();
   UpdateByDataStorage();
   emit endResetModel();
 }
diff --git a/Modules/SurfaceInterpolation/mitkImageToPointCloudFilter.cpp b/Modules/SurfaceInterpolation/mitkImageToPointCloudFilter.cpp
index e8b2121f9b..49a0fb4845 100644
--- a/Modules/SurfaceInterpolation/mitkImageToPointCloudFilter.cpp
+++ b/Modules/SurfaceInterpolation/mitkImageToPointCloudFilter.cpp
@@ -1,167 +1,167 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #include "mitkImageToPointCloudFilter.h"
 
 #include <itkImageRegionIterator.h>
 #include <itkLaplacianImageFilter.h>
 
 #include <vtkPolyVertex.h>
 #include <vtkUnstructuredGrid.h>
 #include <vtkSmartPointer.h>
 
 #include <mitkITKImageImport.h>
 #include <mitkImageAccessByItk.h>
 #include <mitkImageStatisticsCalculator.h>
 #include <mitkUnstructuredGrid.h>
 #include <mitkImageStatisticsConstants.h>
 
 mitk::ImageToPointCloudFilter::ImageToPointCloudFilter() : m_Geometry(nullptr)
 {
   m_Method = DetectionMethod(0);
 
   this->SetNumberOfRequiredInputs(1);
 
   this->SetNumberOfIndexedOutputs(1);
 }
 
 mitk::ImageToPointCloudFilter::~ImageToPointCloudFilter()
 {
 }
 
 void mitk::ImageToPointCloudFilter::GenerateData()
 {
   mitk::Image::ConstPointer image = ImageToUnstructuredGridFilter::GetInput();
   m_Geometry = image->GetGeometry();
 
   if (image.IsNull())
   {
     MITK_ERROR << "mitk::ImageToContourFilter: No input available. "
                   "Please set the input!"
                << std::endl;
     return;
   }
 
   mitk::Image::Pointer notConstImage = const_cast<mitk::Image *>(image.GetPointer());
 
   switch (m_Method)
   {
     case 0:
       AccessByItk_1(notConstImage.GetPointer(), StdDeviations, 2) break;
 
     case 1:
       AccessByItk_1(notConstImage.GetPointer(), StdDeviations, 3) break;
 
     case 2:
       AccessByItk_1(notConstImage.GetPointer(), StdDeviations, 4) break;
 
     default:
       AccessByItk_1(notConstImage.GetPointer(), StdDeviations, 2) break;
   }
 }
 
 template <typename TPixel, unsigned int VImageDimension>
 void mitk::ImageToPointCloudFilter::StdDeviations(itk::Image<TPixel, VImageDimension> *image, int amount)
 {
   typedef itk::Image<TPixel, VImageDimension> InputImageType;
   typedef itk::CastImageFilter<InputImageType, FloatImageType> ImagePTypeToFloatPTypeCasterType;
   typedef itk::LaplacianImageFilter<FloatImageType, FloatImageType> LaplacianFilterType;
   typename LaplacianFilterType::Pointer lapFilter = LaplacianFilterType::New();
 
   typename ImagePTypeToFloatPTypeCasterType::Pointer caster = ImagePTypeToFloatPTypeCasterType::New();
   caster->SetInput(image);
   caster->Update();
   FloatImageType::Pointer fImage = caster->GetOutput();
 
   lapFilter->SetInput(fImage);
   lapFilter->UpdateLargestPossibleRegion();
-  mitk::Image::ConstPointer edgeImage = mitk::ImportItkImage(lapFilter->GetOutput());
+  auto edgeImage = mitk::ImportItkImage(lapFilter->GetOutput());
 
   mitk::ImageStatisticsCalculator::Pointer statCalc =
                                          mitk::ImageStatisticsCalculator::New();
-  statCalc->SetInputImage(edgeImage);
+  statCalc->SetInputImage(edgeImage.GetPointer());
   auto stats = statCalc->GetStatistics()->GetStatisticsForTimeStep(0);
   auto mean = stats.GetValueConverted<double>(mitk::ImageStatisticsConstants::MEAN());
   auto stdDev = stats.GetValueConverted<double>(mitk::ImageStatisticsConstants::STANDARDDEVIATION());
 
   double upperThreshold = mean + stdDev * amount;
   double lowerThreshold = mean - stdDev * amount;
 
   typename itk::ImageRegionIterator<FloatImageType> it(lapFilter->GetOutput(),
                                                        lapFilter->GetOutput()->GetRequestedRegion());
 
   vtkSmartPointer<vtkPoints> points = vtkSmartPointer<vtkPoints>::New();
 
   double greatX = 0, greatY = 0, greatZ = 0;
 
   it.GoToBegin();
   while (!it.IsAtEnd())
   {
     if (it.Get() > lowerThreshold && it.Get() < upperThreshold)
     {
       it.Set(0);
     }
     else
     {
       it.Set(1);
 
       mitk::Point3D imagePoint;
       mitk::Point3D worldPoint;
 
       imagePoint[0] = it.GetIndex()[0];
       imagePoint[1] = it.GetIndex()[1];
       imagePoint[2] = it.GetIndex()[2];
 
       m_Geometry->IndexToWorld(imagePoint, worldPoint);
 
       if (worldPoint[0] > greatX)
         greatX = worldPoint[0];
       if (worldPoint[1] > greatY)
         greatY = worldPoint[1];
       if (worldPoint[2] > greatZ)
         greatZ = worldPoint[2];
 
       points->InsertNextPoint(worldPoint[0], worldPoint[1], worldPoint[2]);
       m_NumberOfExtractedPoints++;
     }
     ++it;
   }
 
   /*need to build the UnstructuredGrid with at least one vertex otherwise its
   not visible*/
   vtkSmartPointer<vtkPolyVertex> verts = vtkSmartPointer<vtkPolyVertex>::New();
 
   verts->GetPointIds()->SetNumberOfIds(m_NumberOfExtractedPoints);
   for (int i = 0; i < m_NumberOfExtractedPoints; i++)
   {
     verts->GetPointIds()->SetId(i, i);
   }
 
   vtkSmartPointer<vtkUnstructuredGrid> uGrid = vtkSmartPointer<vtkUnstructuredGrid>::New();
   uGrid->Allocate(1);
 
   uGrid->InsertNextCell(verts->GetCellType(), verts->GetPointIds());
   uGrid->SetPoints(points);
 
   mitk::UnstructuredGrid::Pointer outputGrid = mitk::UnstructuredGrid::New();
   outputGrid->SetVtkUnstructuredGrid(uGrid);
   this->SetNthOutput(0, outputGrid);
 }
 
 void mitk::ImageToPointCloudFilter::GenerateOutputInformation()
 {
   Superclass::GenerateOutputInformation();
 }
diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.cpp b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.cpp
index 9ea96593b1..672bb2b976 100644
--- a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.cpp
+++ b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.cpp
@@ -1,414 +1,414 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #include "QmitkImageStatisticsReloadedView.h"
 
 #include <utility>
 
 // berry includes
 #include <berryWorkbenchPlugin.h>
 #include <berryIQtStyleManager.h>
 
 #include <QmitkChartWidget.h>
 #include <mitkNodePredicateOr.h>
 #include <mitkStatusBar.h>
 #include <mitkIntensityProfile.h>
 #include <mitkImageStatisticsPredicateHelper.h>
 #include <mitkImageStatisticsContainerNodeHelper.h>
 #include <mitkNodePredicateAnd.h>
 #include <mitkNodePredicateGeometry.h>
 #include <mitkSliceNavigationController.h>
 #include <mitkStatisticsToImageRelationRule.h>
 #include <mitkStatisticsToMaskRelationRule.h>
 
 #include <mitkPlanarFigureInteractor.h>
 #include "mitkImageStatisticsContainerManager.h"
 
 
 const std::string QmitkImageStatisticsReloadedView::VIEW_ID = "org.mitk.views.imagestatisticsReloaded";
 
 QmitkImageStatisticsReloadedView::QmitkImageStatisticsReloadedView(QObject* /*parent*/, const char* /*name*/)
 {
   this->m_CalculationThread = new QmitkImageStatisticsCalculationJob();
 }
 
 QmitkImageStatisticsReloadedView::~QmitkImageStatisticsReloadedView()
 {
   if (m_selectedPlanarFigure)
     m_selectedPlanarFigure->RemoveObserver(m_PlanarFigureObserverTag);
 }
 
 void QmitkImageStatisticsReloadedView::CreateQtPartControl(QWidget *parent)
 {
   m_Controls.setupUi(parent);
   m_Controls.widget_histogram->SetTheme(this->GetColorTheme());
   m_Controls.widget_intensityProfile->SetTheme(this->GetColorTheme());
   m_Controls.groupBox_histogram->setVisible(true);
   m_Controls.groupBox_intensityProfile->setVisible(false);
   m_Controls.label_currentlyComputingStatistics->setVisible(false);
   m_Controls.sliderWidget_histogram->setPrefix("Time: ");
   m_Controls.sliderWidget_histogram->setDecimals(0);
   m_Controls.sliderWidget_histogram->setVisible(false);
 
   PrepareDataStorageComboBoxes();
   m_Controls.widget_statistics->SetDataStorage(this->GetDataStorage());
   CreateConnections();
 }
 
 void QmitkImageStatisticsReloadedView::CreateConnections()
 {
   connect(this->m_CalculationThread, &QmitkImageStatisticsCalculationJob::finished, this, &QmitkImageStatisticsReloadedView::OnStatisticsCalculationEnds, Qt::QueuedConnection);
   connect(this->m_Controls.checkBox_ignoreZero, &QCheckBox::stateChanged, this, &QmitkImageStatisticsReloadedView::OnCheckBoxIgnoreZeroStateChanged);
   connect(this->m_Controls.sliderWidget_histogram, &ctkSliderWidget::valueChanged, this, &QmitkImageStatisticsReloadedView::OnSliderWidgetHistogramChanged);
   connect(this->m_Controls.imageSelector, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &QmitkImageStatisticsReloadedView::OnImageSelectorChanged);
   connect(this->m_Controls.maskImageSelector, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &QmitkImageStatisticsReloadedView::OnMaskSelectorChanged);
 }
 
 void QmitkImageStatisticsReloadedView::OnCheckBoxIgnoreZeroStateChanged(int state)
 {
   m_ForceRecompute = true;
   if (state != Qt::Unchecked)
   {
     this->m_CalculationThread->SetIgnoreZeroValueVoxel(true);
   }
   else
   {
     this->m_CalculationThread->SetIgnoreZeroValueVoxel(false);
   }
   CalculateOrGetStatistics();
 }
 
 void QmitkImageStatisticsReloadedView::OnSliderWidgetHistogramChanged(double value)
 {
   unsigned int timeStep = static_cast<unsigned int>(value);
   auto mask = m_selectedMaskNode ? m_selectedMaskNode->GetData() : nullptr;
   auto imageStatistics = mitk::ImageStatisticsContainerManager::GetImageStatistics(this->GetDataStorage(), m_selectedImageNode->GetData(), mask);
   HistogramType::ConstPointer histogram = imageStatistics->GetStatisticsForTimeStep(timeStep).m_Histogram;
 
   if (histogram.IsNotNull() && this->m_CalculationThread->GetStatisticsUpdateSuccessFlag())
   {
     this->FillHistogramWidget({ histogram }, { m_selectedImageNode->GetName() });
   }
 }
 
 void QmitkImageStatisticsReloadedView::PartClosed(const berry::IWorkbenchPartReference::Pointer&)
 {
 }
 
 void QmitkImageStatisticsReloadedView::FillHistogramWidget(const std::vector<HistogramType::ConstPointer>& histogram, const std::vector<std::string>& dataLabels)
 {
   m_Controls.groupBox_histogram->setVisible(true);
   m_Controls.widget_histogram->SetTheme(this->GetColorTheme());
   m_Controls.widget_histogram->Reset();
   m_Controls.widget_histogram->SetHistogram(histogram.front(), dataLabels.front());
   connect(m_Controls.widget_histogram, &QmitkHistogramVisualizationWidget::RequestHistogramUpdate, this, &QmitkImageStatisticsReloadedView::OnRequestHistogramUpdate);
 }
 
 QmitkChartWidget::ChartStyle QmitkImageStatisticsReloadedView::GetColorTheme() const
 {
   ctkPluginContext* context = berry::WorkbenchPlugin::GetDefault()->GetPluginContext();
   ctkServiceReference styleManagerRef = context->getServiceReference<berry::IQtStyleManager>();
   if (styleManagerRef)
   {
     auto styleManager = context->getService<berry::IQtStyleManager>(styleManagerRef);
     if (styleManager->GetStyle().name == "Dark") {
       return QmitkChartWidget::ChartStyle::darkstyle;
     }
     else {
       return QmitkChartWidget::ChartStyle::lightstyle;
     }
   }
   return QmitkChartWidget::ChartStyle::darkstyle;
 }
 
 void QmitkImageStatisticsReloadedView::OnImageSelectorChanged()
 {
   auto selectedImageNode = m_Controls.imageSelector->GetSelectedNode();
   if (selectedImageNode != m_selectedImageNode)
   {
     m_selectedImageNode = selectedImageNode;
     if (m_selectedImageNode.IsNotNull()) {
       auto isPlanarFigurePredicate = mitk::GetImageStatisticsPlanarFigurePredicate();
       auto isMaskPredicate = mitk::GetImageStatisticsMaskPredicate();
       auto hasSameGeometry = mitk::NodePredicateGeometry::New(m_selectedImageNode->GetData()->GetGeometry());
       hasSameGeometry->SetCheckPrecision(1e-10);
       auto isMaskWithGeometryPredicate = mitk::NodePredicateAnd::New(isMaskPredicate, hasSameGeometry);
       auto isMaskOrPlanarFigureWithGeometryPredicate = mitk::NodePredicateOr::New(isPlanarFigurePredicate, isMaskWithGeometryPredicate);
       //prevent triggering of computation as the predicate triggers a signalChanged event
       m_Controls.maskImageSelector->disconnect();
       m_Controls.maskImageSelector->SetPredicate(isMaskOrPlanarFigureWithGeometryPredicate);
       m_Controls.maskImageSelector->SetZeroEntryText("<none>");
       CalculateOrGetStatistics();
       m_Controls.widget_statistics->SetImageNodes({ m_selectedImageNode.GetPointer() });
       connect(this->m_Controls.maskImageSelector,
               static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
               this,
               &QmitkImageStatisticsReloadedView::OnMaskSelectorChanged);
     }
     else
     {
       m_Controls.widget_statistics->SetImageNodes({});
     }
   }
 }
 
 void QmitkImageStatisticsReloadedView::OnMaskSelectorChanged()
 {
   auto selectedMaskNode = m_Controls.maskImageSelector->GetSelectedNode();
   if (selectedMaskNode != m_selectedMaskNode)
   {
     m_selectedMaskNode = selectedMaskNode;
     if (m_selectedMaskNode.IsNotNull())
     {
       m_Controls.widget_statistics->SetMaskNodes({ m_selectedMaskNode.GetPointer() });
     }
     else
     {
       m_Controls.widget_statistics->SetMaskNodes({});
     }
     CalculateOrGetStatistics();
   }
 }
 
 void QmitkImageStatisticsReloadedView::CalculateOrGetStatistics()
 {
   if (this->m_selectedPlanarFigure)
   {
     this->m_selectedPlanarFigure->RemoveObserver(this->m_PlanarFigureObserverTag);
     this->m_selectedPlanarFigure = nullptr;
   }
 
   m_Controls.groupBox_intensityProfile->setVisible(false);
   m_Controls.widget_statistics->setEnabled(m_selectedImageNode.IsNotNull());
 
   if (m_selectedImageNode != nullptr) {
     auto image = dynamic_cast<mitk::Image*>(m_selectedImageNode->GetData());
     mitk::Image::Pointer mask = nullptr;
     mitk::PlanarFigure::Pointer maskPlanarFigure = nullptr;
 
     if (image->GetDimension() == 4) {
       m_Controls.sliderWidget_histogram->setVisible(true);
       unsigned int maxTimestep = image->GetTimeSteps();
       m_Controls.sliderWidget_histogram->setMaximum(maxTimestep - 1);
     }
     else {
       m_Controls.sliderWidget_histogram->setVisible(false);
     }
 
     if (m_selectedMaskNode != nullptr) {
       mask = dynamic_cast<mitk::Image*>(m_selectedMaskNode->GetData());
       if (mask == nullptr) {
         maskPlanarFigure = dynamic_cast<mitk::PlanarFigure*>(m_selectedMaskNode->GetData());
       }
     }
 
     mitk::ImageStatisticsContainer::ConstPointer imageStatistics;
     if (mask) {
       auto imageStatistics = mitk::ImageStatisticsContainerManager::GetImageStatistics(this->GetDataStorage(), image, mask.GetPointer());
     }
     else if (maskPlanarFigure) {
       m_selectedPlanarFigure = maskPlanarFigure;
       ITKCommandType::Pointer changeListener = ITKCommandType::New();
       changeListener->SetCallbackFunction(this, &QmitkImageStatisticsReloadedView::CalculateOrGetStatistics);
       this->m_PlanarFigureObserverTag =
         m_selectedPlanarFigure->AddObserver(mitk::EndInteractionPlanarFigureEvent(), changeListener);
       if (!maskPlanarFigure->IsClosed()) {
         ComputeAndDisplayIntensityProfile(image, maskPlanarFigure);
       }
       imageStatistics = mitk::ImageStatisticsContainerManager::GetImageStatistics(this->GetDataStorage(), image, maskPlanarFigure.GetPointer());
     }
     else {
       imageStatistics = mitk::ImageStatisticsContainerManager::GetImageStatistics(this->GetDataStorage(),image);
     }
 
     bool imageStatisticsOlderThanInputs = false;
     if (imageStatistics && (imageStatistics->GetMTime() < image->GetMTime() ||
-      mask && imageStatistics->GetMTime() < mask->GetMTime() ||
-      maskPlanarFigure && imageStatistics->GetMTime() < maskPlanarFigure->GetMTime())) {
+      (mask && imageStatistics->GetMTime() < mask->GetMTime()) ||
+      (maskPlanarFigure && imageStatistics->GetMTime() < maskPlanarFigure->GetMTime()))) {
       imageStatisticsOlderThanInputs = true;
     }
 
     //statistics need to be computed
     if (!imageStatistics || imageStatisticsOlderThanInputs || m_ForceRecompute) {
       CalculateStatistics(image, mask.GetPointer(), maskPlanarFigure.GetPointer());
     }
     //statistics already computed
     else {
       if (!(maskPlanarFigure && maskPlanarFigure->IsClosed())) {
         if (imageStatistics->TimeStepExists(0)) {
           auto histogram = imageStatistics->GetStatisticsForTimeStep(0).m_Histogram.GetPointer();
           std::string imageNodeName = m_selectedImageNode->GetName();
           this->FillHistogramWidget({histogram}, {imageNodeName });
         }
       }
     }
 
   }
   else {
     ResetGUI();
   }
   m_ForceRecompute = false;
 }
 
 void QmitkImageStatisticsReloadedView::ComputeAndDisplayIntensityProfile(mitk::Image * image, mitk::PlanarFigure::Pointer maskPlanarFigure)
 {
   auto intensityProfile = mitk::ComputeIntensityProfile(image, maskPlanarFigure);
   //Don't show histogram for intensity profiles
   m_Controls.groupBox_histogram->setVisible(false);
   m_Controls.groupBox_intensityProfile->setVisible(true);
   m_Controls.widget_intensityProfile->Reset();
   m_Controls.widget_intensityProfile->SetIntensityProfile(intensityProfile.GetPointer(), "Intensity Profile of " + m_selectedImageNode->GetName());
 }
 
 void QmitkImageStatisticsReloadedView::ResetGUI()
 {
   m_Controls.widget_statistics->Reset();
   //m_Controls.widget_statistics->setEnabled(false);
   m_Controls.widget_histogram->Reset();
   m_Controls.widget_histogram->setEnabled(false);
 }
 
 void QmitkImageStatisticsReloadedView::OnStatisticsCalculationEnds()
 {
   mitk::StatusBar::GetInstance()->Clear();
 
   if (this->m_CalculationThread->GetStatisticsUpdateSuccessFlag()) {
     auto statistic = m_CalculationThread->GetStatisticsData();
     mitk::PropertyRelations::RuleResultVectorType rulesForCurrentStatistic;
     auto statisticNonConst = statistic->Clone();
     auto statisticsNodeName = m_selectedImageNode->GetName();
     if (m_selectedMaskNode) {
       statisticsNodeName += "_" + m_selectedMaskNode->GetName();
     }
     statisticsNodeName += "_statistics";
     auto statisticsNode = mitk::CreateImageStatisticsNode(statisticNonConst, statisticsNodeName);
     auto imageRule = mitk::StatisticsToImageRelationRule::New();
     imageRule->Connect(statisticNonConst.GetPointer(), m_CalculationThread->GetStatisticsImage().GetPointer());
     rulesForCurrentStatistic.push_back(imageRule.GetPointer());
 
     if (m_CalculationThread->GetMaskImage()) {
       auto maskRule = mitk::StatisticsToMaskRelationRule::New();
       maskRule->Connect(statisticNonConst.GetPointer(), m_CalculationThread->GetMaskImage().GetPointer());
       rulesForCurrentStatistic.push_back(maskRule.GetPointer());
     }
     else if (m_CalculationThread->GetPlanarFigure()) {
       auto planarFigureRule = mitk::StatisticsToMaskRelationRule::New();
       planarFigureRule->Connect(statisticNonConst.GetPointer(), m_CalculationThread->GetPlanarFigure().GetPointer());
       rulesForCurrentStatistic.push_back(planarFigureRule.GetPointer());
     }
 
     m_statisticContainerRules.push_back(rulesForCurrentStatistic);
 
     this->GetDataStorage()->Add(statisticsNode);
 
     if (!m_selectedPlanarFigure || m_selectedPlanarFigure->IsClosed()) {
       this->FillHistogramWidget({ m_CalculationThread->GetTimeStepHistogram() }, { m_selectedImageNode->GetName() });
     }
   }
   else {
     mitk::StatusBar::GetInstance()->DisplayErrorText(m_CalculationThread->GetLastErrorMessage().c_str());
     m_Controls.widget_histogram->setEnabled(false);
   }
   m_Controls.label_currentlyComputingStatistics->setVisible(false);
 }
 
 void QmitkImageStatisticsReloadedView::OnRequestHistogramUpdate(unsigned int nBins)
 {
   m_CalculationThread->SetHistogramNBins(nBins);
   m_CalculationThread->start();
 }
 
 void QmitkImageStatisticsReloadedView::CalculateStatistics(mitk::Image::ConstPointer image, mitk::Image::ConstPointer mask, mitk::PlanarFigure::ConstPointer maskPlanarFigure)
 {
   this->m_StatisticsUpdatePending = true;
   auto renderPart = this->GetRenderWindowPart();
   unsigned int timeStep = renderPart->GetTimeNavigationController()->GetTime()->GetPos();
   this->m_CalculationThread->Initialize(image, mask, maskPlanarFigure);
   this->m_CalculationThread->SetTimeStep(timeStep);
 
   try
   {
     // Compute statistics
     this->m_CalculationThread->start();
     m_Controls.label_currentlyComputingStatistics->setVisible(true);
   }
   catch (const mitk::Exception& e)
   {
     mitk::StatusBar::GetInstance()->DisplayErrorText(e.GetDescription());
     this->m_StatisticsUpdatePending = false;
     m_Controls.label_currentlyComputingStatistics->setVisible(false);
   }
   catch (const std::runtime_error &e)
   {
     mitk::StatusBar::GetInstance()->DisplayErrorText(e.what());
     this->m_StatisticsUpdatePending = false;
     m_Controls.label_currentlyComputingStatistics->setVisible(false);
   }
   catch (const std::exception &e)
   {
     mitk::StatusBar::GetInstance()->DisplayErrorText(e.what());
     this->m_StatisticsUpdatePending = false;
     m_Controls.label_currentlyComputingStatistics->setVisible(false);
   }
 }
 
 void QmitkImageStatisticsReloadedView::OnSelectionChanged(berry::IWorkbenchPart::Pointer part, const QList<mitk::DataNode::Pointer> &nodes)
 {
   Q_UNUSED(part);
   Q_UNUSED(nodes);
 }
 
 void QmitkImageStatisticsReloadedView::PrepareDataStorageComboBoxes()
 {
   auto isPlanarFigurePredicate = mitk::GetImageStatisticsPlanarFigurePredicate();
   auto isMaskPredicate = mitk::GetImageStatisticsMaskPredicate();
   auto isImagePredicate = mitk::GetImageStatisticsImagePredicate();
   auto isMaskOrPlanarFigurePredicate = mitk::NodePredicateOr::New(isPlanarFigurePredicate, isMaskPredicate);
 
   m_Controls.imageSelector->SetDataStorage(GetDataStorage());
   m_Controls.imageSelector->SetPredicate(isImagePredicate);
 
   m_Controls.maskImageSelector->SetDataStorage(GetDataStorage());
 
   m_Controls.maskImageSelector->SetPredicate(isMaskOrPlanarFigurePredicate);
   m_Controls.maskImageSelector->SetZeroEntryText("<none>");
 }
 
 void QmitkImageStatisticsReloadedView::Activated()
 {
 }
 
 void QmitkImageStatisticsReloadedView::Deactivated()
 {
 }
 
 void QmitkImageStatisticsReloadedView::Visible()
 {
   connect(this->m_Controls.imageSelector, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &QmitkImageStatisticsReloadedView::OnImageSelectorChanged);
   connect(this->m_Controls.maskImageSelector, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &QmitkImageStatisticsReloadedView::OnMaskSelectorChanged);
   OnImageSelectorChanged();
   OnMaskSelectorChanged();
 }
 
 void QmitkImageStatisticsReloadedView::Hidden()
 {
   m_Controls.imageSelector->disconnect();
   m_Controls.maskImageSelector->disconnect();
 }
 
 void QmitkImageStatisticsReloadedView::SetFocus()
 {
 }