Skip to content

Commit 95c3c6f

Browse files
blazekblazek
committed
removed color/width from line pattern fill symbol layer widget, fixes partially #8975 
1 parent 5222905 commit 95c3c6f

File tree

5 files changed

+16
-119
lines changed

5 files changed

+16
-119
lines changed

‎src/core/symbology-ng/qgsfillsymbollayerv2.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,6 +1408,18 @@ QgsLinePatternFillSymbolLayer::QgsLinePatternFillSymbolLayer(): QgsImageFillSymb
14081408
QgsImageFillSymbolLayer::setSubSymbol( 0 ); //no outline
14091409
}
14101410

1411+
void QgsLinePatternFillSymbolLayer::setLineWidth( double w )
1412+
{
1413+
mFillLineSymbol->setWidth( w );
1414+
mLineWidth = w;
1415+
}
1416+
1417+
void QgsLinePatternFillSymbolLayer::setColor( const QColor& c )
1418+
{
1419+
mFillLineSymbol->setColor( c );
1420+
mColor = c;
1421+
}
1422+
14111423
QgsLinePatternFillSymbolLayer::~QgsLinePatternFillSymbolLayer()
14121424
{
14131425
delete mFillLineSymbol;

‎src/core/symbology-ng/qgsfillsymbollayerv2.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,9 @@ class CORE_EXPORT QgsLinePatternFillSymbolLayer: public QgsImageFillSymbolLayer
416416
double lineAngle() const { return mLineAngle; }
417417
void setDistance( double d ) { mDistance = d; }
418418
double distance() const { return mDistance; }
419-
void setLineWidth( double w ) { mLineWidth = w; }
419+
void setLineWidth( double w );
420420
double lineWidth() const { return mLineWidth; }
421-
void setColor( const QColor& c ) { mColor = c; }
421+
void setColor( const QColor& c );
422422
QColor color() const { return mColor; }
423423
void setOffset( double offset ) { mOffset = offset; }
424424
double offset() const { return mOffset; }

‎src/gui/symbology-ng/qgssymbollayerv2widget.cpp

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1892,18 +1892,12 @@ void QgsLinePatternFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* laye
18921892
mLayer = patternLayer;
18931893
mAngleSpinBox->setValue( mLayer->lineAngle() );
18941894
mDistanceSpinBox->setValue( mLayer->distance() );
1895-
mLineWidthSpinBox->setValue( mLayer->lineWidth() );
18961895
mOffsetSpinBox->setValue( mLayer->offset() );
1897-
mColorPushButton->setColor( mLayer->color() );
1898-
mColorPushButton->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
18991896

19001897
//units
19011898
mDistanceUnitComboBox->blockSignals( true );
19021899
mDistanceUnitComboBox->setCurrentIndex( mLayer->distanceUnit() );
19031900
mDistanceUnitComboBox->blockSignals( false );
1904-
mLineWidthUnitComboBox->blockSignals( true );
1905-
mLineWidthUnitComboBox->setCurrentIndex( mLayer->lineWidthUnit() );
1906-
mLineWidthUnitComboBox->blockSignals( false );
19071901
mOffsetUnitComboBox->blockSignals( true );
19081902
mOffsetUnitComboBox->setCurrentIndex( mLayer->offsetUnit() );
19091903
mOffsetUnitComboBox->blockSignals( false );
@@ -1933,15 +1927,6 @@ void QgsLinePatternFillSymbolLayerWidget::on_mDistanceSpinBox_valueChanged( doub
19331927
}
19341928
}
19351929

1936-
void QgsLinePatternFillSymbolLayerWidget::on_mLineWidthSpinBox_valueChanged( double d )
1937-
{
1938-
if ( mLayer )
1939-
{
1940-
mLayer->setLineWidth( d );
1941-
emit changed();
1942-
}
1943-
}
1944-
19451930
void QgsLinePatternFillSymbolLayerWidget::on_mOffsetSpinBox_valueChanged( double d )
19461931
{
19471932
if ( mLayer )
@@ -1951,17 +1936,6 @@ void QgsLinePatternFillSymbolLayerWidget::on_mOffsetSpinBox_valueChanged( double
19511936
}
19521937
}
19531938

1954-
void QgsLinePatternFillSymbolLayerWidget::on_mColorPushButton_colorChanged( const QColor& color )
1955-
{
1956-
if ( !mLayer )
1957-
{
1958-
return;
1959-
}
1960-
1961-
mLayer->setColor( color );
1962-
emit changed();
1963-
}
1964-
19651939
void QgsLinePatternFillSymbolLayerWidget::on_mDistanceUnitComboBox_currentIndexChanged( int index )
19661940
{
19671941
if ( mLayer )
@@ -1971,15 +1945,6 @@ void QgsLinePatternFillSymbolLayerWidget::on_mDistanceUnitComboBox_currentIndexC
19711945
}
19721946
}
19731947

