sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix active faces not supported

Browse Source
This commit is contained in:
vcloarec 2020-03-05 14:12:54 -04:00 committed by Peter Petrik
parent 0675c0b697
commit 78bd73eb87
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/3d/mesh/qgsmesh3dgeometry_p.cpp
View File

@ -144,7 +144,7 @@ static QByteArray createDatasetIndexData( const QgsTriangularMesh &mesh, const Q
for ( int i = 0; i < trianglesCount; ++i ) for ( int i = 0; i < trianglesCount; ++i )
{ {
int nativeFaceIndex = mesh.trianglesToNativeFaces()[i]; int nativeFaceIndex = mesh.trianglesToNativeFaces()[i];
const bool isActive = mActiveFaceFlagValues.active( nativeFaceIndex ); const bool isActive = mActiveFaceFlagValues.active().isEmpty() || mActiveFaceFlagValues.active( nativeFaceIndex );
if ( !isActive ) if ( !isActive )
continue; continue;
const QgsMeshFace &face = mesh.triangles().at( i ); const QgsMeshFace &face = mesh.triangles().at( i );
@ -425,12 +425,15 @@ int QgsMeshDataset3dGeometry::extractDataset( QVector<double> &verticalMagnitude
//count active faces //count active faces
int activeTriangularCount = 0; int activeTriangularCount = 0;
for ( int i = 0; i < triangularMesh.triangles().count(); ++i ) if ( activeFaceFlagValues.active().isEmpty() )
{ activeTriangularCount = triangularMesh.triangles().count();
int nativeIndex = triangularMesh.trianglesToNativeFaces()[i]; else
if ( activeFaceFlagValues.active( nativeIndex ) ) for ( int i = 0; i < triangularMesh.triangles().count(); ++i )
activeTriangularCount++; {
} int nativeIndex = triangularMesh.trianglesToNativeFaces()[i];
if ( activeFaceFlagValues.active( nativeIndex ) )
activeTriangularCount++;
}
//extract the scalar dataset used to render color shading //extract the scalar dataset used to render color shading
QgsMeshDataBlock scalarActiveFaceFlagValues = QgsMeshDataBlock scalarActiveFaceFlagValues =

2
src/core/mesh/qgsmeshlayerutils.cpp
View File

@ -306,8 +306,6 @@ QVector<double> QgsMeshLayerUtils::calculateMagnitudeOnVertices( const QgsMeshLa
if ( vals.isValid() ) if ( vals.isValid() )
{ {
ret = QgsMeshLayerUtils::calculateMagnitudes( vals ); ret = QgsMeshLayerUtils::calculateMagnitudes( vals );
QgsMeshDataBlock scalarActiveFaceFlagValues =
meshLayer->dataProvider()->areFacesActive( index, 0, nativeMesh->faces.count() );
if ( !scalarDataOnVertices ) if ( !scalarDataOnVertices )
{ {