[QGIS Commit] r12696 - in trunk/qgis/src: app core plugins/grass
plugins/scale_bar ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Jan 7 13:34:05 EST 2010
Author: jef
Date: 2010-01-07 13:34:04 -0500 (Thu, 07 Jan 2010)
New Revision: 12696
Modified:
trunk/qgis/src/app/qgisapp.h
trunk/qgis/src/app/qgsmaptooladdfeature.cpp
trunk/qgis/src/app/qgsmaptoolcapture.h
trunk/qgis/src/core/qgscoordinatetransform.cpp
trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
trunk/qgis/src/plugins/scale_bar/pluginguibase.ui
trunk/qgis/src/ui/qgsoptionsbase.ui
Log:
more fixes
Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h 2010-01-07 18:30:33 UTC (rev 12695)
+++ trunk/qgis/src/app/qgisapp.h 2010-01-07 18:34:04 UTC (rev 12696)
@@ -595,6 +595,8 @@
void measure();
//! Measure area
void measureArea();
+ //! Measure angle
+ void measureAngle();
//! show the attribute table for the currently selected layer
void attributeTable();
@@ -712,8 +714,8 @@
//! check to see if file is dirty and if so, prompt the user th save it
bool saveDirty();
/** Helper function to union several geometries together (used in function mergeSelectedFeatures)
- @return 0 in case of error*/
- QgsGeometry* unionGeometries( const QgsVectorLayer* vl, QgsFeatureList& featureList );
+ @return 0 in case of error or if canceled */
+ QgsGeometry* unionGeometries( const QgsVectorLayer* vl, QgsFeatureList& featureList, bool &canceled );
/**Deletes all the composer objects and clears mPrintComposers*/
void deletePrintComposers();
@@ -802,6 +804,7 @@
QAction *mActionDeselectAll;
QAction *mActionIdentify;
QAction *mActionMeasure;
+ QAction *mActionMeasureAngle;
QAction *mActionMeasureArea;
QAction *mActionViewSeparator1;
QAction *mActionZoomFullExtent;
@@ -906,6 +909,7 @@
QgsMapTool* mIdentify;
QgsMapTool* mMeasureDist;
QgsMapTool* mMeasureArea;
+ QgsMapTool* mMeasureAngle;
QgsMapTool* mCapturePoint;
QgsMapTool* mCaptureLine;
QgsMapTool* mCapturePolygon;
Modified: trunk/qgis/src/app/qgsmaptooladdfeature.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptooladdfeature.cpp 2010-01-07 18:30:33 UTC (rev 12695)
+++ trunk/qgis/src/app/qgsmaptooladdfeature.cpp 2010-01-07 18:34:04 UTC (rev 12696)
@@ -31,7 +31,7 @@
#include <QMouseEvent>
#include <QSettings>
-QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas, enum CaptureTool tool ): QgsMapToolCapture( canvas, tool )
+QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas, CaptureTool tool ): QgsMapToolCapture( canvas, tool )
{
}
Modified: trunk/qgis/src/app/qgsmaptoolcapture.h
===================================================================
--- trunk/qgis/src/app/qgsmaptoolcapture.h 2010-01-07 18:30:33 UTC (rev 12695)
+++ trunk/qgis/src/app/qgsmaptoolcapture.h 2010-01-07 18:34:04 UTC (rev 12696)
@@ -39,7 +39,7 @@
};
//! constructor
- QgsMapToolCapture( QgsMapCanvas* canvas, enum CaptureTool tool );
+ QgsMapToolCapture( QgsMapCanvas* canvas, CaptureTool tool );
//! destructor
virtual ~QgsMapToolCapture();
Modified: trunk/qgis/src/core/qgscoordinatetransform.cpp
===================================================================
--- trunk/qgis/src/core/qgscoordinatetransform.cpp 2010-01-07 18:30:33 UTC (rev 12695)
+++ trunk/qgis/src/core/qgscoordinatetransform.cpp 2010-01-07 18:34:04 UTC (rev 12696)
@@ -193,13 +193,13 @@
// If the source and destination projection are the same, set the short
// circuit flag (no transform takes place)
mShortCircuit = true;
- QgsDebugMsg( "Source/Dest CRS equal, shortcircuit is set." );
+ QgsDebugMsgLevel( "Source/Dest CRS equal, shortcircuit is set.", 3 );
}
else
{
// Transform must take place
mShortCircuit = false;
- QgsDebugMsg( "Source/Dest CRS UNequal, shortcircuit is NOt set." );
+ QgsDebugMsgLevel( "Source/Dest CRS UNequal, shortcircuit is NOt set.", 3 );
}
}
@@ -472,18 +472,18 @@
{
if ( direction == ForwardTransform )
{
- points += QString("(%1, %2)\n").arg( x[i] ).arg( y[i] );
+ points += QString( "(%1, %2)\n" ).arg( x[i] ).arg( y[i] );
}
else
{
- points += QString("(%1, %2)\n").arg( x[i]*RAD_TO_DEG ).arg( y[i]*RAD_TO_DEG );
+ points += QString( "(%1, %2)\n" ).arg( x[i] * RAD_TO_DEG ).arg( y[i] * RAD_TO_DEG );
}
}
- QString msg = tr("%1 of\n%2\nfailed with error: %3\n")
- .arg( dir )
- .arg( points )
- .arg( QString::fromUtf8( pj_strerrno( projResult ) ) );
+ QString msg = tr( "%1 of\n%2\nfailed with error: %3\n" )
+ .arg( dir )
+ .arg( points )
+ .arg( QString::fromUtf8( pj_strerrno( projResult ) ) );
QgsDebugMsg( "Projection failed emitting invalid transform signal: " + msg );
Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp 2010-01-07 18:30:33 UTC (rev 12695)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp 2010-01-07 18:34:04 UTC (rev 12696)
@@ -294,8 +294,8 @@
QgisInterface *iface,
QString xname, QDomElement qDocElem,
QWidget * parent, Qt::WFlags f )
- : QgsGrassModuleOptions( tools, module, iface ),
- QWidget( parent, f )
+ : QWidget( parent, f ),
+ QgsGrassModuleOptions( tools, module, iface )
{
QgsDebugMsg( "called." );
QgsDebugMsg( QString( "PATH = %1" ).arg( getenv( "PATH" ) ) );
Modified: trunk/qgis/src/plugins/scale_bar/pluginguibase.ui
===================================================================
--- trunk/qgis/src/plugins/scale_bar/pluginguibase.ui 2010-01-07 18:30:33 UTC (rev 12695)
+++ trunk/qgis/src/plugins/scale_bar/pluginguibase.ui 2010-01-07 18:34:04 UTC (rev 12696)
@@ -123,7 +123,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Colour of bar</string>
+ <string>Color of bar</string>
</property>
<property name="buddy">
<cstring>pbnChangeColor</cstring>
@@ -139,10 +139,10 @@
</sizepolicy>
</property>
<property name="toolTip">
- <string>Click to select the colour</string>
+ <string>Click to select the color</string>
</property>
<property name="whatsThis">
- <string>Click to select the colour</string>
+ <string>Click to select the color</string>
</property>
<property name="text">
<string/>
Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui 2010-01-07 18:30:33 UTC (rev 12695)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui 2010-01-07 18:34:04 UTC (rev 12696)
@@ -699,7 +699,7 @@
<item row="1" column="0">
<widget class="QLabel" name="mLineColorTextLabel">
<property name="text">
- <string>Line colour</string>
+ <string>Line color</string>
</property>
</widget>
</item>
More information about the QGIS-commit
mailing list