Skip to content

Commit 3e76440

Browse files
mhugentmhugent
committed
Add frame pen width, color, fill color1, fill color2 to composergrid
1 parent b626f94 commit 3e76440

File tree

5 files changed

+284
-67
lines changed

5 files changed

+284
-67
lines changed

‎src/app/composer/qgscomposermapwidget.cpp‎

Lines changed: 87 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ void QgsComposerMapWidget::updateGuiElements()
617617
}
618618

619619
populateDataDefinedButtons();
620-
620+
loadGridEntries();
621621
blockAllSignals( false );
622622
}
623623

@@ -721,6 +721,7 @@ void QgsComposerMapWidget::blockAllSignals( bool b )
721721
mAnnotationDirectionComboBoxBottom->blockSignals( b );
722722
mDistanceToMapFrameSpinBox->blockSignals( b );
723723
mCoordinatePrecisionSpinBox->blockSignals( b );
724+
mGridBlendComboBox->blockSignals( b );
724725
}
725726

726727
void QgsComposerMapWidget::on_mUpdatePreviewButton_clicked()
@@ -1210,6 +1211,10 @@ void QgsComposerMapWidget::setGridItemsEnabled( bool enabled )
12101211
mFrameStyleComboBox->setEnabled( enabled );
12111212
mFrameWidthSpinBox->setEnabled( enabled );
12121213
mGridLineStyleButton->setEnabled( enabled );
1214+
mGridFramePenSizeSpinBox->setEnabled( enabled );
1215+
mGridFramePenColorButton->setEnabled( enabled );
1216+
mGridFrameFill1ColorButton->setEnabled( enabled );
1217+
mGridFrameFill2ColorButton->setEnabled( enabled );
12131218
}
12141219

12151220
void QgsComposerMapWidget::blockGridItemsSignals( bool block )
@@ -1227,6 +1232,10 @@ void QgsComposerMapWidget::blockGridItemsSignals( bool block )
12271232
mGridLineStyleButton->blockSignals( block );
12281233
mGridTypeComboBox->blockSignals( block );
12291234
mMapGridUnitComboBox->blockSignals( block );
1235+
mGridFramePenSizeSpinBox->blockSignals( block );
1236+
mGridFramePenColorButton->blockSignals( block );
1237+
mGridFrameFill1ColorButton->blockSignals( block );
1238+
mGridFrameFill2ColorButton->blockSignals( block );
12301239

12311240
//grid annotation
12321241
mDrawAnnotationGroupBox->blockSignals( block );
@@ -1258,6 +1267,10 @@ void QgsComposerMapWidget::setGridItems( const QgsComposerMapGrid* grid )
12581267
mOffsetYSpinBox->setValue( grid->gridOffsetY() );
12591268
mCrossWidthSpinBox->setValue( grid->crossLength() );
12601269
mFrameWidthSpinBox->setValue( grid->gridFrameWidth() );
1270+
mGridFramePenSizeSpinBox->setValue( grid->gridFramePenSize() );
1271+
mGridFramePenColorButton->setColor( grid->gridFramePenColor() );
1272+
mGridFrameFill1ColorButton->setColor( grid->gridFrameFillColor1() );
1273+
mGridFrameFill2ColorButton->setColor( grid->gridFrameFillColor2() );
12611274

12621275
QgsComposerMap::GridStyle gridStyle = grid->gridStyle();
12631276
if ( gridStyle == QgsComposerMap::Cross )
@@ -1284,6 +1297,8 @@ void QgsComposerMapWidget::setGridItems( const QgsComposerMapGrid* grid )
12841297
//line style
12851298
updateLineSymbolMarker( grid );
12861299

1300+
mGridBlendComboBox->setBlendMode( grid->blendMode() );
1301+
12871302
mDrawAnnotationGroupBox->setChecked( grid->showGridAnnotation() );
12881303
initAnnotationPositionBox( mAnnotationPositionLeftComboBox, grid->gridAnnotationPosition( QgsComposerMap::Left ) );
12891304
initAnnotationPositionBox( mAnnotationPositionRightComboBox, grid->gridAnnotationPosition( QgsComposerMap::Right ) );
@@ -1436,6 +1451,63 @@ void QgsComposerMapWidget::on_mFrameWidthSpinBox_valueChanged( double val )
14361451
mComposerMap->endCommand();
14371452
}
14381453

