sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-26 00:08:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix $CURRENT_DATE replacement in QgsComposerLabel

Browse Source
This commit is contained in:
Hugo Mercier 2012-09-26 16:32:33 +02:00
parent e70b1524f9
commit cc452d1ffc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/composer/qgscomposerlabel.cpp
View File

@ -84,14 +84,18 @@ QString QgsComposerLabel::displayText() const
void QgsComposerLabel::replaceDateText( QString& text ) const void QgsComposerLabel::replaceDateText( QString& text ) const
{ {
int currentDatePos = text.indexOf( "$CURRENT_DATE" ); QString constant = "$CURRENT_DATE";
int currentDatePos = text.indexOf( constant );
if ( currentDatePos != -1 ) if ( currentDatePos != -1 )
{ {
//check if there is a bracket just after $CURRENT_DATE //check if there is a bracket just after $CURRENT_DATE
QString formatText; QString formatText;
int openingBracketPos = text.indexOf( "(", currentDatePos ); int openingBracketPos = text.indexOf( "(", currentDatePos );
int closingBracketPos = text.indexOf( ")", openingBracketPos + 1 ); int closingBracketPos = text.indexOf( ")", openingBracketPos + 1 );
if ( openingBracketPos != -1 && closingBracketPos != -1 && ( closingBracketPos - openingBracketPos ) > 1 ) if ( openingBracketPos != -1 &&
closingBracketPos != -1 &&
( closingBracketPos - openingBracketPos ) > 1 &&
openingBracketPos == currentDatePos + constant.size() )
{ {
formatText = text.mid( openingBracketPos + 1, closingBracketPos - openingBracketPos - 1 ); formatText = text.mid( openingBracketPos + 1, closingBracketPos - openingBracketPos - 1 );
text.replace( currentDatePos, closingBracketPos - currentDatePos + 1, QDate::currentDate().toString( formatText ) ); text.replace( currentDatePos, closingBracketPos - currentDatePos + 1, QDate::currentDate().toString( formatText ) );