diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/files.cmake b/Plugins/org.mitk.gui.qt.measurementtoolbox/files.cmake index 7397938053..c6920059f2 100644 --- a/Plugins/org.mitk.gui.qt.measurementtoolbox/files.cmake +++ b/Plugins/org.mitk.gui.qt.measurementtoolbox/files.cmake @@ -1,60 +1,58 @@ set(SRC_CPP_FILES ) set(INTERNAL_CPP_FILES QmitkMeasurementView.cpp - QmitkPlanarFiguresTableModel.cpp QmitkImageStatisticsView.cpp QmitkImageStatisticsReloadedView.cpp QmitkImageStatisticsCalculationThread.cpp mitkPluginActivator.cpp ) set(UI_FILES src/internal/QmitkImageStatisticsViewControls.ui src/internal/QmitkImageStatisticsReloadedViewControls.ui ) set(MOC_H_FILES src/internal/QmitkMeasurementView.h - src/internal/QmitkPlanarFiguresTableModel.h src/internal/QmitkImageStatisticsView.h src/internal/QmitkImageStatisticsReloadedView.h src/internal/QmitkImageStatisticsCalculationThread.h src/internal/mitkPluginActivator.h ) set(CACHED_RESOURCE_FILES resources/angle.png resources/arrow.png resources/circle.png resources/four-point-angle.png resources/lena.xpm resources/line.png resources/measurement.svg resources/path.png resources/polygon.png resources/rectangle.png resources/stats.png resources/text.png resources/bar-chart.svg plugin.xml ) set(QRC_FILES resources/measurement.qrc resources/QmitkImageStatisticsView.qrc ) set(CPP_FILES ) foreach(file ${SRC_CPP_FILES}) set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.cpp b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.cpp deleted file mode 100644 index 26414a03d0..0000000000 --- a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.cpp +++ /dev/null @@ -1,124 +0,0 @@ -/*=================================================================== - -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 "QmitkPlanarFiguresTableModel.h" -#include -#include -#include - -QmitkPlanarFiguresTableModel::QmitkPlanarFiguresTableModel( mitk::DataStorage::Pointer _DataStorage, mitk::NodePredicateBase* _Predicate, QObject* parent ) -: QmitkDataStorageTableModel(_DataStorage, _Predicate, parent) -{ - -} - -QmitkPlanarFiguresTableModel::~QmitkPlanarFiguresTableModel() -{ - -} - -QVariant QmitkPlanarFiguresTableModel::headerData( int section, Qt::Orientation orientation, int role ) const -{ - QVariant headerData; - - // show only horizontal header - if ( role == Qt::DisplayRole ) - { - if( orientation == Qt::Horizontal ) - { - // first column: "Name" - if(section == 0) - headerData = "Name"; - else if(section == 1) - headerData = "Info"; - } - else if( orientation == Qt::Vertical ) - { - // show numbers for rows - headerData = section+1; - } - } - - return headerData; -} - -Qt::ItemFlags QmitkPlanarFiguresTableModel::flags( const QModelIndex &index ) const -{ - // name & visibility is editable - if (index.column() == 0) - return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable; - else - return Qt::ItemIsEnabled | Qt::ItemIsSelectable; -} - -int QmitkPlanarFiguresTableModel::columnCount( const QModelIndex & ) const -{ - return 2; -} - -QVariant QmitkPlanarFiguresTableModel::data( const QModelIndex &index, int role ) const -{ - QVariant data; - if(!index.isValid()) - return data; - mitk::DataNode::Pointer node = this->m_NodeSet.at(index.row()); - - if(!node) - return data; - - if(index.column() == 0 && role == Qt::DecorationRole) - { - if(node) - { - QmitkNodeDescriptor* nodeDescriptor - = QmitkNodeDescriptorManager::GetInstance()->GetDescriptor(node); - data = nodeDescriptor->GetIcon(node); - } - } - else if(index.column() == 1) - { - if(role == Qt::DisplayRole || role == Qt::ToolTipRole) - { - QString info; - mitk::PlanarFigure* planarFigure = dynamic_cast(node->GetData()); - if(!planarFigure) - return data; - - mitk::PlanarAngle* planarAngle = dynamic_cast(planarFigure); - double featureQuantity; - for(unsigned int i=0; iGetNumberOfFeatures(); ++i) - { - featureQuantity = planarFigure->GetQuantity(i); - if(planarAngle && i == planarAngle->FEATURE_ID_ANGLE) - featureQuantity = featureQuantity * 180 / vnl_math::pi; - - //std::ostringstream s; s.precision(2); s << featureQuantity; - info.append(QString("%1: %2 %3") - .arg(QString(planarFigure->GetFeatureName(i))) - .arg(featureQuantity, 0, 'f', 2) - .arg(QString(planarFigure->GetFeatureUnit(i)))); - if((i+1) != planarFigure->GetNumberOfFeatures()) - info.append(", "); - - data = info; - } - } - } - else - return QmitkDataStorageTableModel::data(index, role); - - return data; -} diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.h b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.h deleted file mode 100644 index 01dfc33d1c..0000000000 --- a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.h +++ /dev/null @@ -1,75 +0,0 @@ -/*=================================================================== - -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 QmitkPlanarFiguresTableModel_h -#define QmitkPlanarFiguresTableModel_h - -/// Toolkit includes. -#include - -/// Forward declarations. - -/// -/// \class QmitkPlanarFiguresTableModel -/// -/// \brief A table model for a set of DataNodes defined by a predicate. -/// \TODO make columns interchangeable, select which properties to show as columns -/// -class QmitkPlanarFiguresTableModel : public QmitkDataStorageTableModel -{ - Q_OBJECT - - //#Ctors/Dtor -public: - /// - /// Constructs a new QmitkPlanarFiguresTableModel and sets a predicate that defines - /// this list. - /// \see setPredicate() - /// - QmitkPlanarFiguresTableModel(mitk::DataStorage::Pointer _DataStorage, mitk::NodePredicateBase* _Predicate = nullptr - , QObject* parent = nullptr ); - - /// - /// Standard dtor. Delete predicate, disconnect from DataStorage. - /// - virtual ~QmitkPlanarFiguresTableModel(); - - //# Public GETTER -public: - /// - /// Overridden from QAbstractTableModel. Returns the header data at section - /// for given orientation and role. - /// - QVariant headerData(int section, Qt::Orientation orientation, - int role) const override; - /// - /// Overridden from QAbstractTableModel. Returns what can be done - /// with an item. - /// - Qt::ItemFlags flags(const QModelIndex &index) const override; - /// - /// Overridden from QAbstractTableModel. Returns the number of features (columns) to display. - /// - int columnCount(const QModelIndex &parent) const override; - /// - /// Overridden from QAbstractTableModel. Returns the data at index for given role. - /// - QVariant data(const QModelIndex &index, int role) const override; - -}; - -#endif -