1974-
void QgsLinePatternFillSymbolLayerWidget::on_mLineWidthUnitComboBox_currentIndexChanged( int index )
1975-
{
1976-
if ( mLayer )
1977-
{
1978-
mLayer->setLineWidthUnit(( QgsSymbolV2::OutputUnit ) index );
1979-
emit changed();
1980-
}
1981-
}
1982-
19831948
void QgsLinePatternFillSymbolLayerWidget::on_mOffsetUnitComboBox_currentIndexChanged( int index )
19841949
{
19851950
if ( mLayer )

‎src/gui/symbology-ng/qgssymbollayerv2widget.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,11 +340,8 @@ class GUI_EXPORT QgsLinePatternFillSymbolLayerWidget : public QgsSymbolLayerV2Wi
340340
private slots:
341341
void on_mAngleSpinBox_valueChanged( double d );
342342
void on_mDistanceSpinBox_valueChanged( double d );
343-
void on_mLineWidthSpinBox_valueChanged( double d );
344343
void on_mOffsetSpinBox_valueChanged( double d );
345-
void on_mColorPushButton_colorChanged( const QColor& color );
346344
void on_mDistanceUnitComboBox_currentIndexChanged( int index );
347-
void on_mLineWidthUnitComboBox_currentIndexChanged( int index );
348345
void on_mOffsetUnitComboBox_currentIndexChanged( int index );
349346
void on_mDataDefinedPropertiesButton_clicked();
350347
};

‎src/ui/symbollayer/widget_linepatternfill.ui

Lines changed: 2 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -85,57 +85,13 @@
8585
</layout>
8686
</item>
8787
<item row="2" column="0">
88-
<widget class="QLabel" name="mLineWidthLabel">
89-
<property name="text">
90-
<string>Line width</string>
91-
</property>
92-
</widget>
93-
</item>
94-
<item row="2" column="1">
95-
<layout class="QHBoxLayout" name="horizontalLayout_2">
96-
<item>
97-
<widget class="QDoubleSpinBox" name="mLineWidthSpinBox">
98-
<property name="sizePolicy">
99-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
100-
<horstretch>1</horstretch>
101-
<verstretch>0</verstretch>
102-
</sizepolicy>
103-
</property>
104-
<property name="decimals">
105-
<number>5</number>
106-
</property>
107-
<property name="maximum">
108-
<double>99999999.000000000000000</double>
109-
</property>
110-
<property name="singleStep">
111-
<double>0.200000000000000</double>
112-
</property>
113-
</widget>
114-
</item>
115-
<item>
116-
<widget class="QComboBox" name="mLineWidthUnitComboBox">
117-
<item>
118-
<property name="text">
119-
<string>Millimeter</string>
120-
</property>
121-
</item>
122-
<item>
123-
<property name="text">
124-
<string>Map unit</string>
125-
</property>
126-
</item>
127-
</widget>
128-
</item>
129-
</layout>
130-
</item>
131-
<item row="3" column="0">
13288
<widget class="QLabel" name="mOffsetLabel">
13389
<property name="text">
13490
<string>Offset</string>
13591
</property>
13692
</widget>
13793
</item>
138-
<item row="3" column="1">
94+
<item row="2" column="1">
13995
<layout class="QHBoxLayout" name="horizontalLayout_4">
14096
<item>
14197
<widget class="QDoubleSpinBox" name="mOffsetSpinBox">
@@ -175,33 +131,7 @@
175131
</item>
176132
</layout>
177133
</item>
178-
<item row="4" column="0">
179-
<widget class="QLabel" name="mColorLabel">
180-
<property name="text">
181-
<string>Color</string>
182-
</property>
183-
</widget>
184-
</item>
185-
<item row="4" column="1">
186-
<widget class="QgsColorButton" name="mColorPushButton">
187-
<property name="minimumSize">
188-
<size>
189-
<width>100</width>
190-
<height>0</height>
191-
</size>
192-
</property>
193-
<property name="maximumSize">
194-
<size>
195-
<width>100</width>
196-
<height>16777215</height>
197-
</size>
198-
</property>
199-
<property name="text">
200-
<string/>
201-
</property>
202-
</widget>
203-
</item>
204-
<item row="5" column="0" colspan="2">
134+
<item row="3" column="0" colspan="2">
205135
<widget class="QPushButton" name="mDataDefinedPropertiesButton">
206136
<property name="sizePolicy">
207137
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -216,13 +146,6 @@
216146
</item>
217147
</layout>
218148
</widget>
219-
<customwidgets>
220-
<customwidget>
221-
<class>QgsColorButton</class>
222-
<extends>QPushButton</extends>
223-
<header>qgscolorbutton.h</header>
224-
</customwidget>
225-
</customwidgets>
226149
<resources/>
227150
<connections/>
228151
</ui>

0 commit comments

Comments
 (0)