Fix two issues with varying width interpolated renderer

Fixes #46362 Also fixes an unreported issue where the "Ignore out of range" checkbox is not correctly set when it should be checked.
qgis · Feb 4, 2022 · 615af05 · 615af05
1 parent 50cd02a
commit 615af05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/symbology/qgsinterpolatedlinerenderer.cpp b/src/core/symbology/qgsinterpolatedlinerenderer.cpp
@@ -89,7 +89,7 @@ void QgsInterpolatedLineRenderer::renderInDeviceCoordinates( double valueColor1,
     double width1 = mStrokeWidth.strokeWidth( valueWidth1 );
     double width2 = mStrokeWidth.strokeWidth( valueWidth2 );
 
-    if ( !std::isnan( width1 ) || !std::isnan( width2 ) ) // the two widths on extremity are not out of range and ignored
+    if ( !std::isnan( width1 ) && !std::isnan( width2 ) ) // the two widths on extremity are not out of range and ignored
     {
       //Draw line cap
       QBrush brush( Qt::SolidPattern );
@@ -158,6 +158,7 @@ void QgsInterpolatedLineRenderer::renderInDeviceCoordinates( double valueColor1,
         painter->setPen( pen );
 
         painter->drawPolygon( varLine );
+
       }
       else if ( !gradients.isEmpty() && !breakValues.isEmpty() && !breakColors.isEmpty() )
       {
@@ -920,6 +921,7 @@ void QgsInterpolatedLineSymbolLayer::drawPreviewIcon( QgsSymbolRenderContext &co
   }
 
   renderPolyline( points, context );
+
 }
 
 

diff --git a/src/gui/symbology/qgsinterpolatedlinesymbollayerwidget.cpp b/src/gui/symbology/qgsinterpolatedlinesymbollayerwidget.cpp
@@ -136,7 +136,7 @@ void QgsInterpolatedLineSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer *layer
   whileBlocking( mWidthUnitSelectionFixed )->setUnit( mLayer->widthUnit() );
   whileBlocking( mWidthUnitSelectionVarying )->setUnit( mLayer->widthUnit() );
   whileBlocking( mCheckBoxAbsoluteValue )->setChecked( interpolatedWidth.useAbsoluteValue() );
-  whileBlocking( mCheckBoxOutOfrange )->setChecked( interpolatedLineWidth().ignoreOutOfRange() );
+  whileBlocking( mCheckBoxOutOfrange )->setChecked( interpolatedWidth.ignoreOutOfRange() );
 
   const QgsInterpolatedLineColor interpolatedColor = mLayer->interpolatedColor();
   whileBlocking( mColorMethodComboBox )->setCurrentIndex( mColorMethodComboBox->findData( interpolatedColor.coloringMethod() ) );