Skip to content

Commit dce914d

Browse files
etienneskyetiennesky
committedJun 25, 2012
remove cross grid type and set default marker to cross; remove annotation position option
·
ltr-3_40Before-merge-new_vector_api
1 parent 52d9f3a commit dce914d

File tree

4 files changed

+158
-191
lines changed

4 files changed

+158
-191
lines changed
 

‎src/app/qgsdecorationgrid.cpp

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "qgsproject.h"
2929
#include "qgssymbollayerv2utils.h" //for pointOnLineWithDistance
3030
#include "qgssymbolv2.h" //for symbology
31+
#include "qgsmarkersymbollayerv2.h"
3132
#include "qgsrendercontext.h"
3233
#include "qgsmapcanvas.h"
3334
#include "qgsmaprenderer.h"
@@ -100,15 +101,16 @@ void QgsDecorationGrid::projectRead()
100101
mMapUnits = ( QGis::UnitType ) QgsProject::instance()->readNumEntry( mNameConfig, "/MapUnits",
101102
QGis::UnknownUnit );
102103
mGridStyle = ( GridStyle ) QgsProject::instance()->readNumEntry( mNameConfig, "/Style",
103-
QgsDecorationGrid::Solid );
104+
QgsDecorationGrid::Line );
104105
mGridIntervalX = QgsProject::instance()->readDoubleEntry( mNameConfig, "/IntervalX", 10 );
105106
mGridIntervalY = QgsProject::instance()->readDoubleEntry( mNameConfig, "/IntervalY", 10 );
106107
mGridOffsetX = QgsProject::instance()->readDoubleEntry( mNameConfig, "/OffsetX", 0 );
107108
mGridOffsetY = QgsProject::instance()->readDoubleEntry( mNameConfig, "/OffsetY", 0 );
108-
mCrossLength = QgsProject::instance()->readDoubleEntry( mNameConfig, "/CrossLength", 3 );
109+
// mCrossLength = QgsProject::instance()->readDoubleEntry( mNameConfig, "/CrossLength", 3 );
109110
mShowGridAnnotation = QgsProject::instance()->readBoolEntry( mNameConfig, "/ShowAnnotation", false );
110-
mGridAnnotationPosition = ( GridAnnotationPosition ) QgsProject::instance()->readNumEntry( mNameConfig,
111-
"/AnnotationPosition", 0 );
111+
// mGridAnnotationPosition = ( GridAnnotationPosition ) QgsProject::instance()->readNumEntry( mNameConfig,
112+
// "/AnnotationPosition", 0 );
113+
mGridAnnotationPosition = InsideMapFrame; // don't allow outside frame, doesn't make sense
112114
mGridAnnotationDirection = ( GridAnnotationDirection ) QgsProject::instance()->readNumEntry( mNameConfig,
113115
"/AnnotationDirection", 0 );
114116
QString fontStr = QgsProject::instance()->readEntry( mNameConfig, "/AnnotationFont", "" );
@@ -152,7 +154,14 @@ void QgsDecorationGrid::projectRead()
152154
mMarkerSymbol = dynamic_cast<QgsMarkerSymbolV2*>( QgsSymbolLayerV2Utils::loadSymbol( elem ) );
153155
}
154156
if ( ! mMarkerSymbol )
155-
mMarkerSymbol = new QgsMarkerSymbolV2();
157+
{
158+
// set default symbol : cross with width=20
159+
QgsSymbolLayerV2List symbolList;
160+
symbolList << new QgsSimpleMarkerSymbolLayerV2( "cross", DEFAULT_SIMPLEMARKER_COLOR,
161+
DEFAULT_SIMPLEMARKER_BORDERCOLOR, 20, 0 );
162+
mMarkerSymbol = new QgsMarkerSymbolV2( symbolList );
163+
// mMarkerSymbol = new QgsMarkerSymbolV2();
164+
}
156165
}
157166

