sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix datadefined ui

Browse Source
This commit is contained in:
vcloarec 2020-11-13 22:06:52 -04:00 committed by Nyall Dawson
parent c54c2ee353
commit 8e4d9ca905
12 changed files with 58 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/3d/auto_additions/qgsabstractmaterialsettings.py
View File

@ -14,4 +14,7 @@ QgsAbstractMaterialSettings.TrianglesWithFixedTexture.__doc__ = "Triangle based
QgsAbstractMaterialSettings.TrianglesFromModel = QgsMaterialSettingsRenderingTechnique.TrianglesFromModel
QgsAbstractMaterialSettings.TrianglesFromModel.__doc__ = "Triangle based rendering, using a model object source"
QgsMaterialSettingsRenderingTechnique.__doc__ = 'Material rendering techniques\n\n.. versionadded:: 3.16\n\n' + '* ``Triangles``: ' + QgsMaterialSettingsRenderingTechnique.Triangles.__doc__ + '\n' + '* ``Lines``: ' + QgsMaterialSettingsRenderingTechnique.Lines.__doc__ + '\n' + '* ``InstancedPoints``: ' + QgsMaterialSettingsRenderingTechnique.InstancedPoints.__doc__ + '\n' + '* ``Points``: ' + QgsMaterialSettingsRenderingTechnique.Points.__doc__ + '\n' + '* ``TrianglesWithFixedTexture``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesWithFixedTexture.__doc__ + '\n' + '* ``TrianglesFromModel``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesFromModel.__doc__
QgsAbstractMaterialSettings.TrianglesDataDefined = QgsMaterialSettingsRenderingTechnique.TrianglesDataDefined
QgsAbstractMaterialSettings.TrianglesDataDefined.__doc__ = "Triangle based rendering with possibility of datadefined color \since QGIS 3.18"
QgsMaterialSettingsRenderingTechnique.__doc__ = 'Material rendering techniques\n\n.. versionadded:: 3.16\n\n' + '* ``Triangles``: ' + QgsMaterialSettingsRenderingTechnique.Triangles.__doc__ + '\n' + '* ``Lines``: ' + QgsMaterialSettingsRenderingTechnique.Lines.__doc__ + '\n' + '* ``InstancedPoints``: ' + QgsMaterialSettingsRenderingTechnique.InstancedPoints.__doc__ + '\n' + '* ``Points``: ' + QgsMaterialSettingsRenderingTechnique.Points.__doc__ + '\n' + '* ``TrianglesWithFixedTexture``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesWithFixedTexture.__doc__ + '\n' + '* ``TrianglesDataDefined``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesDataDefined.__doc__
# --

1
python/3d/auto_generated/materials/qgsabstractmaterialsettings.sip.in
View File

@ -19,6 +19,7 @@ enum class QgsMaterialSettingsRenderingTechnique
Points,
TrianglesWithFixedTexture,
TrianglesFromModel,
TrianglesDataDefined,
};

1
src/3d/materials/qgsabstractmaterialsettings.h
View File

@ -48,6 +48,7 @@ enum class QgsMaterialSettingsRenderingTechnique SIP_MONKEYPATCH_SCOPEENUM_UNNES
Points, //!< Point based rendering, requires point data
TrianglesWithFixedTexture, //!< Triangle based rendering, using a fixed, non-user-configurable texture (e.g. for terrain rendering)
TrianglesFromModel, //!< Triangle based rendering, using a model object source
TrianglesDataDefined, //!< Triangle based rendering with possibility of datadefined color \since QGIS 3.18
};

3
src/3d/materials/qgsgoochmaterialsettings.cpp
View File

