Skip to content

Commit bce952c

Browse files
redlegorengmhugent
redlegoreng
authored and
mhugent
committedJan 22, 2013
starting to refresh the scalebar composer item
·
ltr-3_40Before-merge-new_vector_api
1 parent 6dcb5f4 commit bce952c

File tree

3 files changed

+154
-88
lines changed

3 files changed

+154
-88
lines changed
 

‎src/app/composer/qgscomposerscalebarwidget.cpp

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ void QgsComposerScaleBarWidget::on_mLineWidthSpinBox_valueChanged( double d )
204204

205205
mComposerScaleBar->beginCommand( tr( "Scalebar line width" ), QgsComposerMergeCommand::ScaleBarLineWidth );
206206
disconnectUpdateSignal();
207-
QPen newPen( QColor( 0, 0, 0 ) );
207+
QPen newPen( mComposerScaleBar->pen().color() );
208208
newPen.setWidthF( d );
209209
mComposerScaleBar->setPen( newPen );
210210
mComposerScaleBar->update();
@@ -321,6 +321,30 @@ void QgsComposerScaleBarWidget::on_mColorPushButton_clicked()
321321
mComposerScaleBar->endCommand();
322322
}
323323

324+
void QgsComposerScaleBarWidget::on_mStrokeColorPushButton_clicked()
325+
{
326+
if ( !mComposerScaleBar )
327+
{
328+
return;
329+
}
330+
331+
QColor oldColor = mComposerScaleBar->pen().color();
332+
QColor newColor = QColorDialog::getColor( oldColor, 0 );
333+
334+
if ( !newColor.isValid() ) //user canceled the dialog
335+
{
336+
return;
337+
}
338+
339+
mComposerScaleBar->beginCommand( tr( "Scalebar color changed" ) );
340+
disconnectUpdateSignal();
341+
QPen newPen( newColor );
342+
mComposerScaleBar->setPen( newBrush );
343+
mComposerScaleBar->update();
344+
connectUpdateSignal();
345+
mComposerScaleBar->endCommand();
346+
}
347+
324348
void QgsComposerScaleBarWidget::on_mUnitLabelLineEdit_textChanged( const QString& text )
325349
{
326350
if ( !mComposerScaleBar )

‎src/app/composer/qgscomposerscalebarwidget.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class QgsComposerScaleBarWidget: public QWidget, private Ui::QgsComposerScaleBar
4242
void on_mUnitLabelLineEdit_textChanged( const QString& text );
4343
void on_mMapUnitsPerBarUnitSpinBox_valueChanged( double d );
4444
void on_mColorPushButton_clicked();
45+
void on_mStrokeColorPushButton_clicked();
4546
void on_mFontButton_clicked();
4647
void on_mStyleComboBox_currentIndexChanged( const QString& text );
4748
void on_mLabelBarSpaceSpinBox_valueChanged( double d );

‎src/ui/qgscomposerscalebarwidgetbase.ui

Lines changed: 128 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>325</width>
10-
<height>537</height>
9+
<width>436</width>
10+
<height>499</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -19,100 +19,129 @@
1919
<property name="windowTitle">
2020
<string>Barscale Options</string>
2121
</property>
22-
<layout class="QGridLayout" name="gridLayout">
22+
<layout class="QVBoxLayout" name="verticalLayout">
2323
<property name="margin">
2424
<number>0</number>
2525
</property>
26-
<item row="0" column="0">
26+
<item>
2727
<widget class="QToolBox" name="toolBox">
2828
<property name="currentIndex">
2929
<number>0</number>
3030
</property>
3131
<widget class="QWidget" name="page">
32+
<property name="enabled">
33+
<bool>true</bool>
34+
</property>
3235
<property name="geometry">
3336
<rect>
3437
<x>0</x>
35-
<y>0</y>
36-
<width>315</width>
37-
<height>501</height>
38+
<y>-138</y>
39+
<width>415</width>
40+
<height>636</height>
3841
</rect>
3942
</property>
4043
<attribute name="label">
4144
<string>Scale bar</string>
4245
</attribute>
4346
<layout class="QFormLayout" name="formLayout">
4447
<property name="fieldGrowthPolicy">
45-
<enum>QFormLayout::ExpandingFieldsGrow</enum>
48+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
4649
</property>
47-
<item row="0" column="0">
48-
<widget class="QLabel" name="mSegmentSizeLabel">
50+
<item row="1" column="0">
51+
<widget class="QLabel" name="mUnitsLabel">
4952
<property name="text">
50-
<string>Segment size</string>
53+
<string>Units</string>
54+
</property>
55+
</widget>
56+
</item>
57+
<item row="1" column="1">
58+
<widget class="QComboBox" name="mUnitsComboBox"/>
59+
</item>
60+
<item row="3" column="0">
61+
<widget class="QLabel" name="mUnitLabelLabel">
62+
<property name="text">
63+
<string>Unit label</string>
5164
</property>
5265
<property name="wordWrap">
5366
<bool>true</bool>
5467
</property>
5568
<property name="buddy">
56-
<cstring>mSegmentSizeSpinBox</cstring>
69+
<cstring>mUnitLabelLineEdit</cstring>
5770
</property>
5871
</widget>
5972
</item>
60-
<item row="0" column="1">
61-
<widget class="QDoubleSpinBox" name="mSegmentSizeSpinBox">
62-
<property name="decimals">
63-
<number>4</number>
73+
<item row="3" column="1">
74+
<widget class="QLineEdit" name="mUnitLabelLineEdit"/>
75+
</item>
76+
<item row="4" column="0">
77+
<widget class="QLabel" name="mMapUnitsPerBarUnitLabel">
78+
<property name="text">
79+
<string>Map units per bar unit</string>
6480
</property>
65-
<property name="maximum">
66-
<double>9999999999999.000000000000000</double>
81+
<property name="wordWrap">
82+
<bool>true</bool>
83+
</property>
84+
<property name="buddy">
85+
<cstring>mMapUnitsPerBarUnitSpinBox</cstring>
6786
</property>
6887
</widget>
6988
</item>
70-
<item row="1" column="0">
71-
<widget class="QLabel" name="mUnitsLabel">
72-
<property name="text">
73-
<string>Units</string>
89+
<item row="4" column="1">
90+
<widget class="QDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox">
91+
<property name="maximum">
92+
<double>9999999999999.000000000000000</double>
7493
</property>
7594
</widget>
7695
</item>
77-
<item row="2" column="0">
78-
<widget class="QLabel" name="mMapUnitsPerBarUnitLabel">
96+
<item row="5" column="0">
97+
<widget class="QLabel" name="mSegmentSizeLabel">
7998
<property name="text">
80-
<string>Map units per bar unit</string>
99+
<string>Segment size</string>
81100
</property>
82101
<property name="wordWrap">
83102
<bool>true</bool>
84103
</property>
85104
<property name="buddy">
86-
<cstring>mMapUnitsPerBarUnitSpinBox</cstring>
105+
<cstring>mSegmentSizeSpinBox</cstring>
87106
</property>
88107
</widget>
89108
</item>
90-
<item row="2" column="1">
91-
<widget class="QDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox">
109+
<item row="5" column="1">
110+
<widget class="QDoubleSpinBox" name="mSegmentSizeSpinBox">
111+
<property name="decimals">
112+
<number>4</number>
113+
</property>
92114
<property name="maximum">
93115
<double>9999999999999.000000000000000</double>
94116
</property>
95117
</widget>
96118
</item>
97-
<item row="3" column="0" colspan="2">
119+
<item row="6" column="0">
120+
<widget class="QLabel" name="mSegmentLabel">
121+
<property name="text">
122+
<string>Segments</string>
123+
</property>
124+
</widget>
125+
</item>
126+
<item row="6" column="1">
98127
<layout class="QHBoxLayout" name="horizontalLayout">
99128
<item>
100129
<widget class="QSpinBox" name="mSegmentsLeftSpinBox">
101130
<property name="suffix">
102-
<string> Left segments</string>
131+
<string> left</string>
103132
</property>
104133
</widget>
105134
</item>
106135
<item>
107136
<widget class="QSpinBox" name="mNumberOfSegmentsSpinBox">
108137
<property name="suffix">
109-
<string> Right segments</string>
138+
<string> right</string>
110139
</property>
111140
</widget>
112141
</item>
113142
</layout>
114143
</item>
115-
<item row="4" column="0">
144+
<item row="8" column="0">
116145
<widget class="QLabel" name="mStyleLabel">
117146
<property name="text">
118147
<string>Style</string>
@@ -122,10 +151,10 @@
122151
</property>
123152
</widget>
124153
</item>
125-
<item row="4" column="1">
154+
<item row="8" column="1">
126155
<widget class="QComboBox" name="mStyleComboBox"/>
127156
</item>
128-
<item row="5" column="0">
157+
<item row="9" column="0">
129158
<widget class="QLabel" name="mMapLabel">
130159
<property name="sizePolicy">
131160
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -144,7 +173,7 @@
144173
</property>
145174
</widget>
146175
</item>
147-
<item row="5" column="1">
176+
<item row="9" column="1">
148177
<widget class="QComboBox" name="mMapComboBox">
149178
<property name="enabled">
150179
<bool>true</bool>
@@ -157,17 +186,17 @@
157186
</property>
158187
</widget>
159188
</item>
160-
<item row="6" column="0">
189+
<item row="10" column="0">
161190
<widget class="QLabel" name="mAlignmentLabel">
162191
<property name="text">
163192
<string>Alignment</string>
164193
</property>
165194
</widget>
166195
</item>
167-
<item row="6" column="1">
196+
<item row="10" column="1">
168197
<widget class="QComboBox" name="mAlignmentComboBox"/>
169198
</item>
170-
<item row="7" column="0" colspan="2">
199+
<item row="14" column="0" colspan="2">
171200
<widget class="QSpinBox" name="mHeightSpinBox">
172201
<property name="suffix">
173202
<string> mm</string>
@@ -177,7 +206,17 @@
177206
</property>
178207
</widget>
179208
</item>
180-
<item row="8" column="0" colspan="2">
209+
<item row="15" column="0" colspan="2">
210+
<widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox">
211+
<property name="prefix">
212+
<string>Label space </string>
213+
</property>
214+
<property name="suffix">
215+
<string> mm</string>
216+
</property>
217+
</widget>
218+
</item>
219+
<item row="16" column="0" colspan="2">
181220
<widget class="QDoubleSpinBox" name="mLineWidthSpinBox">
182221
<property name="sizePolicy">
183222
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -202,17 +241,7 @@
202241
</property>
203242
</widget>
204243
</item>
205-
<item row="9" column="0" colspan="2">
206-
<widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox">
207-
<property name="prefix">
208-
<string>Label space </string>
209-
</property>
210-
<property name="suffix">
211-
<string> mm</string>
212-
</property>
213-
</widget>
214-
</item>
215-
<item row="10" column="0" colspan="2">
244+
<item row="17" column="0" colspan="2">
216245
<widget class="QDoubleSpinBox" name="mBoxSizeSpinBox">
217246
<property name="prefix">
218247
<string>Box space </string>
@@ -222,43 +251,37 @@
222251
</property>
223252
</widget>
224253
</item>
225-
<item row="11" column="0">
226-
<widget class="QLabel" name="mUnitLabelLabel">
227-
<property name="text">
228-
<string>Unit label</string>
254+
<item row="19" column="0" colspan="2">
255+
<layout class="QHBoxLayout" name="horizontalLayout2">
256+
<property name="margin">
257+
<number>0</number>
229258
</property>
230-
<property name="wordWrap">
231-
<bool>true</bool>
232-
</property>
233-
<property name="buddy">
234-
<cstring>mUnitLabelLineEdit</cstring>
235-
</property>
236-
</widget>
237-
</item>
238-
<item row="11" column="1">
239-
<widget class="QLineEdit" name="mUnitLabelLineEdit"/>
240-
</item>
241-
<item row="12" column="0" colspan="2">
242-
<widget class="QPushButton" name="mFontButton">
243-
<property name="sizePolicy">
244-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
245-
<horstretch>0</horstretch>
246-
<verstretch>0</verstretch>
247-
</sizepolicy>
248-
</property>
249-
<property name="text">
250-
<string>Font...</string>
251-
</property>
252-
</widget>
253-
</item>
254-
<item row="13" column="0" colspan="2">
255-
<widget class="QPushButton" name="mColorPushButton">
256-
<property name="text">
257-
<string>Color...</string>
258-
</property>
259-
</widget>
259+
<item>
260+
<widget class="QPushButton" name="mFontButton">
261+
<property name="sizePolicy">
262+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
263+
<horstretch>0</horstretch>
264+
<verstretch>0</verstretch>
265+
</sizepolicy>
266+
</property>
267+
<property name="text">
268+
<string>Font...</string>
269+
</property>
270+
</widget>
271+
</item>
272+
<item>
273+
<widget class="QPushButton" name="mFontColorButton">
274+
<property name="enabled">
275+
<bool>false</bool>
276+
</property>
277+
<property name="text">
278+
<string>Font color...</string>
279+
</property>
280+
</widget>
281+
</item>
282+
</layout>
260283
</item>
261-
<item row="14" column="0" colspan="2">
284+
<item row="22" column="0" colspan="2">
262285
<spacer name="verticalSpacer">
263286
<property name="orientation">
264287
<enum>Qt::Vertical</enum>
@@ -271,8 +294,26 @@
271294
</property>
272295
</spacer>
273296
</item>
274-
<item row="1" column="1">
275-
<widget class="QComboBox" name="mUnitsComboBox"/>
297+
<item row="20" column="0" colspan="2">
298+
<layout class="QHBoxLayout" name="horizontalLayout3">
299+
<property name="margin">
300+
<number>0</number>
301+
</property>
302+
<item>
303+
<widget class="QPushButton" name="mColorPushButton">
304+
<property name="text">
305+
<string>Fill color...</string>
306+
</property>
307+
</widget>
308+
</item>
309+
<item>
310+
<widget class="QPushButton" name="mStrokeColorPushButton">
311+
<property name="text">
312+
<string>Stroke color...</string>
313+
</property>
314+
</widget>
315+
</item>
316+
</layout>
276317
</item>
277318
</layout>
278319
</widget>

0 commit comments

Comments
 (0)
Please sign in to comment.