Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Also show % of cloud which falls into different classifications
  • Loading branch information
nyalldawson committed Dec 2, 2020
1 parent ecd4864 commit 4b50280
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
11 changes: 10 additions & 1 deletion src/app/pointcloud/qgspointcloudlayerproperties.cpp
Expand Up @@ -551,7 +551,7 @@ QgsPointCloudClassificationStatisticsModel::QgsPointCloudClassificationStatistic

int QgsPointCloudClassificationStatisticsModel::columnCount( const QModelIndex & ) const
{
return Count + 1;
return Percent + 1;
}

int QgsPointCloudClassificationStatisticsModel::rowCount( const QModelIndex & ) const
Expand Down Expand Up @@ -582,6 +582,12 @@ QVariant QgsPointCloudClassificationStatisticsModel::data( const QModelIndex &in
case Count:
return mLayer->dataProvider() ? mLayer->dataProvider()->metadataClassStatistic( mAttribute, classValue, QgsStatisticalSummary::Count ) : QVariant();

case Percent:
{
const int pointCount = mLayer->dataProvider() ? mLayer->dataProvider()->pointCount() : -1;
return pointCount > 0 ? mLayer->dataProvider()->metadataClassStatistic( mAttribute, classValue, QgsStatisticalSummary::Count ).toDouble() / pointCount * 100 : QVariant();
}

}
return QVariant();
}
Expand All @@ -595,6 +601,7 @@ QVariant QgsPointCloudClassificationStatisticsModel::data( const QModelIndex &in

case Value:
case Count:
case Percent:
return QVariant( Qt::AlignRight | Qt::AlignVCenter );

}
Expand Down Expand Up @@ -630,6 +637,8 @@ QVariant QgsPointCloudClassificationStatisticsModel::headerData( int section, Qt
return tr( "Classification" );
case Count:
return tr( "Count" );
case Percent:
return tr( "%" );
}
}
return QVariant();
Expand Down
3 changes: 2 additions & 1 deletion src/app/pointcloud/qgspointcloudlayerproperties.h
Expand Up @@ -71,7 +71,8 @@ class QgsPointCloudClassificationStatisticsModel : public QAbstractTableModel
{
Value,
Classification,
Count
Count,
Percent
};

QgsPointCloudClassificationStatisticsModel( QgsPointCloudLayer *layer, const QString &attribute, QObject *parent );
Expand Down

0 comments on commit 4b50280

Please sign in to comment.