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

addresing review

Browse Source
This commit is contained in:
Jonathan Lurie 2025-09-08 11:39:44 +02:00
parent e6efa0a5c6
commit eca451bf4a
4 changed files with 60 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/core/processing/qgsprocessingparameters.cpp
View File

@ -3034,6 +3034,9 @@ QColor QgsProcessingParameterDefinition::modelColor() const
QString QgsProcessingParameterDefinition::userFriendlyString( const QVariant &value ) const
{
if ( QgsVariantUtils::isNull( value ) )
return QString();
if ( value.userType() == qMetaTypeId<QgsPointXY>() )
{
const QgsPointXY r = value.value<QgsPointXY>();
@ -3044,10 +3047,10 @@ QString QgsProcessingParameterDefinition::userFriendlyString( const QVariant &va
else if ( value.userType() == qMetaTypeId<QgsReferencedPointXY>() )
{
const QgsReferencedPointXY r = value.value<QgsReferencedPointXY>();
return QStringLiteral( "[%1] %2, %3" ).arg(
r.crs().authid(),
return QStringLiteral( "%1, %2 [%3]" ).arg(
qgsDoubleToString( r.x(), 4 ),
qgsDoubleToString( r.y(), 4 )
qgsDoubleToString( r.y(), 4 ),
r.crs().authid()
);
}
@ -3063,7 +3066,7 @@ QString QgsProcessingParameterDefinition::userFriendlyString( const QVariant &va
if ( !g.isNull() )
{
return QStringLiteral( "[%1] %2" ).arg( g.crs().userFriendlyIdentifier( Qgis::CrsIdentifierType::ShortString ), QgsWkbTypes::geometryDisplayString( g.type() ) );
return QStringLiteral( "%1 [%2]" ).arg( QgsWkbTypes::geometryDisplayString( g.type() ), g.crs().userFriendlyIdentifier( Qgis::CrsIdentifierType::ShortString ) );
}
return QgsWkbTypes::geometryDisplayString( g.type() );
}
@ -3247,6 +3250,9 @@ QgsProcessingParameterCrs *QgsProcessingParameterCrs::fromScriptCode( const QStr
QString QgsProcessingParameterCrs::userFriendlyString( const QVariant &value ) const
{
if ( QgsVariantUtils::isNull( value ) )
return QString();
QgsCoordinateReferenceSystem crs( value.toString() );
if ( crs.isValid() )
return crs.userFriendlyIdentifier( Qgis::CrsIdentifierType::ShortString );
@ -3669,7 +3675,7 @@ QString QgsProcessingParameterExtent::valueAsPythonString( const QVariant &value
qgsDoubleToString( r.yMinimum() ),
qgsDoubleToString( r.xMaximum() ),
qgsDoubleToString( r.yMaximum() ),
r.crs().userFriendlyIdentifier( Qgis::CrsIdentifierType::ShortString ) );
r.crs().authid() );
}
else if ( value.userType() == qMetaTypeId< QgsGeometry>() )
{
@ -4093,6 +4099,9 @@ QgsProcessingParameterGeometry *QgsProcessingParameterGeometry::fromScriptCode(
QString QgsProcessingParameterGeometry::userFriendlyString( const QVariant &value ) const
{
if ( QgsVariantUtils::isNull( value ) )
return QString();
if ( value.isValid() )
{
@ -4107,7 +4116,7 @@ QString QgsProcessingParameterGeometry::userFriendlyString( const QVariant &valu
const QgsReferencedGeometry g = value.value<QgsReferencedGeometry>();
if ( !g.isNull() )
{
return QStringLiteral( "[%1] %2" ).arg( g.crs().userFriendlyIdentifier( Qgis::CrsIdentifierType::ShortString ), QgsWkbTypes::geometryDisplayString( g.type() ) );
return QStringLiteral( "%1 [%2]" ).arg( QgsWkbTypes::geometryDisplayString( g.type() ), g.crs().userFriendlyIdentifier( Qgis::CrsIdentifierType::ShortString ));
}
return QgsWkbTypes::geometryDisplayString( g.type() );
}
@ -5383,6 +5392,9 @@ QString QgsProcessingParameterEnum::asPythonString( const QgsProcessing::PythonO
QString QgsProcessingParameterEnum::userFriendlyString( const QVariant &value ) const
{
if ( QgsVariantUtils::isNull( value ) )
return QString();
return options().at( value.toInt() );
}
@ -7850,6 +7862,9 @@ bool QgsProcessingParameterDistance::fromVariantMap( const QVariantMap &map )
QString QgsProcessingParameterDistance::userFriendlyString( const QVariant &value ) const
{
if ( QgsVariantUtils::isNull( value ) )
return QString();
return QStringLiteral( "%1 %2" ).arg( value.toString(), QgsUnitTypes::toAbbreviatedString( defaultUnit() ) );
}
@ -7937,7 +7952,10 @@ bool QgsProcessingParameterArea::fromVariantMap( const QVariantMap &map )
QString QgsProcessingParameterArea::userFriendlyString( const QVariant &value ) const
{
return QStringLiteral( "%1 %2" ).arg( value.toString(), QgsUnitTypes::toString( defaultUnit() ) );
if ( QgsVariantUtils::isNull( value ) )
return QString();
return QStringLiteral( "%1 %2" ).arg( value.toString(), QgsUnitTypes::toAbbreviatedString( defaultUnit() ) );
}
@ -8023,7 +8041,10 @@ bool QgsProcessingParameterVolume::fromVariantMap( const QVariantMap &map )
QString QgsProcessingParameterVolume::userFriendlyString( const QVariant &value ) const
{
return QStringLiteral( "%1 %2" ).arg( value.toString(), QgsUnitTypes::toString( defaultUnit() ) );
if ( QgsVariantUtils::isNull( value ) )
return QString();
return QStringLiteral( "%1 %2" ).arg( value.toString(), QgsUnitTypes::toAbbreviatedString( defaultUnit() ) );
}
//
@ -8084,6 +8105,9 @@ bool QgsProcessingParameterDuration::fromVariantMap( const QVariantMap &map )
QString QgsProcessingParameterDuration::userFriendlyString( const QVariant &value ) const
{
if ( QgsVariantUtils::isNull( value ) )
return QString();
return QStringLiteral( "%1 %2" ).arg( value.toString(), QgsUnitTypes::toAbbreviatedString( defaultUnit() ) );
}
@ -8946,19 +8970,16 @@ QgsProcessingParameterDateTime *QgsProcessingParameterDateTime::fromScriptCode(
QString QgsProcessingParameterDateTime:: userFriendlyString( const QVariant &value ) const
{
if ( QgsVariantUtils::isNull( value ) )
return QString();
if ( value.userType() == QMetaType::Type::QDateTime )
{
const QDateTime dt = value.toDateTime();
if ( !dt.isValid() )
return QObject::tr( "Invalid datetime" );
else
return QStringLiteral( "%1-%2-%3T%4:%5:%6" )
.arg( dt.date().year() )
.arg( dt.date().month() )
.arg( dt.date().day() )
.arg( dt.time().hour() )
.arg( dt.time().minute() )
.arg( dt.time().second() );
return dt.toString( Qt::ISODate );
}
else if ( value.userType() == QMetaType::Type::QDate )
@ -8967,10 +8988,7 @@ QString QgsProcessingParameterDateTime:: userFriendlyString( const QVariant &val
if ( !dt.isValid() )
return QObject::tr( "Invalid date" );
else
return QStringLiteral( "%1-%2-%3" )
.arg( dt.year() )
.arg( dt.month() )
.arg( dt.day() );
return dt.toString( Qt::ISODate );
}
else if ( value.userType() == QMetaType::Type::QTime )
@ -8979,10 +8997,7 @@ QString QgsProcessingParameterDateTime:: userFriendlyString( const QVariant &val
if ( !dt.isValid() )
return QObject::tr( "Invalid time" );
else
return QStringLiteral( "%4:%5:%6" )
.arg( dt.hour() )
.arg( dt.minute() )
.arg( dt.second() );
return dt.toString( Qt::ISODate );
}
return value.toString();

12
src/gui/processing/models/qgsmodelcomponentgraphicitem.h
View File

@ -137,10 +137,20 @@ class GUI_EXPORT QgsModelComponentGraphicItem : public QGraphicsObject
*/
void setItemRect( QRectF rect );
/**
* Returns the data type of the linked parameter at the specified \a index on the specified \a edge.
*
* \since QGIS 4.0
*/
virtual QString linkedParameterDataType( Qt::Edge edge, int index ) const;
#ifndef SIP_RUN
/**
* Returns the color of the link at the specified \a index on the specified \a edge.
*
* \since QGIS 4.0
*/
virtual QColor linkColor( Qt::Edge edge, int index ) const;
/**
@ -439,7 +449,7 @@ class GUI_EXPORT QgsModelParameterGraphicItem : public QgsModelComponentGraphicI
void contextMenuEvent( QGraphicsSceneContextMenuEvent *event ) override;
bool canDeleteComponent() override;
QString linkedParameterDataType( Qt::Edge /* unused in this implementation because parameters only have a bottom edge */, int index ) const override;
QString linkedParameterDataType( Qt::Edge, int index ) const override;
QColor linkColor( Qt::Edge edge, int index ) const override;

20
src/gui/processing/models/qgsmodelgraphicitem.cpp
View File

@ -206,9 +206,12 @@ void QgsModelDesignerSocketGraphicItem::paint( QPainter *painter, const QStyleOp
painter->setRenderHint( QPainter::Antialiasing );
// Radius of the socket circle
constexpr float DISPLAY_SIZE = 4;
float ellipseOffset = 0.4;
QPointF ellipsePosition = QPointF( position().x() + ellipseOffset, position().y() + ellipseOffset );
// Offset of the socket to separate from the label
constexpr float ELLIPSE_OFFSET = 0.4;
QPointF ellipsePosition = QPointF( position().x() + ELLIPSE_OFFSET, position().y() + ELLIPSE_OFFSET );
painter->drawEllipse( ellipsePosition, DISPLAY_SIZE, DISPLAY_SIZE );
/* Uncomment to display bounding box */
@ -252,18 +255,15 @@ bool QgsModelDesignerSocketGraphicItem::isDefaultParameterValue() const
// Input params
case Qt::TopEdge:
{
QgsProcessingParameterDefinitions params = child->algorithm()->parameterDefinitions();
if ( mIndex > ( params.length() - 1 ) )
{
const QgsProcessingParameterDefinitions params = child->algorithm()->parameterDefinitions();
const QgsProcessingParameterDefinition *param = params.value( mIndex );
if ( !param )
break;
}
const QgsProcessingParameterDefinition *param = params.at( mIndex );
QString name = param->name();
const QString name = param->name();
QgsProcessingModelChildParameterSources paramSources = child->parameterSources().value( name );
if ( paramSources.size() == 0 )
if ( paramSources.empty() )
{
break;
}

2
tests/src/analysis/testqgsprocessing.cpp
View File

@ -3213,7 +3213,7 @@ void TestQgsProcessing::parameterCrs()
QVERIFY( def->checkValueIsAcceptable( QgsProcessingFeatureSourceDefinition( QgsProperty::fromValue( QVariant::fromValue( r1 ) ) ) ) );
QVERIFY( def->checkValueIsAcceptable( QgsProcessingOutputLayerDefinition( r1->id() ) ) );
QCOMPARE( def->userFriendlyString( QVariant( "EPSG:3857" ) ), QgsCoordinateReferenceSystem( QVariant( "EPSG:3857" ).toString() ).userFriendlyIdentifier( Qgis::CrsIdentifierType::ShortString ) );
QCOMPARE( def->userFriendlyString( QVariant( "EPSG:3857" ) ), QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:3857" ) ).userFriendlyIdentifier( Qgis::CrsIdentifierType::ShortString ) );
// using map layer
QVariantMap params;