Skip to content

Commit 46bd33e

Browse files
committed
Fix some todos
1 parent 0c8181b commit 46bd33e

File tree

1 file changed

+20
-22
lines changed

1 file changed

+20
-22
lines changed

src/core/composer/qgscomposermap.cpp

+20-22
Original file line numberDiff line numberDiff line change
@@ -1675,50 +1675,50 @@ double QgsComposerMap::gridFrameWidth() const
16751675

16761676
void QgsComposerMap::setGridFramePenSize( double w )
16771677
{
1678-
//todo...
1679-
/*QgsComposerMapGrid* g = firstMapGrid();
1680-
g->setGridFramePenSize( w );*/
1678+
QgsComposerMapGrid* g = firstMapGrid();
1679+
g->setGridFramePenSize( w );
16811680
}
16821681

16831682
double QgsComposerMap::gridFramePenSize() const
16841683
{
1685-
return 0.0; //todo...
1686-
/*const QgsComposerMapGrid* g = constFirstMapGrid();
1687-
return g->gridFramePenSize();*/
1684+
const QgsComposerMapGrid* g = constFirstMapGrid();
1685+
return g->gridFramePenSize();
16881686
}
16891687

16901688
void QgsComposerMap::setGridFramePenColor( const QColor& c )
16911689
{
1692-
//todo...
1693-
/*QgsComposerMapGrid* g = firstMapGrid();
1694-
g->setGridFramePenColor( c );*/
1690+
QgsComposerMapGrid* g = firstMapGrid();
1691+
g->setGridFramePenColor( c );
16951692
}
16961693

16971694
QColor QgsComposerMap::gridFramePenColor() const
16981695
{
1699-
return QColor(); //todo...
1700-
/*const QgsComposerMapGrid* g = constFirstMapGrid();
1701-
return g->gridFramePenColor();*/
1696+
const QgsComposerMapGrid* g = constFirstMapGrid();
1697+
return g->gridFramePenColor();
17021698
}
17031699

17041700
void QgsComposerMap::setGridFrameFillColor1( const QColor& c )
17051701
{
1706-
//todo...
1702+
QgsComposerMapGrid* g = firstMapGrid();
1703+
g->setGridFrameFillColor1( c );
17071704
}
17081705

17091706
QColor QgsComposerMap::gridFrameFillColor1() const
17101707
{
1711-
return QColor(); //todo...
1708+
const QgsComposerMapGrid* g = constFirstMapGrid();
1709+
return g->gridFrameFillColor1();
17121710
}
17131711

17141712
void QgsComposerMap::setGridFrameFillColor2( const QColor& c )
17151713
{
1716-
//todo...
1714+
QgsComposerMapGrid* g = firstMapGrid();
1715+
g->setGridFrameFillColor2( c );
17171716
}
17181717

17191718
QColor QgsComposerMap::gridFrameFillColor2() const
17201719
{
1721-
return QColor(); //todo...
1720+
const QgsComposerMapGrid* g = constFirstMapGrid();
1721+
return g->gridFrameFillColor2();
17221722
}
17231723

17241724
void QgsComposerMap::setCrossLength( double l )
@@ -1786,16 +1786,14 @@ void QgsComposerMap::drawGrids( QPainter* p )
17861786

17871787
void QgsComposerMap::setGridBlendMode( QPainter::CompositionMode blendMode )
17881788
{
1789-
#if 0 //todo...
1790-
mGridBlendMode = blendMode;
1791-
update();
1792-
#endif //0
1789+
QgsComposerMapGrid* g = firstMapGrid();
1790+
g->setBlendMode( blendMode );
17931791
}
17941792

17951793
QPainter::CompositionMode QgsComposerMap::gridBlendMode()
17961794
{
1797-
//todo...
1798-
return QPainter::CompositionMode_SourceOver;
1795+
const QgsComposerMapGrid* g = constFirstMapGrid();
1796+
return g->blendMode();
17991797
}
18001798

18011799
QRectF QgsComposerMap::boundingRect() const

0 commit comments

Comments
 (0)