Skip to content

Commit

Permalink
Grid annotation can be with coordinates or 1A, 1B, ...
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk@11811 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Oct 15, 2009
1 parent 979c19d commit a0d9617
Show file tree
Hide file tree
Showing 5 changed files with 165 additions and 41 deletions.
32 changes: 32 additions & 0 deletions src/app/composer/qgscomposermapwidget.cpp
View file
Expand Up @@ -54,6 +54,9 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap ): QWidg
mAnnotationDirectionComboBox->insertItem( 0, tr( "Horizontal" ) );
mAnnotationDirectionComboBox->insertItem( 1, tr( "Vertical" ) );
mAnnotationDirectionComboBox->insertItem( 2, tr( "Horizontal and Vertical" ) );

mAnnotationTypeComboBox->insertItem( 0, tr( "Coordinate" ) );
mAnnotationTypeComboBox->insertItem( 1, tr( "Sector" ) );
blockAllSignals( false );

if ( composerMap )
Expand Down Expand Up @@ -340,6 +343,16 @@ void QgsComposerMapWidget::updateGuiElements()
mAnnotationDirectionComboBox->setCurrentIndex( mAnnotationDirectionComboBox->findText( tr( "Horizontal and Vertical" ) ) );
}

QgsComposerMap::GridAnnotationType type = mComposerMap->gridAnnotationType();
if ( type == QgsComposerMap::Sector )
{
mAnnotationTypeComboBox->setCurrentIndex( mAnnotationTypeComboBox->findText( tr( "Sector" ) ) );
}
else
{
mAnnotationTypeComboBox->setCurrentIndex( mAnnotationTypeComboBox->findText( tr( "Coordinate" ) ) );
}


QPen gridPen = mComposerMap->gridPen();
mLineWidthSpinBox->setValue( gridPen.widthF() );
Expand Down Expand Up @@ -397,6 +410,7 @@ void QgsComposerMapWidget::blockAllSignals( bool b )
mAnnotationPositionComboBox->blockSignals( b );
mDistanceToMapFrameSpinBox->blockSignals( b );
mAnnotationDirectionComboBox->blockSignals( b );
mAnnotationTypeComboBox->blockSignals( b );
}

void QgsComposerMapWidget::on_mUpdatePreviewButton_clicked()
Expand Down Expand Up @@ -639,3 +653,21 @@ void QgsComposerMapWidget::on_mAnnotationDirectionComboBox_currentIndexChanged(
mComposerMap->updateBoundingRect();
mComposerMap->update();
}

void QgsComposerMapWidget::on_mAnnotationTypeComboBox_currentIndexChanged( const QString& text )
{
if ( !mComposerMap )
{
return;
}

if ( text == tr( "Sector" ) )
{
mComposerMap->setGridAnnotationType( QgsComposerMap::Sector );
}
else
{
mComposerMap->setGridAnnotationType( QgsComposerMap::Coordinate );
}
mComposerMap->update();
}
1 change: 1 addition & 0 deletions src/app/composer/qgscomposermapwidget.h
View file
Expand Up @@ -61,6 +61,7 @@ class QgsComposerMapWidget: public QWidget, private Ui::QgsComposerMapWidgetBase
void on_mAnnotationPositionComboBox_currentIndexChanged( const QString& text );
void on_mDrawAnnotationCheckBox_stateChanged( int state );
void on_mAnnotationDirectionComboBox_currentIndexChanged( const QString& text );
void on_mAnnotationTypeComboBox_currentIndexChanged( const QString& text );

