merge from trunk r11300:11350

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11886 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: wonder

ms-windows/osgeo4w/package.cmd

@@ -17,6 +17,8 @@ set BISON=%PROGRAMFILES%\GnuWin32\bin\bison.exe
 
 set VERSION=%1
 set PACKAGE=%2
+if %VERSION%=="" goto error
+if %PACKAGE%=="" goto error
 
 PROMPT qgis%VERSION%$g 
 
@@ -76,7 +78,8 @@ cmake -G "Visual Studio 9 2008" ^
 	-D BISON_EXECUTABLE=%BISON% ^
 	-D GDAL_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\gdal-16\include -D GDAL_LIBRARY=%OSGEO4W_ROOT%\apps\gdal-16\lib\gdal_i.lib ^
 	-D PYTHON_EXECUTABLE=%OSGEO4W_ROOT%\bin\python.exe ^
-	-D PYTHON_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Python25\include -D PYTHON_LIBRARY=%OSGEO4W_ROOT%\apps\Python25\libs\python25.lib ^
+	-D PYTHON_INCLUDE_PATH=%OSGEO4W_ROOT%\apps\Python25\include ^
+	-D PYTHON_LIBRARY=%OSGEO4W_ROOT%\apps\Python25\libs\python25.lib ^
 	-D SIP_BINARY_PATH=%OSGEO4W_ROOT%\apps\Python25\sip.exe ^
 	-D GRASS_PREFIX=%OSGEO4W_ROOT%\apps\grass\grass-%GRASS_VERSION% ^
 	-D QT_BINARY_DIR=%OSGEO4W_ROOT%\bin -D QT_LIBRARY_DIR=%OSGEO4W_ROOT%\lib ^
@@ -87,6 +90,9 @@ cmake -G "Visual Studio 9 2008" ^
 	../../..>>%LOG% 2>&1
 if errorlevel 1 goto error
 
+egrep -vq "^(Python not being built|Could not find GRASS)" %LOG%
+if errorlevel 1 goto error
+
 :skipcmake
 
 echo ZERO_CHECK: %DATE% %TIME%>>%LOG% 2>&1

python/core/qgscomposerlabel.sip

@@ -18,6 +18,11 @@ class QgsComposerLabel: QgsComposerItem
 
     QString text();
     void setText( const QString& text );
+
+     /**Returns the text as it appears on screen (with replaced data field)
+      @note this function was added in version 1.2*/
+    QString displayText() const;
+
     QFont font() const;
     void setFont( const QFont& f );
     double margin();

python/plugins/fTools/tools/doGeoprocessing.py

@@ -130,6 +130,7 @@ void QgsLegend::removeAll()
   updateMapCanvasLayerSet();
   setIconSize( mMinimumIconSize );
   mItemBeingMoved = 0;
+  mDropTarget = 0;
 }
 
 void QgsLegend::selectAll( bool select )

src/app/legend/qgslegend.cpp

@@ -4671,7 +4671,6 @@ void QgisApp::isInOverview()
 
 void QgisApp::removeLayer()
 {
-  QgsLegendLayerFile* currentLayerFile = mMapLegend->currentLayerFile();
   mMapLegend->legendLayerRemove();
   // notify the project we've made a change
   QgsProject::instance()->dirty( true );
@@ -5450,7 +5449,9 @@ void QgisApp::projectProperties()
   QApplication::restoreOverrideCursor();
 
   //pass any refresg signals off to canvases
-  //connect (pp,SIGNAL(refresh()), mMapCanvas, SLOT(refresh()));
+  // Line below was commented out by wonder three years ago (r4949).
+  // It is needed to refresh scale bar after changing display units.
+  connect( pp, SIGNAL( refresh() ), mMapCanvas, SLOT( refresh() ) );
 
   QgsMapRenderer* myRender = mMapCanvas->mapRenderer();
   bool wasProjected = myRender->hasCrsTransformEnabled();

src/app/qgisapp.cpp

@@ -18,6 +18,7 @@
 #include "qgsmeasuredialog.h"
 #include "qgsmeasuretool.h"
 
+#include "qgslogger.h"
 #include "qgscontexthelp.h"
 #include "qgsdistancearea.h"
 #include "qgsmapcanvas.h"
@@ -96,9 +97,12 @@ void QgsMeasureDialog::mouseMove( QgsPoint &point )
     QgsPoint p1( mTool->points().last() ), p2( point );
 
     double d = mTool->canvas()->mapRenderer()->distanceArea()->measureLine( p1, p2 );
+    editTotal->setText( formatDistance( mTotal + d ) );
+    QGis::UnitType myDisplayUnits;
+    // Ignore units
+    convertMeasurement( d, myDisplayUnits, false );
     QTreeWidgetItem *item = mTable->topLevelItem( mTable->topLevelItemCount() - 1 );
     item->setText( 0, QLocale::system().toString( d, 'f', 2 ) );
-    editTotal->setText( formatDistance( mTotal + d ) );
   }
 }
 
