"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp" between
QGIS-final-3_10_5.tar.gz and QGIS-final-3_10_6.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Long-term release (3.10.x series).

qgsgraduatedsymbolrendererwidget.cpp  (QGIS-final-3_10_5):qgsgraduatedsymbolrendererwidget.cpp  (QGIS-final-3_10_6)
skipping to change at line 509 skipping to change at line 509
else else
{ {
QgsColorRamp *ramp = new QgsGradientColorRamp( QColor( 255, 255, 255 ), QCol or( 255, 0, 0 ) ); QgsColorRamp *ramp = new QgsGradientColorRamp( QColor( 255, 255, 255 ), QCol or( 255, 0, 0 ) );
btnColorRamp->setColorRamp( ramp ); btnColorRamp->setColorRamp( ramp );
delete ramp; delete ramp;
} }
viewGraduated->setStyle( new QgsGraduatedSymbolRendererViewStyle( viewGraduate d ) ); viewGraduated->setStyle( new QgsGraduatedSymbolRendererViewStyle( viewGraduate d ) );
mGraduatedSymbol.reset( QgsSymbol::defaultSymbol( mLayer->geometryType() ) ); mGraduatedSymbol.reset( QgsSymbol::defaultSymbol( mLayer->geometryType() ) );
btnChangeGraduatedSymbol->setSymbolType( mGraduatedSymbol->type() ); if ( mGraduatedSymbol )
btnChangeGraduatedSymbol->setSymbol( mGraduatedSymbol->clone() );
methodComboBox->blockSignals( true );
methodComboBox->addItem( tr( "Color" ), ColorMode );
switch ( mGraduatedSymbol->type() )
{ {
case QgsSymbol::Marker: btnChangeGraduatedSymbol->setSymbolType( mGraduatedSymbol->type() );
{ btnChangeGraduatedSymbol->setSymbol( mGraduatedSymbol->clone() );
methodComboBox->addItem( tr( "Size" ), SizeMode );
minSizeSpinBox->setValue( 1 ); methodComboBox->blockSignals( true );
maxSizeSpinBox->setValue( 8 ); methodComboBox->addItem( tr( "Color" ), ColorMode );
break; switch ( mGraduatedSymbol->type() )
}
case QgsSymbol::Line:
{
methodComboBox->addItem( tr( "Size" ), SizeMode );
minSizeSpinBox->setValue( .1 );
maxSizeSpinBox->setValue( 2 );
break;
}
case QgsSymbol::Fill:
{ {
//set button and label invisible to avoid display of a single item combobo case QgsSymbol::Marker:
x {
methodComboBox->hide(); methodComboBox->addItem( tr( "Size" ), SizeMode );
labelMethod->hide(); minSizeSpinBox->setValue( 1 );
break; maxSizeSpinBox->setValue( 8 );
break;
}
case QgsSymbol::Line:
{
methodComboBox->addItem( tr( "Size" ), SizeMode );
minSizeSpinBox->setValue( .1 );
maxSizeSpinBox->setValue( 2 );
break;
}
case QgsSymbol::Fill:
{
//set button and label invisible to avoid display of a single item combo
box
methodComboBox->hide();
labelMethod->hide();
break;
}
case QgsSymbol::Hybrid:
break;
} }
case QgsSymbol::Hybrid: methodComboBox->blockSignals( false );
break;
} }
methodComboBox->blockSignals( false );
connect( mExpressionWidget, static_cast < void ( QgsFieldExpressionWidget::* ) ( const QString & ) >( &QgsFieldExpressionWidget::fieldChanged ), this, &QgsGrad uatedSymbolRendererWidget::graduatedColumnChanged ); connect( mExpressionWidget, static_cast < void ( QgsFieldExpressionWidget::* ) ( const QString & ) >( &QgsFieldExpressionWidget::fieldChanged ), this, &QgsGrad uatedSymbolRendererWidget::graduatedColumnChanged );
connect( viewGraduated, &QAbstractItemView::doubleClicked, this, &QgsGraduated SymbolRendererWidget::rangesDoubleClicked ); connect( viewGraduated, &QAbstractItemView::doubleClicked, this, &QgsGraduated SymbolRendererWidget::rangesDoubleClicked );
connect( viewGraduated, &QAbstractItemView::clicked, this, &QgsGraduatedSymbol RendererWidget::rangesClicked ); connect( viewGraduated, &QAbstractItemView::clicked, this, &QgsGraduatedSymbol RendererWidget::rangesClicked );
connect( viewGraduated, &QTreeView::customContextMenuRequested, this, &QgsGra duatedSymbolRendererWidget::contextMenuViewCategories ); connect( viewGraduated, &QTreeView::customContextMenuRequested, this, &QgsGra duatedSymbolRendererWidget::contextMenuViewCategories );
connect( btnGraduatedClassify, &QAbstractButton::clicked, this, &QgsGraduatedS ymbolRendererWidget::classifyGraduated ); connect( btnGraduatedClassify, &QAbstractButton::clicked, this, &QgsGraduatedS ymbolRendererWidget::classifyGraduated );
connect( btnChangeGraduatedSymbol, &QgsSymbolButton::changed, this, &QgsGradua tedSymbolRendererWidget::changeGraduatedSymbol ); connect( btnChangeGraduatedSymbol, &QgsSymbolButton::changed, this, &QgsGradua tedSymbolRendererWidget::changeGraduatedSymbol );
connect( btnGraduatedDelete, &QAbstractButton::clicked, this, &QgsGraduatedSym bolRendererWidget::deleteClasses ); connect( btnGraduatedDelete, &QAbstractButton::clicked, this, &QgsGraduatedSym bolRendererWidget::deleteClasses );
connect( btnDeleteAllClasses, &QAbstractButton::clicked, this, &QgsGraduatedSy mbolRendererWidget::deleteAllClasses ); connect( btnDeleteAllClasses, &QAbstractButton::clicked, this, &QgsGraduatedSy mbolRendererWidget::deleteAllClasses );
skipping to change at line 567 skipping to change at line 570
// initialize from previously set renderer // initialize from previously set renderer
updateUiFromRenderer(); updateUiFromRenderer();
// default to collapsed symmetric group for ui simplicity // default to collapsed symmetric group for ui simplicity
mGroupBoxSymmetric->setCollapsed( true ); // mGroupBoxSymmetric->setCollapsed( true ); //
// menus for data-defined rotation/size // menus for data-defined rotation/size
QMenu *advMenu = new QMenu( this ); QMenu *advMenu = new QMenu( this );
advMenu->addAction( tr( "Symbol Levels…" ), this, SLOT( showSymbolLevels() ) ) ; advMenu->addAction( tr( "Symbol Levels…" ), this, SLOT( showSymbolLevels() ) ) ;
if ( mGraduatedSymbol->type() == QgsSymbol::Marker ) if ( mGraduatedSymbol && mGraduatedSymbol->type() == QgsSymbol::Marker )
{ {
QAction *actionDdsLegend = advMenu->addAction( tr( "Data-defined Size Legend …" ) ); QAction *actionDdsLegend = advMenu->addAction( tr( "Data-defined Size Legend …" ) );
// only from Qt 5.6 there is convenience addAction() with new style connecti on // only from Qt 5.6 there is convenience addAction() with new style connecti on
connect( actionDdsLegend, &QAction::triggered, this, &QgsGraduatedSymbolRend ererWidget::dataDefinedSizeLegend ); connect( actionDdsLegend, &QAction::triggered, this, &QgsGraduatedSymbolRend ererWidget::dataDefinedSizeLegend );
} }
btnAdvanced->setMenu( advMenu ); btnAdvanced->setMenu( advMenu );
mHistogramWidget->setLayer( mLayer ); mHistogramWidget->setLayer( mLayer );
mHistogramWidget->setRenderer( mRenderer.get() ); mHistogramWidget->setRenderer( mRenderer.get() );
 End of changes. 6 change blocks. 
30 lines changed or deleted 33 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)