/**Updates width and height without notify the composer map (to avoid infinite recursion)*/
void updateSettingsNoSignals();
Expand Down
118 changes: 94 additions & 24 deletions src/core/composer/qgscomposermap.cpp
View file
Expand Up @@ -44,7 +44,7 @@ int QgsComposerMap::mCurrentComposerId = 0;
QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int width, int height )
: QgsComposerItem( x, y, width, height, composition ), mKeepLayerSet( false ), mGridEnabled( false ), mGridStyle( Solid ), \
mGridIntervalX( 0.0 ), mGridIntervalY( 0.0 ), mGridOffsetX( 0.0 ), mGridOffsetY( 0.0 ), mShowGridAnnotation( false ), \
mGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ), mGridAnnotationDirection( Horizontal )
mGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ), mGridAnnotationDirection( Horizontal ), mGridAnnotationType( Coordinate )
{
mComposition = composition;
mMapRenderer = mComposition->mapRenderer();
Expand Down Expand Up @@ -74,7 +74,7 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int w
QgsComposerMap::QgsComposerMap( QgsComposition *composition )
: QgsComposerItem( 0, 0, 10, 10, composition ), mKeepLayerSet( false ), mGridEnabled( false ), mGridStyle( Solid ), \
mGridIntervalX( 0.0 ), mGridIntervalY( 0.0 ), mGridOffsetX( 0.0 ), mGridOffsetY( 0.0 ), mShowGridAnnotation( false ), \
mGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ), mGridAnnotationDirection( Horizontal )
mGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ), mGridAnnotationDirection( Horizontal ), mGridAnnotationType( Coordinate )
{
//Offset
mXOffset = 0.0;
Expand Down Expand Up @@ -568,6 +568,7 @@ bool QgsComposerMap::writeXML( QDomElement& elem, QDomDocument & doc ) const
annotationElem.setAttribute( "frameDistance", mAnnotationFrameDistance );
annotationElem.setAttribute( "direction", mGridAnnotationDirection );
annotationElem.setAttribute( "font", mGridAnnotationFont.toString() );
annotationElem.setAttribute( "type", mGridAnnotationType);

gridElem.appendChild( annotationElem );
composerMapElem.appendChild( gridElem );
Expand Down Expand Up @@ -668,6 +669,7 @@ bool QgsComposerMap::readXML( const QDomElement& itemElem, const QDomDocument& d
mAnnotationFrameDistance = annotationElem.attribute( "frameDistance", "0" ).toDouble();
mGridAnnotationDirection = QgsComposerMap::GridAnnotationDirection( annotationElem.attribute( "direction", "0" ).toInt() );
mGridAnnotationFont.fromString( annotationElem.attribute( "font", "" ) );
mGridAnnotationType = QgsComposerMap::GridAnnotationType( annotationElem.attribute( "type", "0" ).toInt() );
}
}

