[QGIS Commit] r11181 - trunk/qgis/src/plugins/georeferencer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Jul 27 09:24:44 EDT 2009
Author: homann
Date: 2009-07-27 09:24:43 -0400 (Mon, 27 Jul 2009)
New Revision: 11181
Modified:
trunk/qgis/src/plugins/georeferencer/CMakeLists.txt
trunk/qgis/src/plugins/georeferencer/qgsgeorefdescriptiondialog.cpp
trunk/qgis/src/plugins/georeferencer/qgsgeorefdescriptiondialogbase.ui
trunk/qgis/src/plugins/georeferencer/qgsleastsquares.cpp
trunk/qgis/src/plugins/georeferencer/qgspointdialog.h
trunk/qgis/src/plugins/georeferencer/qgspointdialogbase.ui
Log:
Text string made easier to translate in georeferencer.
Modified: trunk/qgis/src/plugins/georeferencer/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/georeferencer/CMakeLists.txt 2009-07-26 15:57:31 UTC (rev 11180)
+++ trunk/qgis/src/plugins/georeferencer/CMakeLists.txt 2009-07-27 13:24:43 UTC (rev 11181)
@@ -2,7 +2,7 @@
# Files
SET (GEOREF_SRCS
- plugin.cpp
+ qgsgeorefplugin.cpp
qgsgeorefdatapoint.cpp
qgsimagewarper.cpp
qgsleastsquares.cpp
@@ -20,7 +20,7 @@
)
SET (GEOREF_MOC_HDRS
- plugin.h
+ qgsgeorefplugin.h
qgspointdialog.h
mapcoordsdialog.h
qgsgeorefwarpoptionsdialog.h
Modified: trunk/qgis/src/plugins/georeferencer/qgsgeorefdescriptiondialog.cpp
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgsgeorefdescriptiondialog.cpp 2009-07-26 15:57:31 UTC (rev 11180)
+++ trunk/qgis/src/plugins/georeferencer/qgsgeorefdescriptiondialog.cpp 2009-07-27 13:24:43 UTC (rev 11181)
@@ -20,4 +20,13 @@
QgsGeorefDescriptionDialog::QgsGeorefDescriptionDialog( QWidget* parent ): QDialog( parent )
{
setupUi( this );
+
+ textEdit->setText("<h2>Description</h2>"
+ "<p>This plugin can generate world files "
+ "for rasters. You select points on the "
+ "raster and give their world "
+ "coordinates, and the plugin will "
+ "compute the world file parameters. "
+ "The more coordinates you can "
+ "provide the better the result will be.</p>");
}
Modified: trunk/qgis/src/plugins/georeferencer/qgsgeorefdescriptiondialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgsgeorefdescriptiondialogbase.ui 2009-07-26 15:57:31 UTC (rev 11180)
+++ trunk/qgis/src/plugins/georeferencer/qgsgeorefdescriptiondialogbase.ui 2009-07-27 13:24:43 UTC (rev 11181)
@@ -13,7 +13,6 @@
<string>Description georeferencer</string>
</property>
<property name="windowIcon" >
- <iconset resource="georeferencer.qrc" >:/georeferencer.png</iconset>
</property>
<property name="modal" >
<bool>true</bool>
@@ -40,13 +39,6 @@
<property name="readOnly" >
<bool>true</bool>
</property>
- <property name="html" >
- <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:12pt; font-weight:400; font-style:normal; text-decoration:none;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600;">Description</span></p>
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">This plugin can generate world files for rasters. You select points on the raster and give their world coordinates, and the plugin will compute the world file parameters. The more coordinates you can provide the better the result will be.</p></body></html></string>
- </property>
</widget>
</item>
<item row="0" column="0" >
Modified: trunk/qgis/src/plugins/georeferencer/qgsleastsquares.cpp
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgsleastsquares.cpp 2009-07-26 15:57:31 UTC (rev 11180)
+++ trunk/qgis/src/plugins/georeferencer/qgsleastsquares.cpp 2009-07-27 13:24:43 UTC (rev 11181)
@@ -30,8 +30,7 @@
int n = mapCoords.size();
if ( n < 2 )
{
- throw std::domain_error( QObject::tr( "Fit to a linear transform requires at "
- "least 2 points." ).toLocal8Bit().constData() );
+ throw std::domain_error( QObject::tr( "Fit to a linear transform requires at least 2 points." ).toLocal8Bit().constData() );
}
double sumPx( 0 ), sumPy( 0 ), sumPx2( 0 ), sumPy2( 0 ), sumPxMx( 0 ), sumPyMy( 0 ),
@@ -72,8 +71,7 @@
int n = mapCoords.size();
if ( n < 2 )
{
- throw std::domain_error( QObject::tr( "Fit to a Helmert transform requires at "
- "least 2 points." ).toLocal8Bit().constData() );
+ throw std::domain_error( QObject::tr( "Fit to a Helmert transform requires at least 2 points." ).toLocal8Bit().constData() );
}
double A = 0, B = 0, C = 0, D = 0, E = 0, F = 0, G = 0, H = 0, I = 0, J = 0;
@@ -128,8 +126,7 @@
int n = mapCoords.size();
if ( n < 4 )
{
- throw std::domain_error( QObject::tr( "Fit to an affine transform requires at "
- "least 4 points." ).toLocal8Bit().constData() );
+ throw std::domain_error( QObject::tr( "Fit to an affine transform requires at least 4 points." ).toLocal8Bit().constData() );
}
double A = 0, B = 0, C = 0, D = 0, E = 0, F = 0,
Modified: trunk/qgis/src/plugins/georeferencer/qgspointdialog.h
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgspointdialog.h 2009-07-26 15:57:31 UTC (rev 11180)
+++ trunk/qgis/src/plugins/georeferencer/qgspointdialog.h 2009-07-27 13:24:43 UTC (rev 11181)
@@ -76,6 +76,7 @@
QString guessWorldFileName( const QString& raster );
void enableModifiedRasterControls( bool state );
+ void enableControls(bool state);
QIcon getThemeIcon( const QString theName );
QActionGroup* mMapToolGroup;
Modified: trunk/qgis/src/plugins/georeferencer/qgspointdialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgspointdialogbase.ui 2009-07-26 15:57:31 UTC (rev 11180)
+++ trunk/qgis/src/plugins/georeferencer/qgspointdialogbase.ui 2009-07-27 13:24:43 UTC (rev 11181)
@@ -312,7 +312,7 @@
</widget>
</item>
<item row="3" column="0" >
- <widget class="QLabel" name="textLabel1" >
+ <widget class="QLabel" name="lblSelectWorldFile" >
<property name="text" >
<string>World file:</string>
</property>
More information about the QGIS-commit
mailing list