@@ -121,6 +125,10 @@ void QgsMeasureDialog::addPoint( QgsPoint &point )
     mTotal += d;
     editTotal->setText( formatDistance( mTotal ) );
 
+    QGis::UnitType myDisplayUnits;
+    // Ignore units
+    convertMeasurement( d, myDisplayUnits, false );
+
     QTreeWidgetItem *item = mTable->topLevelItem( mTable->topLevelItemCount() - 1 );
     item->setText( 0, QLocale::system().toString( d, 'f', 2 ) );
 
@@ -173,24 +181,26 @@ void QgsMeasureDialog::on_btnHelp_clicked()
 
 QString QgsMeasureDialog::formatDistance( double distance )
 {
-  QString txt;
-  QString unitLabel;
-
-  QGis::UnitType myMapUnits = mTool->canvas()->mapUnits();
-  return QgsDistanceArea::textUnit( distance, 2, myMapUnits, false );
+  QGis::UnitType myDisplayUnits;
+  convertMeasurement( distance, myDisplayUnits, false );
+  return QgsDistanceArea::textUnit( distance, 2, myDisplayUnits, false );
 }
 
 QString QgsMeasureDialog::formatArea( double area )
 {
-  QGis::UnitType myMapUnits = mTool->canvas()->mapUnits();
-  return QgsDistanceArea::textUnit( area, 2, myMapUnits, true );
+  QGis::UnitType myDisplayUnits;
+  convertMeasurement( area, myDisplayUnits, true );
+  return QgsDistanceArea::textUnit( area, 2, myDisplayUnits, true );
 }
 
 void QgsMeasureDialog::updateUi()
 {
+  double dummy = 1.0;
+  QGis::UnitType myDisplayUnits;
+  // The dummy distance is ignored 
+  convertMeasurement( dummy, myDisplayUnits, false );
 
-  QGis::UnitType myMapUnits = mTool->canvas()->mapUnits();
-  switch ( myMapUnits )
+  switch ( myDisplayUnits )
   {
     case QGis::Meters:
       mTable->setHeaderLabels( QStringList( tr( "Segments (in meters)" ) ) );
@@ -218,3 +228,48 @@ void QgsMeasureDialog::updateUi()
 
 }
 
+void QgsMeasureDialog::convertMeasurement(double &measure, QGis::UnitType &u, bool isArea)
+{
+  // Helper for converting between meters and feet
+  // The parameter &u is out only...
+  
+  QGis::UnitType myUnits = mTool->canvas()->mapUnits();
+  if ( myUnits == QGis::Degrees &&
+       mTool->canvas()->mapRenderer()->distanceArea()->ellipsoid() != "NONE" &&
+       mTool->canvas()->mapRenderer()->distanceArea()->hasCrsTransformEnabled() )
+  {
+    // Measuring on an ellipsoid returns meters
+    myUnits = QGis::Meters;
+    QgsDebugMsg( "We're measuring on an ellipsoid, returning meters" );
+  }
+
+  // Get the units for display
+  QSettings settings;
+  QString myDisplayUnitsTxt = settings.value( "/qgis/measure/displayunits", "meters").toString();
+
+  // Only convert between meters and feet
+  if ( myUnits == QGis::Meters && myDisplayUnitsTxt == "feet" )
+  {
+    QgsDebugMsg( QString( "Converting %1 meters" ).arg( QString::number( measure ) ) );
+    measure /= 0.3048;
+    if ( isArea )
+    {
+      measure /= 0.3048;
+    }
+    QgsDebugMsg( QString( "to %1 feet" ).arg( QString::number( measure ) ) );
+    myUnits = QGis::Feet;
+  }
+  if ( myUnits == QGis::Feet && myDisplayUnitsTxt == "meters" )
+  {
+    QgsDebugMsg( QString( "Converting %1 feet" ).arg( QString::number( measure ) ) );
+    measure *= 0.3048;
+    if ( isArea )
+    {
+      measure *= 0.3048;
+    }
+    QgsDebugMsg( QString( "to %1 meters" ).arg( QString::number( measure ) ) );
+    myUnits = QGis::Meters;
+  }
+  
+  u = myUnits;
+}

src/app/qgsmeasuredialog.cpp

@@ -20,6 +20,7 @@
 #include "ui_qgsmeasurebase.h"
 
 #include "qgspoint.h"
+#include "qgsdistancearea.h"
 
 class QCloseEvent;
 class QgsMeasureTool;
@@ -72,6 +73,9 @@ class QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
     //! shows/hides table, shows correct units
     void updateUi();
 
+    //! Converts the measurement, depending on settings in options and current transformation
+    void convertMeasurement(double &measure, QGis::UnitType &u, bool isArea);
+
     double mTotal;
 
     //! Help context id

src/app/qgsmeasuredialog.h

@@ -113,6 +113,17 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   getEllipsoidList();
   QString myEllipsoidId = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();
   cmbEllipsoid->setItemText( cmbEllipsoid->currentIndex(), getEllipsoidName( myEllipsoidId ) );
+
+  // Set the units for measuring
+  QString myUnitsTxt = settings.value( "/qgis/measure/displayunits", "meters").toString();
+  if ( myUnitsTxt == "feet" )
+  {
+    radFeet->setChecked( true );
+  } else {
+    radMeters->setChecked( true );
+  }
+  
+
   // add the themes to the combo box on the option dialog
   QDir myThemeDir( QgsApplication::pkgDataPath() + "/themes/" );
   myThemeDir.setFilter( QDir::Dirs );
@@ -405,6 +416,15 @@ void QgsOptions::saveOptions()
 
   settings.setValue( "/qgis/measure/ellipsoid", getEllipsoidAcronym( cmbEllipsoid->currentText() ) );
 
+  if ( radFeet->isChecked() )
+  {
+    settings.setValue( "/qgis/measure/displayunits", "feet" );
+  }
+  else
+  {
+    settings.setValue( "/qgis/measure/displayunits", "meters" );
+  }
+  settings.setValue( "/qgis/measure/ellipsoid", getEllipsoidAcronym( cmbEllipsoid->currentText() ) );
   //set the colour for selections
   QColor myColor = pbnSelectionColour->color();
   settings.setValue( "/qgis/default_selection_color_red", myColor.red() );

src/app/qgsoptions.cpp

@@ -58,6 +58,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
   //see if the user wants on the fly projection enabled
   bool myProjectionEnabled = myRender->hasCrsTransformEnabled();
   cbxProjectionEnabled->setChecked( myProjectionEnabled );
+  btnGrpMapUnits->setEnabled( !myProjectionEnabled );
 
   long myCRSID = myRender->destinationSrs().srsid();
   QgsDebugMsg( "Read project CRSID: " + QString::number( myCRSID ) );
@@ -430,3 +431,9 @@ void QgsProjectProperties::on_mSnappingOptionsPushButton_clicked()
     d.layerSettings( mSnappingLayerSettings );
   }
 }
+
+void QgsProjectProperties::on_cbxProjectionEnabled_stateChanged(int state)
+{
+  btnGrpMapUnits->setEnabled( state == Qt::Unchecked );
+}
+

src/app/qgsprojectproperties.cpp

@@ -93,6 +93,9 @@ class QgsProjectProperties : public QDialog, private Ui::QgsProjectPropertiesBas
      */
     void on_mSnappingOptionsPushButton_clicked();
 
+    void on_cbxProjectionEnabled_stateChanged(int state);
+
+
   signals:
     //! Signal used to inform listeners that the mouse display precision may have changed
     void displayPrecisionChanged();