Expand Down Expand Up @@ -785,45 +787,81 @@ void QgsComposerMap::drawGridAnnotations( QPainter* p, const QList< QPair< doubl
double currentFontHeight = fontAscentMillimeters( mGridAnnotationFont );
QPointF currentAnnotationPos1, currentAnnotationPos2;
double rotation = 0;
double xpos1, xpos2, ypos1, ypos2;

//first draw annotations for vertical grid lines
if ( mGridAnnotationDirection != Horizontal )
{
rotation = 270;
}


QList< QPair< double, QLineF > >::const_iterator vIt = vLines.constBegin();
int loopCounter = 0;
for ( ; vIt != vLines.constEnd(); ++vIt )
{
currentAnnotationString = QString::number( vIt->first );
if ( mGridAnnotationType == Sector )
{
int letterNumber = loopCounter % 26 + 66;
currentAnnotationString = QString( QChar( letterNumber ) );
}
else
{
currentAnnotationString = QString::number( vIt->first );
}

currentFontWidth = textWidthMillimeters( mGridAnnotationFont, currentAnnotationString );
if ( mGridAnnotationDirection == Horizontal )
{
xpos1 = vIt->second.x1() - currentFontWidth / 2.0;
xpos2 = vIt->second.x2() - currentFontWidth / 2.0;
if ( mGridAnnotationPosition == OutsideMapFrame )
{
currentAnnotationPos1 = QPointF( vIt->second.x1() - currentFontWidth / 2.0, vIt->second.y1() - mAnnotationFrameDistance );
currentAnnotationPos2 = QPointF( vIt->second.x2() - currentFontWidth / 2.0, vIt->second.y2() + mAnnotationFrameDistance + currentFontHeight );
ypos1 = vIt->second.y1() - mAnnotationFrameDistance;
ypos2 = vIt->second.y2() + mAnnotationFrameDistance + currentFontHeight;
}
else
{
currentAnnotationPos1 = QPointF( vIt->second.x1() - currentFontWidth / 2.0, vIt->second.y1() + mAnnotationFrameDistance + currentFontHeight );
currentAnnotationPos2 = QPointF( vIt->second.x2() - currentFontWidth / 2.0, vIt->second.y2() - mAnnotationFrameDistance );
ypos1 = vIt->second.y1() + mAnnotationFrameDistance + currentFontHeight;
ypos2 = vIt->second.y2() - mAnnotationFrameDistance;
}
}
else //vertical annotation
{
xpos1 = vIt->second.x1() + currentFontHeight / 2.0;
xpos2 = vIt->second.x2() + currentFontHeight / 2.0;
if ( mGridAnnotationPosition == OutsideMapFrame )
{
currentAnnotationPos1 = QPointF( vIt->second.x1() + currentFontHeight / 2.0, vIt->second.y1() - mAnnotationFrameDistance );
currentAnnotationPos2 = QPointF( vIt->second.x2() + currentFontHeight / 2.0, vIt->second.y2() + mAnnotationFrameDistance + currentFontWidth );
ypos1 = vIt->second.y1() - mAnnotationFrameDistance;
ypos2 = vIt->second.y2() + mAnnotationFrameDistance + currentFontWidth;
}
else
{
currentAnnotationPos1 = QPointF( vIt->second.x1() + currentFontHeight / 2.0, vIt->second.y1() + currentFontWidth + mAnnotationFrameDistance );
currentAnnotationPos2 = QPointF( vIt->second.x1() + currentFontHeight / 2.0, vIt->second.y2() - mAnnotationFrameDistance );
ypos1 = vIt->second.y1() + currentFontWidth + mAnnotationFrameDistance;
ypos2 = vIt->second.y2() - mAnnotationFrameDistance;
}
}
drawAnnotation( p, currentAnnotationPos1, rotation, currentAnnotationString );
drawAnnotation( p, currentAnnotationPos2, rotation, currentAnnotationString );

//shift positions in case of sector annotation
if ( mGridAnnotationType == Sector && loopCounter < ( vLines.size() - 1 ) )
{
xpos1 += ( vLines.at( loopCounter + 1 ).second.x1() - vLines.at( loopCounter ).second.x1() ) / 2.0;
xpos2 += ( vLines.at( loopCounter + 1 ).second.x2() - vLines.at( loopCounter ).second.x2() ) / 2.0;
}
else if ( mGridAnnotationType == Sector && loopCounter == ( vLines.size() - 1 ) )
{
xpos1 += ( rect().width() - vLines.at( loopCounter ).second.x1() ) / 2.0;
xpos2 += ( rect().width() - vLines.at( loopCounter ).second.x2() ) / 2.0;
}
drawAnnotation( p, QPointF( xpos1, ypos1 ), rotation, currentAnnotationString );
drawAnnotation( p, QPointF( xpos1, ypos2 ), rotation, currentAnnotationString );

if ( mGridAnnotationType == Sector && loopCounter == 0 )
{
drawAnnotation( p, QPointF( vLines.at( loopCounter ).second.x1() / 2.0, ypos1 ), rotation, "A" );
drawAnnotation( p, QPointF( vLines.at( loopCounter ).second.x2() / 2.0, ypos2 ), rotation, "A" );
}
++loopCounter;
}

//then annotations for horizontal grid lines
Expand All @@ -835,40 +873,72 @@ void QgsComposerMap::drawGridAnnotations( QPainter* p, const QList< QPair< doubl
{
rotation = 270;
}

loopCounter = 0;
QList< QPair< double, QLineF > >::const_iterator hIt = hLines.constBegin();
for ( ; hIt != hLines.constEnd(); ++hIt )
{
currentAnnotationString = QString::number( hIt->first );
if ( mGridAnnotationType == Sector )
{
currentAnnotationString = QString::number( hLines.size() - loopCounter - 1 );
}
else
{
currentAnnotationString = QString::number( hIt->first );
}

currentFontWidth = textWidthMillimeters( mGridAnnotationFont, currentAnnotationString );
if ( mGridAnnotationDirection == Vertical )
{
ypos1 = hIt->second.y1() + currentFontWidth / 2.0;
ypos2 = hIt->second.y2() + currentFontWidth / 2.0;
if ( mGridAnnotationPosition == OutsideMapFrame )
{
currentAnnotationPos1 = QPointF( hIt->second.x1() - mAnnotationFrameDistance, hIt->second.y1() + currentFontWidth / 2.0 );
currentAnnotationPos2 = QPointF( hIt->second.x2() + mAnnotationFrameDistance + currentFontHeight, hIt->second.y2() + currentFontWidth / 2.0 );
xpos1 = hIt->second.x1() - mAnnotationFrameDistance;
xpos2 = hIt->second.x2() + mAnnotationFrameDistance + currentFontHeight;
}
else
{
currentAnnotationPos1 = QPointF( hIt->second.x1() + mAnnotationFrameDistance + currentFontHeight, hIt->second.y1() + currentFontWidth / 2.0 );
currentAnnotationPos2 = QPointF( hIt->second.x2() - mAnnotationFrameDistance, hIt->second.y1() + currentFontWidth / 2.0 );
xpos1 = hIt->second.x1() + mAnnotationFrameDistance + currentFontHeight;
xpos2 = hIt->second.x2() - mAnnotationFrameDistance;
}
}
else
{
ypos1 = hIt->second.y1() + currentFontHeight / 2.0;
ypos2 = hIt->second.y2() + currentFontHeight / 2.0;
if ( mGridAnnotationPosition == OutsideMapFrame )
{
currentAnnotationPos1 = QPointF( hIt->second.x1() - ( mAnnotationFrameDistance + currentFontWidth ), hIt->second.y1() + currentFontHeight / 2.0 );
currentAnnotationPos2 = QPointF( hIt->second.x2() + mAnnotationFrameDistance, hIt->second.y2() + currentFontHeight / 2.0 );
xpos1 = hIt->second.x1() - ( mAnnotationFrameDistance + currentFontWidth );
xpos2 = hIt->second.x2() + mAnnotationFrameDistance;
}
else
{
currentAnnotationPos1 = QPointF( hIt->second.x1() + mAnnotationFrameDistance, hIt->second.y1() + currentFontHeight / 2.0 );
currentAnnotationPos2 = QPointF( hIt->second.x2() - ( mAnnotationFrameDistance + currentFontWidth ), hIt->second.y2() + currentFontHeight / 2.0 );
xpos1 = hIt->second.x1() + mAnnotationFrameDistance;
xpos2 = hIt->second.x2() - ( mAnnotationFrameDistance + currentFontWidth );
}
}

drawAnnotation( p, currentAnnotationPos1, rotation, currentAnnotationString );
drawAnnotation( p, currentAnnotationPos2, rotation, currentAnnotationString );
//shift y-Positions in case of sectoral annotations
if ( mGridAnnotationType == Sector && loopCounter < ( hLines.size() - 1 ) )
{
ypos1 += ( hLines.at( loopCounter + 1 ).second.y1() - hLines.at( loopCounter ).second.y1() ) / 2.0;
ypos2 += ( hLines.at( loopCounter + 1 ).second.y2() - hLines.at( loopCounter ).second.y2() ) / 2.0;
}
else if ( mGridAnnotationType == Sector && loopCounter == ( hLines.size() - 1 ) )
{
ypos1 -= hLines.at( loopCounter ).second.y1() / 2.0;
ypos2 -= hLines.at( loopCounter ).second.y2() / 2.0;
}

drawAnnotation( p, QPointF( xpos1, ypos1 ), rotation, currentAnnotationString );
drawAnnotation( p, QPointF( xpos2, ypos2 ), rotation, currentAnnotationString );
if ( mGridAnnotationType == Sector && loopCounter == 0 )
{
drawAnnotation( p, QPointF( xpos1, ( rect().height() + hLines.at( loopCounter ).second.y1() ) / 2.0 ), rotation, QString::number( hLines.size() ) );
drawAnnotation( p, QPointF( xpos2, ( rect().height() + hLines.at( loopCounter ).second.y2() ) / 2.0 ), rotation, QString::number( hLines.size() ) );
}
++loopCounter;
}
}

Expand Down
11 changes: 11 additions & 0 deletions src/core/composer/qgscomposermap.h
View file
Expand Up @@ -73,6 +73,12 @@ class CORE_EXPORT QgsComposerMap : /*public QWidget, private Ui::QgsComposerMapB
HorizontalAndVertical
};

enum GridAnnotationType
{
Coordinate = 0, //annotation at line, displays coordinates
Sector //annotation at sector: 1, 2, 3 for horizontal lines and A, B, C for vertical ones
};

/** \brief Draw to paint device
@param extent map extent
@param size size in scene coordinates
Expand Down Expand Up @@ -198,6 +204,9 @@ class CORE_EXPORT QgsComposerMap : /*public QWidget, private Ui::QgsComposerMapB
void setGridAnnotationDirection( GridAnnotationDirection d ) {mGridAnnotationDirection = d;}
GridAnnotationDirection gridAnnotationDirection() const {return mGridAnnotationDirection;}

void setGridAnnotationType( GridAnnotationType t ) {mGridAnnotationType = t;}
GridAnnotationType gridAnnotationType() const {return mGridAnnotationType; }

/**In case of annotations, the bounding rectangle can be larger than the map item rectangle*/
QRectF boundingRect() const;
/**Updates the bounding rect of this item. Call this function before doing any changes related to annotation out of the map rectangle*/
Expand Down Expand Up @@ -287,6 +296,8 @@ class CORE_EXPORT QgsComposerMap : /*public QWidget, private Ui::QgsComposerMapB
double mAnnotationFrameDistance;
/**Annotation can be horizontal / vertical or different for axes*/
GridAnnotationDirection mGridAnnotationDirection;
/**Coordinate values (default) or sector (1A, 1B, ...)*/
GridAnnotationType mGridAnnotationType;
/**Current bounding rectangle. This is used to check if notification to the graphics scene is necessary*/
QRectF mCurrentRectangle;

Expand Down

0 comments on commit a0d9617

Please sign in to comment.