Skip to content

Commit 5d093f4

Browse files
committed
Intendention update
1 parent 2a6887b commit 5d093f4

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/app/composer/qgscomposer.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -1158,15 +1158,15 @@ void QgsComposer::on_mActionExportAsImage_triggered()
11581158
// Write the world file if asked to
11591159
if ( mComposition->generateWorldFile() )
11601160
{
1161-
double a, b, c, d, e, f;
1162-
mComposition->computeWorldFileParameters( a, b, c, d, e, f );
1163-
1164-
QFileInfo fi( filename );
1165-
// build the world file name
1166-
QString worldFileName = fi.absolutePath() + "/" + fi.baseName() + "."
1167-
+ fi.suffix()[0] + fi.suffix()[fi.suffix().size()-1] + "w";
1168-
1169-
writeWorldFile( worldFileName, a, b, c, d, e, f );
1161+
double a, b, c, d, e, f;
1162+
mComposition->computeWorldFileParameters( a, b, c, d, e, f );
1163+
1164+
QFileInfo fi( filename );
1165+
// build the world file name
1166+
QString worldFileName = fi.absolutePath() + "/" + fi.baseName() + "."
1167+
+ fi.suffix()[0] + fi.suffix()[fi.suffix().size()-1] + "w";
1168+
1169+
writeWorldFile( worldFileName, a, b, c, d, e, f );
11701170
}
11711171
}
11721172
atlasMap->endRender();
@@ -2365,10 +2365,10 @@ void QgsComposer::writeWorldFile( QString worldFileName, double a, double b, dou
23652365

23662366
// QString::number does not use locale settings (for the decimal point)
23672367
// which is what we want here
2368-
fout << QString::number(a, 'f') << "\r\n";
2369-
fout << QString::number(d, 'f') << "\r\n";
2370-
fout << QString::number(b, 'f') << "\r\n";
2371-
fout << QString::number(e, 'f') << "\r\n";
2372-
fout << QString::number(c, 'f') << "\r\n";
2373-
fout << QString::number(f, 'f') << "\r\n";
2368+
fout << QString::number( a, 'f' ) << "\r\n";
2369+
fout << QString::number( d, 'f' ) << "\r\n";
2370+
fout << QString::number( b, 'f' ) << "\r\n";
2371+
fout << QString::number( e, 'f' ) << "\r\n";
2372+
fout << QString::number( c, 'f' ) << "\r\n";
2373+
fout << QString::number( f, 'f' ) << "\r\n";
23742374
}

0 commit comments

Comments
 (0)