Skip to content
Permalink
Browse files

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
  • Loading branch information
homann
homann committed Jan 7, 2007
1 parent 180fc98 commit 70f28ad965d32a6606a42fb92940837c63f9ba71
Showing with 8 additions and 5 deletions.
  1. +6 −3 src/plugins/georeferencer/qgspointdialog.cpp
  2. +2 −2 src/raster/qgsrasterlayer.cpp
@@ -280,7 +280,9 @@ void QgsPointDialog::on_cmbTransformType_currentIndexChanged(const QString& valu
QFileInfo file(mLayer->source());
int pos = filename.size()-file.suffix().size()-1;
filename.insert(pos, tr("-modified", "Georeferencer:QgsPointDialog.cpp - used to modify a user given filename"));

pos = filename.size()-file.suffix().size();
filename.replace(pos, filename.size(), "tif");

leSelectModifiedRaster->setText(filename);
leSelectWorldFile->setText(guessWorldFileName(filename));
}
@@ -323,8 +325,9 @@ bool QgsPointDialog::generateWorldFile()
"the raster layer.</p><p>The modifed raster will be "
"saved in a new file and a world file will be "
"generated for this new file instead.</p><p>Are you "
"sure that this is what you want?</p>"),
QMessageBox::No, QMessageBox::Yes);
"sure that this is what you want?</p>") +
"<p><i>" + tr("Currently all modified files will be written in TIFF format.") +
"</i><p>", QMessageBox::No, QMessageBox::Yes);
if (res == QMessageBox::No)
return false;

@@ -2380,8 +2380,8 @@ void QgsRasterLayer::drawMultiBandColor(QPainter * theQPainter, QgsRasterViewPor
if ( myRedValueDouble == noDataValueDouble || myRedValueDouble != myRedValueDouble)
{
#ifdef QGISDEBUG
QgsLogger::debug("myRedValueDouble", myRedValueDouble, __FILE__, __FUNCTION__, __LINE__, 1);
QgsLogger::debug("noDataValueDouble", noDataValueDouble, __FILE__, __FUNCTION__, __LINE__, 1);
// QgsLogger::debug("myRedValueDouble", myRedValueDouble, __FILE__, __FUNCTION__, __LINE__, 1);
// QgsLogger::debug("noDataValueDouble", noDataValueDouble, __FILE__, __FUNCTION__, __LINE__, 1);
#endif
continue;
}

0 comments on commit 70f28ad

Please sign in to comment.
You can’t perform that action at this time.