Skip to content

Commit aa6d23d

Browse files
vcloarecnyalldawson
vcloarec
authored and
nyalldawson
committedMay 4, 2020
disable transparency for QgsInterpolatedLineRenderer
·
ltr-3_40final-3_14_0
1 parent 9ae70e3 commit aa6d23d

File tree

6 files changed

+39
-34
lines changed

6 files changed

+39
-34
lines changed
 

‎python/core/auto_generated/symbology/qgsinterpolatedlinerenderer.sip.in

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,6 @@ Sets the unit of the stroke width
207207
void setInterpolatedColor( const QgsInterpolatedLineColor &strokeColoring );
208208
%Docstring
209209
Sets the stroke color used to plot
210-
%End
211-
212-
void setOpacity( double opacity );
213-
%Docstring
214-
Sets the opacity used to plot
215210
%End
216211

217212
void render( double value1, double value2, QgsPointXY point1, QgsPointXY point2, QgsRenderContext &context ) const;

‎src/app/mesh/qgsmeshrendererscalarsettingswidget.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ void QgsMeshRendererScalarSettingsWidget::syncToLayer( )
137137
whileBlocking( mScalarEdgeStrokeWidthSpinBox )->setValue( edgeStrokeWidth.fixedStrokeWidth() );
138138
whileBlocking( mScalarEdgeStrokeWidthVariableRadioButton )->setChecked( edgeStrokeWidth.isVariableWidth() );
139139
whileBlocking( mScalarEdgeStrokeWidthUnitSelectionWidget )->setUnit( settings.edgeStrokeWidthUnit() );
140+
if ( !hasFaces )
141+
mOpacityContainerWidget->setVisible( false );
140142

141143
const QgsMeshDatasetGroupMetadata metadata = mMeshLayer->dataProvider()->datasetGroupMetadata( mActiveDatasetGroup );
142144
double min = metadata.minimum();

‎src/core/mesh/qgsmeshlayerrenderer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@ void QgsMeshLayerRenderer::renderScalarDatasetOnEdges( const QgsMeshRendererScal
466466
edgePlotter.setInterpolatedColor( QgsInterpolatedLineColor( scalarSettings.colorRampShader() ) );
467467
edgePlotter.setInterpolatedWidth( QgsInterpolatedLineWidth( scalarSettings.edgeStrokeWidth() ) );
468468
edgePlotter.setWidthUnit( scalarSettings.edgeStrokeWidthUnit() );
469-
edgePlotter.setOpacity( scalarSettings.opacity() );
470469

471470
for ( const int i : egdesInExtent )
472471
{

‎src/core/symbology/qgsinterpolatedlinerenderer.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ void QgsInterpolatedLineRenderer::render( double value1, double value2, QgsPoint
3939
painter->save();
4040
if ( context.flags() & QgsRenderContext::Antialiasing )
4141
painter->setRenderHint( QPainter::Antialiasing, true );
42-
painter->setOpacity( mOpacity );
4342

4443
const QgsMapToPixel &mapToPixel = context.mapToPixel();
4544

@@ -227,12 +226,6 @@ void QgsInterpolatedLineRenderer::adjustLine( const double &value, const double
227226
}
228227
}
229228

230-
231-
void QgsInterpolatedLineRenderer::setOpacity( double opacity )
232-
{
233-
mOpacity = opacity;
234-
}
235-
236229
double QgsInterpolatedLineWidth::minimumValue() const
237230
{
238231
return mMinimumValue;

‎src/core/symbology/qgsinterpolatedlinerenderer.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,6 @@ class CORE_EXPORT QgsInterpolatedLineRenderer
186186
//! Sets the stroke color used to plot
187187
void setInterpolatedColor( const QgsInterpolatedLineColor &strokeColoring );
188188

189-
//! Sets the opacity used to plot
190-
void setOpacity( double opacity );
191-
192189
/**
193190
* Render a line in the \a context between \a point1 and \a point2
194191
* with color and width that vary depending on \a value1 and \a value2
@@ -199,7 +196,6 @@ class CORE_EXPORT QgsInterpolatedLineRenderer
199196
QgsInterpolatedLineWidth mStrokeWidth;
200197
QgsInterpolatedLineColor mStrokeColoring;
201198
QgsUnitTypes::RenderUnit mStrokeWidthUnit = QgsUnitTypes::RenderMillimeters;
202-
double mOpacity;
203199

204200
QPolygonF varyingWidthLine( double value1, double value2, QPointF point1, QPointF point2, QgsRenderContext &context ) const;
205201
void adjustLine( const double &value, const double &value1, const double &value2, double &width, double &adjusting ) const;

‎src/ui/mesh/qgsmeshrendererscalarsettingswidgetbase.ui

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>378</width>
10-
<height>237</height>
10+
<height>206</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -27,22 +27,42 @@
2727
<number>0</number>
2828
</property>
2929
<item>
30-
<layout class="QHBoxLayout" name="horizontalLayout">
31-
<item>
32-
<widget class="QLabel" name="mOpacityLabel">
33-
<property name="text">
34-
<string>Opacity</string>
35-
</property>
36-
</widget>
37-
</item>
38-
<item>
39-
<widget class="QgsOpacityWidget" name="mOpacityWidget" native="true">
40-
<property name="focusPolicy">
41-
<enum>Qt::StrongFocus</enum>
42-
</property>
43-
</widget>
44-
</item>
45-
</layout>
30+
<widget class="QWidget" name="mOpacityContainerWidget" native="true">
31+
<layout class="QFormLayout" name="formLayout">
32+
<property name="leftMargin">
33+
<number>0</number>
34+
</property>
35+
<property name="topMargin">
36+
<number>0</number>
37+
</property>
38+
<property name="rightMargin">
39+
<number>0</number>
40+
</property>
41+
<property name="bottomMargin">
42+
<number>0</number>
43+
</property>
44+
<item row="0" column="0">
45+
<widget class="QLabel" name="mOpacityLabel">
46+
<property name="text">
47+
<string>Opacity</string>
48+
</property>
49+
</widget>
50+
</item>
51+
<item row="0" column="1">
52+
<widget class="QgsOpacityWidget" name="mOpacityWidget" native="true">
53+
<property name="minimumSize">
54+
<size>
55+
<width>0</width>
56+
<height>14</height>
57+
</size>
58+
</property>
59+
<property name="focusPolicy">
60+
<enum>Qt::StrongFocus</enum>
61+
</property>
62+
</widget>
63+
</item>
64+
</layout>
65+
</widget>
4666
</item>
4767
<item>
4868
<widget class="QGroupBox" name="mEdgeWidthGroupBox">

0 commit comments

Comments
 (0)
Please sign in to comment.