@ -43,6 +43,7 @@ bool QgsGoochMaterialSettings::supportsTechnique( QgsMaterialSettingsRenderingTe
case QgsMaterialSettingsRenderingTechnique::Triangles:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
case QgsMaterialSettingsRenderingTechnique::TrianglesFromModel:
case QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined:
return true;
case QgsMaterialSettingsRenderingTechnique::Lines:
@ -94,12 +95,12 @@ Qt3DRender::QMaterial *QgsGoochMaterialSettings::toMaterial( QgsMaterialSettings
switch ( technique )
{
case QgsMaterialSettingsRenderingTechnique::Triangles:
case QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
case QgsMaterialSettingsRenderingTechnique::TrianglesFromModel:
{
if ( dataDefinedProperties().hasActiveProperties() )
return dataDefinedMaterial();
Qt3DExtras::QGoochMaterial *material = new Qt3DExtras::QGoochMaterial;
material->setDiffuse( mDiffuse );
material->setWarm( mWarm );

2
src/3d/materials/qgsphongmaterialsettings.cpp
View File

@ -44,6 +44,7 @@ bool QgsPhongMaterialSettings::supportsTechnique( QgsMaterialSettingsRenderingTe
case QgsMaterialSettingsRenderingTechnique::Points:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
case QgsMaterialSettingsRenderingTechnique::TrianglesFromModel:
case QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined:
return true;
case QgsMaterialSettingsRenderingTechnique::Lines:
@ -90,6 +91,7 @@ Qt3DRender::QMaterial *QgsPhongMaterialSettings::toMaterial( QgsMaterialSettings
case QgsMaterialSettingsRenderingTechnique::Triangles:
case QgsMaterialSettingsRenderingTechnique::InstancedPoints:
case QgsMaterialSettingsRenderingTechnique::Points:
case QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
case QgsMaterialSettingsRenderingTechnique::TrianglesFromModel:
{

2
src/3d/materials/qgsphongtexturedmaterialsettings.cpp
View File

@ -37,6 +37,7 @@ bool QgsPhongTexturedMaterialSettings::supportsTechnique( QgsMaterialSettingsRen
switch ( technique )
{
case QgsMaterialSettingsRenderingTechnique::Triangles:
case QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined: //technique is supported but color can't be datadefined
return true;
case QgsMaterialSettingsRenderingTechnique::Points:
@ -120,6 +121,7 @@ Qt3DRender::QMaterial *QgsPhongTexturedMaterialSettings::toMaterial( QgsMaterial
case QgsMaterialSettingsRenderingTechnique::Points:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
case QgsMaterialSettingsRenderingTechnique::TrianglesFromModel:
case QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined:
{
bool fitsInCache = false;
QImage textureSourceImage = QgsApplication::imageCache()->pathAsImage( mDiffuseTexturePath, QSize(), true, 1.0, fitsInCache );

2
src/3d/materials/qgssimplelinematerialsettings.cpp
View File

@ -39,6 +39,7 @@ bool QgsSimpleLineMaterialSettings::supportsTechnique( QgsMaterialSettingsRender
case QgsMaterialSettingsRenderingTechnique::Points:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
case QgsMaterialSettingsRenderingTechnique::TrianglesFromModel:
case QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined:
return false;
}
return false;
@ -73,6 +74,7 @@ Qt3DRender::QMaterial *QgsSimpleLineMaterialSettings::toMaterial( QgsMaterialSet
case QgsMaterialSettingsRenderingTechnique::Points:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
case QgsMaterialSettingsRenderingTechnique::TrianglesFromModel:
case QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined:
return nullptr;
case QgsMaterialSettingsRenderingTechnique::Lines:

5
src/3d/symbols/qgspolygon3dsymbol_p.cpp
View File

@ -314,7 +314,10 @@ Qt3DRender::QMaterial *QgsPolygon3DSymbolHandler::material( const QgsPolygon3DSy
materialContext.setIsSelected( isSelected );
materialContext.setSelectionColor( context.map().selectionColor() );
Qt3DRender::QMaterial *material = symbol->material()->toMaterial( QgsMaterialSettingsRenderingTechnique::Triangles, materialContext );
bool dataDefined = mSymbol->material()->dataDefinedProperties().hasActiveProperties();
Qt3DRender::QMaterial *material = symbol->material()->toMaterial( dataDefined ?
QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined : QgsMaterialSettingsRenderingTechnique::Triangles,
materialContext );
applyCullingMode( symbol->cullingMode(), material );
return material;
}

26
src/app/3d/qgsgoochmaterialwidget.cpp
View File

@ -70,6 +70,32 @@ void QgsGoochMaterialWidget::setSettings( const QgsAbstractMaterialSettings *set
mSpecularDataDefinedButton->init( QgsAbstractMaterialSettings::Specular, settings->dataDefinedProperties(), settings->propertyDefinitions(), layer, true );
}
void QgsGoochMaterialWidget::setTechnique( QgsMaterialSettingsRenderingTechnique technique )
{
switch ( technique )
{
case QgsMaterialSettingsRenderingTechnique::Triangles:
case QgsMaterialSettingsRenderingTechnique::InstancedPoints:
case QgsMaterialSettingsRenderingTechnique::Points:
case QgsMaterialSettingsRenderingTechnique::TrianglesWithFixedTexture:
mDiffuseDataDefinedButton->setVisible( false );
mWarmDataDefinedButton->setVisible( false );
mCoolDataDefinedButton->setVisible( false );
mSpecularDataDefinedButton->setVisible( false );
break;
case QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined:
mDiffuseDataDefinedButton->setVisible( true );
mWarmDataDefinedButton->setVisible( true );
mCoolDataDefinedButton->setVisible( true );
mSpecularDataDefinedButton->setVisible( true );
break;
case QgsMaterialSettingsRenderingTechnique::Lines:
// not supported
break;
}
}
QgsAbstractMaterialSettings *QgsGoochMaterialWidget::settings()
{
std::unique_ptr< QgsGoochMaterialSettings > m = qgis::make_unique< QgsGoochMaterialSettings >();

1
src/app/3d/qgsgoochmaterialwidget.h
View File

@ -32,6 +32,7 @@ class QgsGoochMaterialWidget : public QgsMaterialSettingsWidget, private Ui::Goo
static QgsMaterialSettingsWidget *create();
void setSettings( const QgsAbstractMaterialSettings *settings, QgsVectorLayer *layer ) override;
void setTechnique( QgsMaterialSettingsRenderingTechnique technique ) override;
QgsAbstractMaterialSettings *settings() override;
};

16
src/app/3d/qgsphongmaterialwidget.cpp
View File

@ -49,9 +49,9 @@ void QgsPhongMaterialWidget::setTechnique( QgsMaterialSettingsRenderingTechnique
{
lblDiffuse->setVisible( true );
btnDiffuse->setVisible( true );
mAmbientDataDefinedButton->setVisible( true );
mDiffuseDataDefinedButton->setVisible( true );
mSpecularDataDefinedButton->setVisible( true );
mAmbientDataDefinedButton->setVisible( false );
mDiffuseDataDefinedButton->setVisible( false );
mSpecularDataDefinedButton->setVisible( false );
break;
}
case QgsMaterialSettingsRenderingTechnique::InstancedPoints:
@ -75,6 +75,16 @@ void QgsPhongMaterialWidget::setTechnique( QgsMaterialSettingsRenderingTechnique
break;
}
case QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined:
{
lblDiffuse->setVisible( true );
btnDiffuse->setVisible( true );
mAmbientDataDefinedButton->setVisible( true );
mDiffuseDataDefinedButton->setVisible( true );
mSpecularDataDefinedButton->setVisible( true );
break;
}
case QgsMaterialSettingsRenderingTechnique::Lines:
// not supported
break;

2
src/app/3d/qgspolygon3dsymbolwidget.cpp
View File

@ -44,7 +44,7 @@ QgsPolygon3DSymbolWidget::QgsPolygon3DSymbolWidget( QWidget *parent )
connect( btnEdgeColor, &QgsColorButton::colorChanged, this, &QgsPolygon3DSymbolWidget::changed );
connect( spinEdgeWidth, static_cast<void ( QDoubleSpinBox::* )( double )>( &QDoubleSpinBox::valueChanged ), this, &QgsPolygon3DSymbolWidget::changed );
widgetMaterial->setTechnique( QgsMaterialSettingsRenderingTechnique::Triangles );
widgetMaterial->setTechnique( QgsMaterialSettingsRenderingTechnique::TrianglesDataDefined );
}
Qgs3DSymbolWidget *QgsPolygon3DSymbolWidget::create( QgsVectorLayer * )