158167
void QgsDecorationGrid::saveToProject()
@@ -165,10 +174,10 @@ void QgsDecorationGrid::saveToProject()
165174
QgsProject::instance()->writeEntry( mNameConfig, "/IntervalY", mGridIntervalY );
166175
QgsProject::instance()->writeEntry( mNameConfig, "/OffsetX", mGridOffsetX );
167176
QgsProject::instance()->writeEntry( mNameConfig, "/OffsetX", mGridOffsetY );
168-
QgsProject::instance()->writeEntry( mNameConfig, "/CrossLength", mCrossLength );
177+
// QgsProject::instance()->writeEntry( mNameConfig, "/CrossLength", mCrossLength );
169178
// missing mGridPen, but should use styles anyway
170179
QgsProject::instance()->writeEntry( mNameConfig, "/ShowAnnotation", mShowGridAnnotation );
171-
QgsProject::instance()->writeEntry( mNameConfig, "/AnnotationPosition", ( int ) mGridAnnotationPosition );
180+
// QgsProject::instance()->writeEntry( mNameConfig, "/AnnotationPosition", ( int ) mGridAnnotationPosition );
172181
QgsProject::instance()->writeEntry( mNameConfig, "/AnnotationDirection", ( int ) mGridAnnotationDirection );
173182
QgsProject::instance()->writeEntry( mNameConfig, "/AnnotationFont", mGridAnnotationFont.toString() );
174183
QgsProject::instance()->writeEntry( mNameConfig, "/AnnotationFrameDistance", mAnnotationFrameDistance );
@@ -184,7 +193,7 @@ void QgsDecorationGrid::saveToProject()
184193
// FIXME this works, but XML will not be valid as < is replaced by &lt;
185194
QgsProject::instance()->writeEntry( mNameConfig, "/LineSymbol", doc.toString() );
186195
}
187-
if ( mLineSymbol )
196+
if ( mMarkerSymbol )
188197
{
189198
doc.setContent( QString( "" ) );
190199
elem = QgsSymbolLayerV2Utils::saveSymbol( "marker symbol", mMarkerSymbol, doc );
@@ -223,7 +232,7 @@ void QgsDecorationGrid::render( QPainter * p )
223232
// p->setClipRect( thisPaintRect );
224233

225234
//simpler approach: draw vertical lines first, then horizontal ones
226-
if ( mGridStyle == QgsDecorationGrid::Solid )
235+
if ( mGridStyle == QgsDecorationGrid::Line )
227236
{
228237
if ( ! mLineSymbol )
229238
return;
@@ -252,6 +261,7 @@ void QgsDecorationGrid::render( QPainter * p )
252261

253262
mLineSymbol->stopRender( context );
254263
}
264+
#if 0
255265
else if ( mGridStyle == QgsDecorationGrid::Cross )
256266
{
257267
QPointF intersectionPoint, crossEnd1, crossEnd2;
@@ -299,6 +309,7 @@ void QgsDecorationGrid::render( QPainter * p )
299309
p->drawLine( hIt->second.p2(), crossEnd1 );
300310
}
301311
}
312+
#endif
302313
else //marker
303314
{
304315
if ( ! mMarkerSymbol )
@@ -308,7 +319,7 @@ void QgsDecorationGrid::render( QPainter * p )
308319
context.setPainter( p );
309320
mMarkerSymbol->startRender( context, 0 );
310321

311-
QPointF intersectionPoint, crossEnd1, crossEnd2;
322+
QPointF intersectionPoint;
312323
for ( ; vIt != verticalLines.constEnd(); ++vIt )
313324
{
314325
//test for intersection with every horizontal line

‎src/app/qgsdecorationgrid.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ class QgsDecorationGrid: public QgsDecorationItem
4040

4141
enum GridStyle
4242
{
43-
Solid = 0, //solid lines
44-
Cross = 1, //only draw line crossings
45-
Marker = 2 //user-defined marker
43+
Line = 0, //solid lines
44+
// Cross = 1, //only draw line crossings
45+
Marker = 1 //user-defined marker
4646
};
4747

4848
enum GridAnnotationPosition
@@ -113,8 +113,8 @@ class QgsDecorationGrid: public QgsDecorationItem
113113
GridAnnotationDirection gridAnnotationDirection() const {return mGridAnnotationDirection;}
114114

115115
/**Sets length of the cros segments (if grid style is cross) */
116-
void setCrossLength( double l ) {mCrossLength = l;}
117-
double crossLength() {return mCrossLength;}
116+
/* void setCrossLength( double l ) {mCrossLength = l;} */
117+
/* double crossLength() {return mCrossLength;} */
118118

119119
/**Set symbol that is used to draw grid lines. Takes ownership*/
120120
void setLineSymbol( QgsLineSymbolV2* symbol );
@@ -164,7 +164,7 @@ class QgsDecorationGrid: public QgsDecorationItem
164164
Top
165165
};
166166

167-
/**Solid or crosses*/
167+
/** Line or Symbol */
168168
GridStyle mGridStyle;
169169
/**Grid line interval in x-direction (map units)*/
170170
double mGridIntervalX;
@@ -189,7 +189,7 @@ class QgsDecorationGrid: public QgsDecorationItem
189189
/**Annotation can be horizontal / vertical or different for axes*/
190190
GridAnnotationDirection mGridAnnotationDirection;
191191
/**The length of the cross sides for mGridStyle Cross*/
192-
double mCrossLength;
192+
/* double mCrossLength; */
193193

194194
QgsLineSymbolV2* mLineSymbol;
195195
QgsMarkerSymbolV2* mMarkerSymbol;

‎src/app/qgsdecorationgriddialog.cpp

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ QgsDecorationGridDialog::QgsDecorationGridDialog( QgsDecorationGrid& deco, QWidg
4343

4444
// mXMinLineEdit->setValidator( new QDoubleValidator( mXMinLineEdit ) );
4545

46-
mGridTypeComboBox->insertItem( QgsDecorationGrid::Solid, tr( "Lines" ) );
47-
mGridTypeComboBox->insertItem( QgsDecorationGrid::Cross, tr( "Cross" ) );
46+
mGridTypeComboBox->insertItem( QgsDecorationGrid::Line, tr( "Line" ) );
47+
// mGridTypeComboBox->insertItem( QgsDecorationGrid::Cross, tr( "Cross" ) );
4848
mGridTypeComboBox->insertItem( QgsDecorationGrid::Marker, tr( "Marker" ) );
4949

50-
mAnnotationPositionComboBox->insertItem( QgsDecorationGrid::InsideMapFrame, tr( "Inside frame" ) );
50+
// mAnnotationPositionComboBox->insertItem( QgsDecorationGrid::InsideMapFrame, tr( "Inside frame" ) );
5151
// mAnnotationPositionComboBox->insertItem( QgsDecorationGrid::OutsideMapFrame, tr( "Outside frame" ) );
5252

5353
mAnnotationDirectionComboBox->insertItem( QgsDecorationGrid::Horizontal,
@@ -77,8 +77,8 @@ void QgsDecorationGridDialog::updateGuiElements()
7777
mOffsetYSpinBox->setValue( mDeco.gridOffsetY() );
7878

7979
mGridTypeComboBox->setCurrentIndex(( int ) mDeco.gridStyle() );
80-
mCrossWidthSpinBox->setValue( mDeco.crossLength() );
81-
mAnnotationPositionComboBox->setCurrentIndex(( int ) mDeco.gridAnnotationPosition() );
80+
// mCrossWidthSpinBox->setValue( mDeco.crossLength() );
81+
// mAnnotationPositionComboBox->setCurrentIndex(( int ) mDeco.gridAnnotationPosition() );
8282
mDrawAnnotationCheckBox->setChecked( mDeco.showGridAnnotation() );
8383
mAnnotationDirectionComboBox->setCurrentIndex(( int ) mDeco.gridAnnotationDirection() );
8484
mCoordinatePrecisionSpinBox->setValue( mDeco.gridAnnotationPrecision() );
@@ -118,28 +118,28 @@ void QgsDecorationGridDialog::updateDecoFromGui()
118118
mDeco.setGridOffsetX( mOffsetXSpinBox->value() );
119119
mDeco.setGridOffsetY( mOffsetYSpinBox->value() );
120120
// mDeco.setGridPenWidth( mLineWidthSpinBox->value() );
121-
if ( mGridTypeComboBox->currentText() == tr( "Cross" ) )
122-
{
123-
mDeco.setGridStyle( QgsDecorationGrid::Cross );
124-
}
125-
else if ( mGridTypeComboBox->currentText() == tr( "Marker" ) )
121+
// if ( mGridTypeComboBox->currentText() == tr( "Cross" ) )
122+
// {
123+
// mDeco.setGridStyle( QgsDecorationGrid::Cross );
124+
// }
125+
if ( mGridTypeComboBox->currentText() == tr( "Marker" ) )
126126
{
127127
mDeco.setGridStyle( QgsDecorationGrid::Marker );
128128
}
129-
else
129+
else if ( mGridTypeComboBox->currentText() == tr( "Line" ) )
130130
{
131-
mDeco.setGridStyle( QgsDecorationGrid::Solid );
131+
mDeco.setGridStyle( QgsDecorationGrid::Line );
132132
}
133-
mDeco.setCrossLength( mCrossWidthSpinBox->value() );
133+
// mDeco.setCrossLength( mCrossWidthSpinBox->value() );
134134
mDeco.setAnnotationFrameDistance( mDistanceToMapFrameSpinBox->value() );
135-
if ( mAnnotationPositionComboBox->currentText() == tr( "Inside frame" ) )
136-
{
137-
mDeco.setGridAnnotationPosition( QgsDecorationGrid::InsideMapFrame );
138-
}
139-
else
140-
{
141-
mDeco.setGridAnnotationPosition( QgsDecorationGrid::OutsideMapFrame );
142-
}
135+
// if ( mAnnotationPositionComboBox->currentText() == tr( "Inside frame" ) )
136+
// {
137+
// mDeco.setGridAnnotationPosition( QgsDecorationGrid::InsideMapFrame );
138+
// }
139+
// else
140+
// {
141+
// mDeco.setGridAnnotationPosition( QgsDecorationGrid::OutsideMapFrame );
142+
// }
143143
mDeco.setShowGridAnnotation( mDrawAnnotationCheckBox->isChecked() );
144144
QString text = mAnnotationDirectionComboBox->currentText();
145145
if ( text == tr( "Horizontal" ) )
@@ -218,8 +218,8 @@ void QgsDecorationGridDialog::on_buttonBox_rejected()
218218

219219
void QgsDecorationGridDialog::on_mGridTypeComboBox_currentIndexChanged( int index )
220220
{
221-
mLineSymbolButton->setEnabled( index == QgsDecorationGrid::Solid );
222-
mCrossWidthSpinBox->setEnabled( index == QgsDecorationGrid::Cross );
221+
mLineSymbolButton->setEnabled( index == QgsDecorationGrid::Line );
222+
// mCrossWidthSpinBox->setEnabled( index == QgsDecorationGrid::Cross );
223223
mMarkerSymbolButton->setEnabled( index == QgsDecorationGrid::Marker );
224224
}
225225

@@ -231,6 +231,7 @@ void QgsDecorationGridDialog::on_mLineSymbolButton_clicked()
231231

232232
QgsLineSymbolV2* lineSymbol = dynamic_cast<QgsLineSymbolV2*>( mLineSymbol->clone() );
233233
QgsSymbolV2PropertiesDialog dlg( lineSymbol, 0, this );
234+
// QgsSymbolV2SelectorDialog dlg( lineSymbol, 0, this );
234235
if ( dlg.exec() == QDialog::Rejected )
235236
{
236237
delete lineSymbol;
@@ -254,6 +255,7 @@ void QgsDecorationGridDialog::on_mMarkerSymbolButton_clicked()
254255

255256
QgsMarkerSymbolV2* markerSymbol = dynamic_cast<QgsMarkerSymbolV2*>( mMarkerSymbol->clone() );
256257
QgsSymbolV2PropertiesDialog dlg( markerSymbol, 0, this );
258+
// QgsSymbolV2SelectorDialog dlg( markerSymbol, 0, this );
257259
if ( dlg.exec() == QDialog::Rejected )
258260
{
259261
delete markerSymbol;

‎src/ui/qgsdecorationgriddialog.ui

Lines changed: 105 additions & 151 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>613</width>
10-
<height>367</height>
9+
<width>628</width>
10+
<height>335</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -88,23 +88,6 @@
8888
</property>
8989
</widget>
9090
</item>
91-
<item row="6" column="0">
92-
<widget class="QLabel" name="mCrossWidthLabel">
93-
<property name="text">
94-
<string>Cross width</string>
95-
</property>
96-
<property name="wordWrap">
97-
<bool>true</bool>
98-
</property>
99-
</widget>
100-
</item>
101-
<item row="7" column="0">
102-
<widget class="QLabel" name="mMarkerSymbolLabel">
103-
<property name="text">
104-
<string>Marker symbol</string>
105-
</property>
106-
</widget>
107-
</item>
10891
<item row="4" column="1">
10992
<widget class="QComboBox" name="mGridTypeComboBox">
11093
<property name="sizePolicy">
@@ -143,103 +126,6 @@
143126
</property>
144127
</widget>
145128
</item>
146-
<item row="6" column="1">
147-
<widget class="QDoubleSpinBox" name="mCrossWidthSpinBox">
148-
<property name="enabled">
149-
<bool>false</bool>
150-
</property>
151-
<property name="minimumSize">
152-
<size>
153-
<width>100</width>
154-
<height>0</height>
155-
</size>
156-
</property>
157-
<property name="decimals">
158-
<number>5</number>
159-
</property>
160-
</widget>
161-
</item>
162-
<item row="7" column="1">
163-
<widget class="QPushButton" name="mMarkerSymbolButton">
164-
<property name="enabled">
165-
<bool>false</bool>
166-
</property>
167-
<property name="sizePolicy">
168-
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
169-
<horstretch>0</horstretch>
170-
<verstretch>0</verstretch>
171-
</sizepolicy>
172-
</property>
173-
<property name="minimumSize">
174-
<size>
175-
<width>100</width>
176-
<height>0</height>
177-
</size>
178-
</property>
179-
<property name="text">
180-
<string/>
181-
</property>
182-
</widget>
183-
</item>
184-
<item row="8" column="0" colspan="2">
185-
<widget class="Line" name="line_3">
186-
<property name="orientation">
187-
<enum>Qt::Horizontal</enum>
188-
</property>
189-
</widget>
190-
</item>
191-
<item row="9" column="0">
192-
<widget class="QLabel" name="mOffsetXLabel">
193-
<property name="text">
194-
<string>Offset X</string>
195-
</property>
196-
<property name="wordWrap">
197-
<bool>true</bool>
198-
</property>
199-
</widget>
200-
</item>
201-
<item row="10" column="0">
202-
<widget class="QLabel" name="mOffsetYLabel">
203-
<property name="text">
204-
<string>Offset Y</string>
205-
</property>
206-
<property name="wordWrap">
207-
<bool>true</bool>
208-
</property>
209-
</widget>
210-
</item>
211-
<item row="9" column="1">
212-
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
213-
<property name="minimumSize">
214-
<size>
215-
<width>100</width>
216-
<height>0</height>
217-
</size>
218-
</property>
219-
<property name="decimals">
220-
<number>5</number>
221-
</property>
222-
<property name="maximum">
223-
<double>9999999.000000000000000</double>
224-
</property>
225-
</widget>
226-
</item>
227-
<item row="10" column="1">
228-
<widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
229-
<property name="minimumSize">
230-
<size>
231-
<width>100</width>
232-
<height>0</height>
233-
</size>
234-
</property>
235-
<property name="decimals">
236-
<number>5</number>
237-
</property>
238-
<property name="maximum">
239-
<double>9999999.000000000000000</double>
240-
</property>
241-
</widget>
242-
</item>
243129
<item row="1" column="1">
244130
<widget class="QDoubleSpinBox" name="mIntervalXSpinBox">
245131
<property name="sizePolicy">
@@ -319,19 +205,6 @@
319205
<enum>QLayout::SetMinimumSize</enum>
320206
</property>
321207
<item row="0" column="0">
322-
<widget class="QLabel" name="mAnnotationPositionLabel">
323-
<property name="text">
324-
<string>Annotation position</string>
325-
</property>
326-
<property name="wordWrap">
327-
<bool>true</bool>
328-
</property>
329-
</widget>
330-
</item>
331-
<item row="0" column="1">
332-
<widget class="QComboBox" name="mAnnotationPositionComboBox"/>
333-
</item>
334-
<item row="1" column="0">
335208
<widget class="QLabel" name="mAnnotationDirectionLabel">
336209
<property name="frameShape">
337210
<enum>QFrame::NoFrame</enum>
@@ -344,17 +217,17 @@
344217
</property>
345218
</widget>
346219
</item>
347-
<item row="1" column="1">
220+
<item row="0" column="1">
348221
<widget class="QComboBox" name="mAnnotationDirectionComboBox"/>
349222
</item>
350-
<item row="2" column="0" colspan="2">
223+
<item row="1" column="0" colspan="2">
351224
<widget class="QPushButton" name="mAnnotationFontButton">
352225
<property name="text">
353226
<string>Font...</string>
354227
</property>
355228
</widget>
356229
</item>
357-
<item row="3" column="0">
230+
<item row="2" column="0">
358231
<widget class="QLabel" name="mDistanceToFrameLabel">
359232
<property name="text">
360233
<string>Distance to map frame</string>
@@ -364,10 +237,10 @@
364237
</property>
365238
</widget>
366239
</item>
367-
<item row="3" column="1">
240+
<item row="2" column="1">
368241
<widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox"/>
369242
</item>
370-
<item row="4" column="0">
243+
<item row="3" column="0">
371244
<widget class="QLabel" name="mCoordinatePrecisionLabel">
372245
<property name="text">
373246
<string>Coordinate precision</string>
@@ -377,42 +250,123 @@
377250
</property>
378251
</widget>
379252
</item>
380-
<item row="4" column="1">
253+
<item row="3" column="1">
381254
<widget class="QSpinBox" name="mCoordinatePrecisionSpinBox"/>
382255
</item>
383256
</layout>
384257
</widget>
385258
</item>
386-
<item row="9" column="3" colspan="2">
387-
<widget class="QLabel" name="label">
388-
<property name="midLineWidth">
389-
<number>0</number>
390-
</property>
259+
<item row="6" column="0">
260+
<widget class="QLabel" name="mMarkerSymbolLabel">
391261
<property name="text">
392-
<string>Update Interval:</string>
262+
<string>Marker symbol</string>
263+
</property>
264+
</widget>
265+
</item>
266+
<item row="6" column="1">
267+
<widget class="QPushButton" name="mMarkerSymbolButton">
268+
<property name="enabled">
269+
<bool>false</bool>
270+
</property>
271+
<property name="sizePolicy">
272+
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
273+
<horstretch>0</horstretch>
274+
<verstretch>0</verstretch>
275+
</sizepolicy>
276+
</property>
277+
<property name="minimumSize">
278+
<size>
279+
<width>100</width>
280+
<height>0</height>
281+
</size>
393282
</property>
394-
<property name="textFormat">
395-
<enum>Qt::PlainText</enum>
283+
<property name="text">
284+
<string/>
396285
</property>
397-
<property name="alignment">
398-
<set>Qt::AlignCenter</set>
286+
</widget>
287+
</item>
288+
<item row="7" column="0" colspan="2">
289+
<widget class="Line" name="line_3">
290+
<property name="orientation">
291+
<enum>Qt::Horizontal</enum>
399292
</property>
400293
</widget>
401294
</item>
402-
<item row="10" column="4">
403-
<widget class="QPushButton" name="mPbtnUpdateFromLayer">
295+
<item row="8" column="0">
296+
<widget class="QLabel" name="mOffsetXLabel">
404297
<property name="text">
405-
<string>From Layer</string>
298+
<string>Offset X</string>
299+
</property>
300+
<property name="wordWrap">
301+
<bool>true</bool>
406302
</property>
407303
</widget>
408304
</item>
409-
<item row="10" column="3">
410-
<widget class="QPushButton" name="mPbtnUpdateFromExtents">
305+
<item row="8" column="1">
306+
<widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
307+
<property name="minimumSize">
308+
<size>
309+
<width>100</width>
310+
<height>0</height>
311+
</size>
312+
</property>
313+
<property name="decimals">
314+
<number>5</number>
315+
</property>
316+
<property name="maximum">
317+
<double>9999999.000000000000000</double>
318+
</property>
319+
</widget>
320+
</item>
321+
<item row="9" column="0">
322+
<widget class="QLabel" name="mOffsetYLabel">
411323
<property name="text">
412-
<string>From Extents</string>
324+
<string>Offset Y</string>
325+
</property>
326+
<property name="wordWrap">
327+
<bool>true</bool>
413328
</property>
414329
</widget>
415330
</item>
331+
<item row="9" column="1">
332+
<widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
333+
<property name="minimumSize">
334+
<size>
335+
<width>100</width>
336+
<height>0</height>
337+
</size>
338+
</property>
339+
<property name="decimals">
340+
<number>5</number>
341+
</property>
342+
<property name="maximum">
343+
<double>9999999.000000000000000</double>
344+
</property>
345+
</widget>
346+
</item>
347+
<item row="8" column="3" rowspan="2" colspan="2">
348+
<widget class="QGroupBox" name="groupBox">
349+
<property name="title">
350+
<string>Update Interval / Offset from</string>
351+
</property>
352+
<layout class="QGridLayout" name="gridLayout_2">
353+
<item row="0" column="0">
354+
<widget class="QPushButton" name="mPbtnUpdateFromExtents">
355+
<property name="text">
356+
<string>Canvas Extents</string>
357+
</property>
358+
</widget>
359+
</item>
360+
<item row="0" column="1">
361+
<widget class="QPushButton" name="mPbtnUpdateFromLayer">
362+
<property name="text">
363+
<string>Active Raster Layer</string>
364+
</property>
365+
</widget>
366+
</item>
367+
</layout>
368+
</widget>
369+
</item>
416370
</layout>
417371
</item>
418372
<item>

0 commit comments

Comments
 (0)
Please sign in to comment.