24
24
QgsCompositionWidget::QgsCompositionWidget ( QWidget* parent, QgsComposition* c ): QWidget( parent ), mComposition( c )
25
25
{
26
26
setupUi ( this );
27
+ blockSignals ( true );
27
28
createPaperEntries ();
28
29
29
30
// unit
30
31
mPaperUnitsComboBox ->addItem ( tr ( " mm" ) );
31
32
mPaperUnitsComboBox ->addItem ( tr ( " inch" ) );
32
33
33
34
// orientation
34
- mPaperOrientationComboBox ->blockSignals ( true );
35
35
mPaperOrientationComboBox ->insertItem ( 0 , tr ( " Landscape" ) );
36
36
mPaperOrientationComboBox ->insertItem ( 1 , tr ( " Portrait" ) );
37
- mPaperOrientationComboBox ->blockSignals ( false );
38
37
mPaperOrientationComboBox ->setCurrentIndex ( 0 );
39
38
40
39
// read with/height from composition and find suitable entries to display
@@ -70,16 +69,11 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
70
69
71
70
72
71
// grid pen width
73
- mPenWidthSpinBox ->blockSignals ( true );
74
72
mPenWidthSpinBox ->setValue ( mComposition ->gridPen ().widthF () );
75
- mPenWidthSpinBox ->blockSignals ( false );
76
73
77
74
// grid pen color
78
- mGridColorButton ->blockSignals ( true );
79
75
mGridColorButton ->setColor ( mComposition ->gridPen ().color () );
80
- mGridColorButton ->blockSignals ( false );
81
76
82
- mGridStyleComboBox ->blockSignals ( true );
83
77
mGridStyleComboBox ->insertItem ( 0 , tr ( " Solid" ) );
84
78
mGridStyleComboBox ->insertItem ( 1 , tr ( " Dots" ) );
85
79
mGridStyleComboBox ->insertItem ( 2 , tr ( " Crosses" ) );
@@ -97,8 +91,8 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
97
91
{
98
92
mGridStyleComboBox ->setCurrentIndex ( 2 );
99
93
}
100
- mGridStyleComboBox ->blockSignals ( false );
101
94
}
95
+ blockSignals ( false );
102
96
}
103
97
104
98
QgsCompositionWidget::QgsCompositionWidget (): QWidget( 0 ), mComposition( 0 )
@@ -143,17 +137,13 @@ void QgsCompositionWidget::createPaperEntries()
143
137
<< QgsCompositionPaper ( tr ( " Arch E (36x48 inches)" ), 914.4 , 1219.2 )
144
138
<< QgsCompositionPaper ( tr ( " Arch E1 (30x42 inches)" ), 762 , 1066.8 )
145
139
;
146
-
147
- mPaperSizeComboBox ->blockSignals ( true );
148
140
mPaperSizeComboBox ->addItem ( tr ( " Custom" ) );
149
141
150
142
for ( QList<QgsCompositionPaper>::const_iterator it = formats.begin (); it != formats.end (); it++ )
151
143
{
152
144
mPaperSizeComboBox ->addItem ( it->mName );
153
145
mPaperMap .insert ( it->mName , *it );
154
146
}
155
-
156
- mPaperSizeComboBox ->blockSignals ( false );
157
147
mPaperSizeComboBox ->setCurrentIndex ( 2 ); // A4
158
148
}
159
149
@@ -266,7 +256,7 @@ void QgsCompositionWidget::setSize( QDoubleSpinBox *spin, double v )
266
256
else
267
257
{
268
258
// inch (show width in inch)
269
- spin->setValue ( v / 25.4 );
259
+ spin->setValue ( v / 25.4 );
270
260
}
271
261
}
272
262
@@ -337,14 +327,6 @@ void QgsCompositionWidget::displayCompositionWidthHeight()
337
327
return ;
338
328
}
339
329
340
- // block all signals to avoid infinite recursion
341
- mPaperSizeComboBox ->blockSignals ( true );
342
- mPaperUnitsComboBox ->blockSignals ( true );
343
- mPaperWidthDoubleSpinBox ->blockSignals ( true );
344
- mPaperHeightDoubleSpinBox ->blockSignals ( true );
345
- mPaperOrientationComboBox ->blockSignals ( true );
346
- mResolutionSpinBox ->blockSignals ( true );
347
-
348
330
double paperWidth = mComposition ->paperWidth ();
349
331
setSize ( mPaperWidthDoubleSpinBox , paperWidth );
350
332
@@ -383,13 +365,6 @@ void QgsCompositionWidget::displayCompositionWidthHeight()
383
365
// custom
384
366
mPaperSizeComboBox ->setCurrentIndex ( 0 );
385
367
}
386
-
387
- mPaperSizeComboBox ->blockSignals ( false );
388
- mPaperUnitsComboBox ->blockSignals ( false );
389
- mPaperWidthDoubleSpinBox ->blockSignals ( false );
390
- mPaperHeightDoubleSpinBox ->blockSignals ( false );
391
- mPaperOrientationComboBox ->blockSignals ( false );
392
- mResolutionSpinBox ->blockSignals ( false );
393
368
}
394
369
395
370
void QgsCompositionWidget::displaySnapingSettings ()
@@ -399,11 +374,6 @@ void QgsCompositionWidget::displaySnapingSettings()
399
374
return ;
400
375
}
401
376
402
- mSnapToGridCheckBox ->blockSignals ( true );
403
- mGridResolutionSpinBox ->blockSignals ( true );
404
- mOffsetXSpinBox ->blockSignals ( true );
405
- mOffsetYSpinBox ->blockSignals ( true );
406
-
407
377
if ( mComposition ->snapToGridEnabled () )
408
378
{
409
379
mSnapToGridCheckBox ->setCheckState ( Qt::Checked );
@@ -416,11 +386,6 @@ void QgsCompositionWidget::displaySnapingSettings()
416
386
mGridResolutionSpinBox ->setValue ( mComposition ->snapGridResolution () );
417
387
mOffsetXSpinBox ->setValue ( mComposition ->snapGridOffsetX () );
418
388
mOffsetYSpinBox ->setValue ( mComposition ->snapGridOffsetY () );
419
-
420
- mSnapToGridCheckBox ->blockSignals ( false );
421
- mGridResolutionSpinBox ->blockSignals ( false );
422
- mOffsetXSpinBox ->blockSignals ( false );
423
- mOffsetYSpinBox ->blockSignals ( false );
424
389
}
425
390
426
391
void QgsCompositionWidget::on_mResolutionSpinBox_valueChanged ( const int value )
@@ -529,3 +494,21 @@ void QgsCompositionWidget::on_mPenWidthSpinBox_valueChanged( double d )
529
494
mComposition ->setGridPen ( pen );
530
495
}
531
496
}
497
+
498
+ void QgsCompositionWidget::blockSignals ( bool block )
499
+ {
500
+ mPaperSizeComboBox ->blockSignals ( block );
501
+ mPaperUnitsComboBox ->blockSignals ( block );
502
+ mPaperWidthDoubleSpinBox ->blockSignals ( block );
503
+ mPaperHeightDoubleSpinBox ->blockSignals ( block );
504
+ mPaperOrientationComboBox ->blockSignals ( block );
505
+ mResolutionSpinBox ->blockSignals ( block );
506
+ mPrintAsRasterCheckBox ->blockSignals ( block );
507
+ mSnapToGridCheckBox ->blockSignals ( block );
508
+ mGridResolutionSpinBox ->blockSignals ( block );
509
+ mOffsetXSpinBox ->blockSignals ( block );
510
+ mOffsetYSpinBox ->blockSignals ( block );
511
+ mPenWidthSpinBox ->blockSignals ( block );
512
+ mGridColorButton ->blockSignals ( block );
513
+ mGridStyleComboBox ->blockSignals ( block );
514
+ }
0 commit comments