Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #41929 from nyalldawson/pc
Minor point cloud usability fixes
  • Loading branch information
nyalldawson authored and github-actions[bot] committed Mar 1, 2021
1 parent 2436862 commit 7f326f3
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/app/3d/qgs3dapputils.cpp
Expand Up @@ -77,7 +77,7 @@ std::unique_ptr<QgsPointCloudLayer3DRenderer> Qgs3DAppUtils::convert2dPointCloud
symbol->setGreenContrastEnhancement( renderer2d->greenContrastEnhancement() ? new QgsContrastEnhancement( *renderer2d->greenContrastEnhancement() ) : nullptr );
symbol->setBlueContrastEnhancement( renderer2d->blueContrastEnhancement() ? new QgsContrastEnhancement( *renderer2d->blueContrastEnhancement() ) : nullptr );
}
else if ( renderer->type() == QLatin1String( "classification" ) )
else if ( renderer->type() == QLatin1String( "classified" ) )
{

const QgsPointCloudClassifiedRenderer *renderer2d = dynamic_cast< const QgsPointCloudClassifiedRenderer * >( renderer );
Expand Down
17 changes: 17 additions & 0 deletions src/app/qgisapp.cpp
Expand Up @@ -5813,6 +5813,23 @@ QgsPointCloudLayer *QgisApp::addPointCloudLayerPrivate( const QString &uri, cons
std::unique_ptr< QgsPointCloudLayer3DRenderer > renderer3D = Qgs3DAppUtils::convert2dPointCloudRendererTo3d( layer->renderer() );
if ( renderer3D )
layer->setRenderer3D( renderer3D.release() );
else
{
// maybe waiting on an index...
if ( layer->dataProvider()->indexingState() != QgsPointCloudDataProvider::Indexed )
{
QPointer< QgsPointCloudLayer > layerPointer( layer.get() );
connect( layer->dataProvider(), &QgsPointCloudDataProvider::indexGenerationStateChanged, this, [layerPointer]( QgsPointCloudDataProvider::PointCloudIndexGenerationState state )
{
if ( !layerPointer || state != QgsPointCloudDataProvider::Indexed )
return;

std::unique_ptr< QgsPointCloudLayer3DRenderer > renderer3D = Qgs3DAppUtils::convert2dPointCloudRendererTo3d( layerPointer->renderer() );
if ( renderer3D )
layerPointer->setRenderer3D( renderer3D.release() );
} );
}
}
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/core/pointcloud/qgspointcloudlayer.cpp
Expand Up @@ -369,7 +369,7 @@ void QgsPointCloudLayer::onPointCloudIndexGenerationStateChanged( QgsPointCloudD
}
triggerRepaint();

emit renderer3DChanged();
emit rendererChanged();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/providers/pdal/qgspdalprovider.cpp
Expand Up @@ -100,7 +100,7 @@ void QgsPdalProvider::generateIndex()

const QString outputDir = _outdir( dataSourceUri() );

QgsPdalEptGenerationTask *generationTask = new QgsPdalEptGenerationTask( dataSourceUri(), outputDir, QStringLiteral( "( " ) + QFileInfo( dataSourceUri() ).fileName() + QStringLiteral( " )" ) );
QgsPdalEptGenerationTask *generationTask = new QgsPdalEptGenerationTask( dataSourceUri(), outputDir, QFileInfo( dataSourceUri() ).fileName() );

connect( generationTask, &QgsPdalEptGenerationTask::taskTerminated, this, &QgsPdalProvider::onGenerateIndexFailed );
connect( generationTask, &QgsPdalEptGenerationTask::taskCompleted, this, &QgsPdalProvider::onGenerateIndexFinished );
Expand Down

0 comments on commit 7f326f3

Please sign in to comment.