1454+
void QgsComposerMapWidget::on_mGridFramePenSizeSpinBox_valueChanged( double d )
1455+
{
1456+
QgsComposerMapGrid* grid = currentGrid();
1457+
if ( !grid || !mComposerMap )
1458+
{
1459+
return;
1460+
}
1461+
1462+
mComposerMap->beginCommand( tr( "Changed grid frame line thickness" ) );
1463+
grid->setGridFramePenSize( d );
1464+
mComposerMap->updateBoundingRect();
1465+
mComposerMap->update();
1466+
mComposerMap->endCommand();
1467+
}
1468+
1469+
void QgsComposerMapWidget::on_mGridFramePenColorButton_colorChanged( const QColor& newColor )
1470+
{
1471+
QgsComposerMapGrid* grid = currentGrid();
1472+
if ( !grid || !mComposerMap )
1473+
{
1474+
return;
1475+
}
1476+
1477+
mComposerMap->beginCommand( tr( "Grid frame color changed" ) );
1478+
grid->setGridFramePenColor( newColor );
1479+
mComposerMap->update();
1480+
mComposerMap->endCommand();
1481+
}
1482+
1483+
void QgsComposerMapWidget::on_mGridFrameFill1ColorButton_colorChanged( const QColor& newColor )
1484+
{
1485+
QgsComposerMapGrid* grid = currentGrid();
1486+
if ( !grid || !mComposerMap )
1487+
{
1488+
return;
1489+
}
1490+
1491+
mComposerMap->beginCommand( tr( "Grid frame first fill color changed" ) );
1492+
grid->setGridFrameFillColor1( newColor );
1493+
mComposerMap->update();
1494+
mComposerMap->endCommand();
1495+
}
1496+
1497+
void QgsComposerMapWidget::on_mGridFrameFill2ColorButton_colorChanged( const QColor& newColor )
1498+
{
1499+
QgsComposerMapGrid* grid = currentGrid();
1500+
if ( !grid || !mComposerMap )
1501+
{
1502+
return;
1503+
}
1504+
1505+
mComposerMap->beginCommand( tr( "Grid frame second fill color changed" ) );
1506+
grid->setGridFrameFillColor2( newColor );
1507+
mComposerMap->update();
1508+
mComposerMap->endCommand();
1509+
}
1510+
14391511
void QgsComposerMapWidget::on_mFrameStyleComboBox_currentIndexChanged( const QString& text )
14401512
{
14411513
QgsComposerMapGrid* grid = currentGrid();
@@ -1484,6 +1556,20 @@ void QgsComposerMapWidget::on_mMapGridUnitComboBox_currentIndexChanged( const QS
14841556
mComposerMap->endCommand();
14851557
}
14861558

1559+
void QgsComposerMapWidget::on_mGridBlendComboBox_currentIndexChanged( int index )
1560+
{
1561+
Q_UNUSED( index );
1562+
QgsComposerMapGrid* grid = currentGrid();
1563+
if ( grid )
1564+
{
1565+
mComposerMap->beginCommand( tr( "Grid blend mode changed" ) );
1566+
grid->setBlendMode( mGridBlendComboBox->blendMode() );
1567+
mComposerMap->update();
1568+
mComposerMap->endCommand();
1569+
}
1570+
1571+
}
1572+
14871573
void QgsComposerMapWidget::on_mGridTypeComboBox_currentIndexChanged( const QString& text )
14881574
{
14891575
QgsComposerMapGrid* grid = currentGrid();

‎src/app/composer/qgscomposermapwidget.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,14 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
8484
void on_mCrossWidthSpinBox_valueChanged( double val );
8585
void on_mFrameWidthSpinBox_valueChanged( double val );
8686
void on_mFrameStyleComboBox_currentIndexChanged( const QString& text );
87+
void on_mGridFramePenSizeSpinBox_valueChanged( double d );
88+
void on_mGridFramePenColorButton_colorChanged( const QColor& newColor );
89+
void on_mGridFrameFill1ColorButton_colorChanged( const QColor& newColor );
90+
void on_mGridFrameFill2ColorButton_colorChanged( const QColor& newColor );
8791
void on_mGridTypeComboBox_currentIndexChanged( const QString& text );
8892
void on_mMapGridCRSButton_clicked();
8993
void on_mMapGridUnitComboBox_currentIndexChanged( const QString& text );
94+
void on_mGridBlendComboBox_currentIndexChanged( int index );
9095

9196
void on_mDrawAnnotationGroupBox_toggled( bool state );
9297
//annotation position

‎src/core/composer/qgscomposermapgrid.cpp‎

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ QgsComposerMapGrid::QgsComposerMapGrid( const QString& name, QgsComposerMap* map
3333
mLeftGridAnnotationPosition( QgsComposerMap::OutsideMapFrame ), mRightGridAnnotationPosition( QgsComposerMap::OutsideMapFrame ), mTopGridAnnotationPosition( QgsComposerMap::OutsideMapFrame ),
3434
mBottomGridAnnotationPosition( QgsComposerMap::OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ), mLeftGridAnnotationDirection( QgsComposerMap::Horizontal ),
3535
mRightGridAnnotationDirection( QgsComposerMap::Horizontal ), mTopGridAnnotationDirection( QgsComposerMap::Horizontal ), mBottomGridAnnotationDirection( QgsComposerMap::Horizontal ), mGridAnnotationFormat( QgsComposerMap::Decimal ),
36-
mGridFrameStyle( QgsComposerMap::NoGridFrame ), mGridFrameWidth( 2.0 ), mCrossLength( 3 ), mGridLineSymbol( 0 ), mGridUnit( MapUnit )
36+
mGridFrameStyle( QgsComposerMap::NoGridFrame ), mGridFrameWidth( 2.0 ), mGridFramePenThickness( 0.5 ), mGridFramePenColor( QColor( 0, 0, 0 ) )
37+
, mGridFrameFillColor1( Qt::white ), mGridFrameFillColor2( Qt::black ), mCrossLength( 3 ), mGridLineSymbol( 0 ), mGridUnit( MapUnit ), mBlendMode( QPainter::CompositionMode_SourceOver )
3738
{
3839
//debug
3940
mGridLineSymbol = QgsLineSymbolV2::createSimple( QgsStringMap() );
@@ -112,9 +113,13 @@ bool QgsComposerMapGrid::writeXML( QDomElement& elem, QDomDocument& doc ) const
112113
mapGridElem.setAttribute( "offsetX", qgsDoubleToString( mGridOffsetX ) );
113114
mapGridElem.setAttribute( "offsetY", qgsDoubleToString( mGridOffsetY ) );
114115
mapGridElem.setAttribute( "crossLength", qgsDoubleToString( mCrossLength ) );
116+
QDomElement gridLineStyleElem = QgsSymbolLayerV2Utils::saveSymbol( QString(), mGridLineSymbol, doc );
115117
mapGridElem.setAttribute( "gridFrameStyle", mGridFrameStyle );
116118
mapGridElem.setAttribute( "gridFrameWidth", qgsDoubleToString( mGridFrameWidth ) );
117-
QDomElement gridLineStyleElem = QgsSymbolLayerV2Utils::saveSymbol( QString(), mGridLineSymbol, doc );
119+
mapGridElem.setAttribute( "gridFramePenThickness", qgsDoubleToString( mGridFramePenThickness ) );
120+
mapGridElem.setAttribute( "gridFramePenColor", QgsSymbolLayerV2Utils::encodeColor( mGridFramePenColor ) );
121+
mapGridElem.setAttribute( "frameFillColor1", QgsSymbolLayerV2Utils::encodeColor( mGridFrameFillColor1 ) );
122+
mapGridElem.setAttribute( "frameFillColor2", QgsSymbolLayerV2Utils::encodeColor( mGridFrameFillColor2 ) );
118123
if ( mCRS.isValid() )
119124
{
120125
mCRS.writeXML( mapGridElem, doc );
@@ -136,6 +141,7 @@ bool QgsComposerMapGrid::writeXML( QDomElement& elem, QDomDocument& doc ) const
136141
mapGridElem.setAttribute( "annotationFontColor", QgsSymbolLayerV2Utils::encodeColor( mGridAnnotationFontColor ) );
137142
mapGridElem.setAttribute( "annotationPrecision", mGridAnnotationPrecision );
138143
mapGridElem.setAttribute( "unit", mGridUnit );
144+
mapGridElem.setAttribute( "blendMode", mBlendMode );
139145

140146
elem.appendChild( mapGridElem );
141147
return true;
@@ -162,6 +168,10 @@ bool QgsComposerMapGrid::readXML( const QDomElement& itemElem, const QDomDocumen
162168
mCrossLength = itemElem.attribute( "crossLength", "3" ).toDouble();
163169
mGridFrameStyle = ( QgsComposerMap::GridFrameStyle )itemElem.attribute( "gridFrameStyle", "0" ).toInt();
164170
mGridFrameWidth = itemElem.attribute( "gridFrameWidth", "2.0" ).toDouble();
171+
mGridFramePenThickness = itemElem.attribute( "gridFramePenThickness", "0.5" ).toDouble();
172+
mGridFramePenColor = QgsSymbolLayerV2Utils::decodeColor( itemElem.attribute( "gridFramePenColor", "0,0,0" ) );
173+
mGridFrameFillColor1 = QgsSymbolLayerV2Utils::decodeColor( itemElem.attribute( "frameFillColor1", "255,255,255,255" ) );
174+
mGridFrameFillColor2 = QgsSymbolLayerV2Utils::decodeColor( itemElem.attribute( "frameFillColor2", "0,0,0,255" ) );
165175
QDomElement gridSymbolElem = itemElem.firstChildElement( "symbol" );
166176
delete mGridLineSymbol;
167177
if ( gridSymbolElem.isNull( ) )
@@ -187,6 +197,7 @@ bool QgsComposerMapGrid::readXML( const QDomElement& itemElem, const QDomDocumen
187197
{
188198
mCRS = QgsCoordinateReferenceSystem();
189199
}
200+
mBlendMode = ( QPainter::CompositionMode )( itemElem.attribute( "blendMode", "0" ).toUInt() );
190201

191202
//annotation
192203
mShowGridAnnotation = ( itemElem.attribute( "showAnnotation", "0" ) != "0" );
@@ -222,9 +233,6 @@ void QgsComposerMapGrid::drawGridCRSTransform( QPainter* painter ) const
222233
return;
223234
}
224235

225-
painter->save();
226-
painter->setRenderHint( QPainter::Antialiasing );
227-
228236
//x grid lines
229237
QList< QPair< double, QPolygonF > > xGridLines;
230238
xGridLinesCRSTransform( crsBoundingRect, inverseTr, xGridLines );
@@ -267,7 +275,6 @@ void QgsComposerMapGrid::drawGridCRSTransform( QPainter* painter ) const
267275
{
268276
drawCoordinateAnnotations( painter, horizontalLines, verticalLines );
269277
}
270-
painter->restore();
271278
}
272279

273280
void QgsComposerMapGrid::drawGrid( QPainter* p ) const
@@ -277,6 +284,10 @@ void QgsComposerMapGrid::drawGrid( QPainter* p ) const
277284
return;
278285
}
279286

287+
p->save();
288+
p->setCompositionMode( mBlendMode );
289+
p->setRenderHint( QPainter::Antialiasing );
290+
280291
//is grid in a different crs than map
281292
const QgsMapSettings& ms = mComposerMap->composition()->mapSettings();
282293
if ( mGridUnit == MapUnit && mCRS.isValid() && mCRS != ms.destinationCrs() )
@@ -359,6 +370,8 @@ void QgsComposerMapGrid::drawGrid( QPainter* p ) const
359370
{
360371
drawCoordinateAnnotations( p, horizontalLines, verticalLines );
361372
}
373+
374+
p->restore();
362375
}
363376

364377
void QgsComposerMapGrid::drawGridFrame( QPainter* p, const QList< QPair< double, QLineF > >& hLines, const QList< QPair< double, QLineF > >& vLines ) const
@@ -417,7 +430,7 @@ void QgsComposerMapGrid::drawGridFrameBorder( QPainter* p, const QMap< double, d
417430
}
418431

419432
double currentCoord = - mGridFrameWidth;
420-
bool white = true;
433+
bool color1 = true;
421434
double x = 0;
422435
double y = 0;
423436
double width = 0;
@@ -436,10 +449,16 @@ void QgsComposerMapGrid::drawGridFrameBorder( QPainter* p, const QMap< double, d
436449
pos.insert( mComposerMap->rect().width() + mGridFrameWidth, mComposerMap->rect().width() + mGridFrameWidth );
437450
}
438451

452+
//set pen to current frame pen
453+
QPen framePen = QPen( mGridFramePenColor );
454+
framePen.setWidthF( mGridFramePenThickness );
455+
framePen.setJoinStyle( Qt::MiterJoin );
456+
p->setPen( framePen );
457+
439458
QMap< double, double >::const_iterator posIt = pos.constBegin();
440459
for ( ; posIt != pos.constEnd(); ++posIt )
441460
{
442-
p->setBrush( QBrush( white ? Qt::white : Qt::black ) );
461+
p->setBrush( QBrush( color1 ? mGridFrameFillColor1 : mGridFrameFillColor2 ) );
443462
if ( border == QgsComposerMap::Left || border == QgsComposerMap::Right )
444463
{
445464
height = posIt.key() - currentCoord;
@@ -456,7 +475,7 @@ void QgsComposerMapGrid::drawGridFrameBorder( QPainter* p, const QMap< double, d
456475
}
457476
p->drawRect( QRectF( x, y, width, height ) );
458477
currentCoord = posIt.key();
459-
white = !white;
478+
color1 = !color1;
460479
}
461480
}
462481

‎src/core/composer/qgscomposermapgrid.h‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,32 @@ class CORE_EXPORT QgsComposerMapGrid
159159
void setGridFrameWidth( double w ) { mGridFrameWidth = w; }
160160
double gridFrameWidth() const { return mGridFrameWidth; }
161161

162+
/**Set grid frame pen thickness
163+
@note: this function was added in version 2.1*/
164+
void setGridFramePenSize( double w ) { mGridFramePenThickness = w; }
165+
double gridFramePenSize() const { return mGridFramePenThickness; }
166+
167+
/**Sets pen color for grid frame
168+
@note: this function was added in version 2.1*/
169+
void setGridFramePenColor( const QColor& c ) { mGridFramePenColor = c;}
170+
/**Get pen color for grid frame
171+
@note: this function was added in version 2.1*/
172+
QColor gridFramePenColor() const {return mGridFramePenColor;}
173+
174+
/**Sets first fill color for grid zebra frame
175+
@note: this function was added in version 2.1*/
176+
void setGridFrameFillColor1( const QColor& c ) { mGridFrameFillColor1 = c;}
177+
/**Get first fill color for grid zebra frame
178+
@note: this function was added in version 2.1*/
179+
QColor gridFrameFillColor1() const {return mGridFrameFillColor1;}
180+
181+
/**Sets second fill color for grid zebra frame
182+
@note: this function was added in version 2.1*/
183+
void setGridFrameFillColor2( const QColor& c ) { mGridFrameFillColor2 = c;}
184+
/**Get second fill color for grid zebra frame
185+
@note: this function was added in version 2.1*/
186+
QColor gridFrameFillColor2() const {return mGridFrameFillColor2;}
187+
162188
/**Sets length of the cros segments (if grid style is cross)
163189
@note this function was added in version 1.4*/
164190
void setCrossLength( double l ) {mCrossLength = l;}
@@ -174,6 +200,9 @@ class CORE_EXPORT QgsComposerMapGrid
174200
void setGridUnit( GridUnit u ) { mGridUnit = u; }
175201
GridUnit gridUnit() const { return mGridUnit; }
176202

203+
void setBlendMode( QPainter::CompositionMode mode ) { mBlendMode = mode; }
204+
QPainter::CompositionMode blendMode() const { return mBlendMode; }
205+
177206
double maxExtension() const;
178207

179208
private:
@@ -227,6 +256,10 @@ class CORE_EXPORT QgsComposerMapGrid
227256
QgsComposerMap::GridAnnotationFormat mGridAnnotationFormat;
228257
QgsComposerMap::GridFrameStyle mGridFrameStyle;
229258
double mGridFrameWidth;
259+
double mGridFramePenThickness;
260+
QColor mGridFramePenColor;
261+
QColor mGridFrameFillColor1;
262+
QColor mGridFrameFillColor2;
230263
double mCrossLength;
231264

232265
QgsLineSymbolV2* mGridLineSymbol;
@@ -235,6 +268,8 @@ class CORE_EXPORT QgsComposerMapGrid
235268

236269
GridUnit mGridUnit;
237270

271+
QPainter::CompositionMode mBlendMode;
272+
238273
/**Draws the map grid*/
239274
void drawGridFrame( QPainter* p, const QList< QPair< double, QLineF > >& hLines, const QList< QPair< double, QLineF > >& vLines ) const;
240275
/**Draw coordinates for mGridAnnotationType Coordinate

0 commit comments

Comments
 (0)