Skip to content

Commit 70f28ad

Browse files
author
homann
committed
Ported r6405:6406 from refactor branch
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6409 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 180fc98 commit 70f28ad

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/plugins/georeferencer/qgspointdialog.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,9 @@ void QgsPointDialog::on_cmbTransformType_currentIndexChanged(const QString& valu
280280
QFileInfo file(mLayer->source());
281281
int pos = filename.size()-file.suffix().size()-1;
282282
filename.insert(pos, tr("-modified", "Georeferencer:QgsPointDialog.cpp - used to modify a user given filename"));
283-
283+
pos = filename.size()-file.suffix().size();
284+
filename.replace(pos, filename.size(), "tif");
285+
284286
leSelectModifiedRaster->setText(filename);
285287
leSelectWorldFile->setText(guessWorldFileName(filename));
286288
}
@@ -323,8 +325,9 @@ bool QgsPointDialog::generateWorldFile()
323325
"the raster layer.</p><p>The modifed raster will be "
324326
"saved in a new file and a world file will be "
325327
"generated for this new file instead.</p><p>Are you "
326-
"sure that this is what you want?</p>"),
327-
QMessageBox::No, QMessageBox::Yes);
328+
"sure that this is what you want?</p>") +
329+
"<p><i>" + tr("Currently all modified files will be written in TIFF format.") +
330+
"</i><p>", QMessageBox::No, QMessageBox::Yes);
328331
if (res == QMessageBox::No)
329332
return false;
330333

src/raster/qgsrasterlayer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2380,8 +2380,8 @@ void QgsRasterLayer::drawMultiBandColor(QPainter * theQPainter, QgsRasterViewPor
23802380
if ( myRedValueDouble == noDataValueDouble || myRedValueDouble != myRedValueDouble)
23812381
{
23822382
#ifdef QGISDEBUG
2383-
QgsLogger::debug("myRedValueDouble", myRedValueDouble, __FILE__, __FUNCTION__, __LINE__, 1);
2384-
QgsLogger::debug("noDataValueDouble", noDataValueDouble, __FILE__, __FUNCTION__, __LINE__, 1);
2383+
// QgsLogger::debug("myRedValueDouble", myRedValueDouble, __FILE__, __FUNCTION__, __LINE__, 1);
2384+
// QgsLogger::debug("noDataValueDouble", noDataValueDouble, __FILE__, __FUNCTION__, __LINE__, 1);
23852385
#endif
23862386
continue;
23872387
}

0 commit comments

Comments
 (0)