Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Oct 5, 2012 · c5e2257 · c5e2257
2 parents 88cd943 + 4a90e73
commit c5e2257
Show file tree

Hide file tree

Showing 21 changed files with 1,029 additions and 501 deletions.
diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts
@@ -6420,7 +6420,7 @@ Cambiare questa situazione prima, perché il plugin OSM non quale layer è la de
     </message>
     <message>
         <source>Help Python Console</source>
-        <translation type="obsolete">Aiuto Console Python</translation>
+        <translation>Aiuto Console Python</translation>
     </message>
     <message>
         <source>Import Class</source>

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -149,7 +149,7 @@ ADD_CUSTOM_COMMAND(TARGET compile_python_files
        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-FOREACH(file __init__.py utils.py console.py console_sci.py help.py)
+FOREACH(file __init__.py utils.py console.py console_sci.py console_help.py)
   ADD_CUSTOM_COMMAND(TARGET compile_python_files
          POST_BUILD
          COMMAND ${CMAKE_COMMAND} -E copy ${file} ${QGIS_PYTHON_OUTPUT_DIRECTORY}
@@ -162,4 +162,4 @@ PYTHON_INSTALL(__init__.py ${QGIS_PYTHON_DIR})
 PYTHON_INSTALL(utils.py    ${QGIS_PYTHON_DIR})
 PYTHON_INSTALL(console.py  ${QGIS_PYTHON_DIR})
 PYTHON_INSTALL(console_sci.py  ${QGIS_PYTHON_DIR})
-PYTHON_INSTALL(help.py  ${QGIS_PYTHON_DIR})
+PYTHON_INSTALL(console_help.py  ${QGIS_PYTHON_DIR})
diff --git a/python/console.py b/python/console.py
@@ -23,7 +23,7 @@
 from PyQt4.QtGui import *
 from qgis.utils import iface
 from console_sci import PythonEdit
-from help import HelpDialog
+from console_help import HelpDialog
 
 import sys
 import os

diff --git a/python/help.py → python/console_help.py b/python/help.py → python/console_help.py
diff --git a/python/console_sci.py b/python/console_sci.py
@@ -424,6 +424,18 @@ def keyPressEvent(self, e):
             else:
                 QsciScintilla.keyPressEvent(self, e)
 
+    def mousePressEvent(self, e):
+        """
+        Re-implemented to handle the mouse press event.
+        event: the mouse press event (QMouseEvent)
+        """
+        if e.button() == Qt.MidButton:
+            self.setFocus()
+            self.paste()
+            e.accept()
+        else:
+            QsciScintilla.mousePressEvent(self, e)
+
     def paste(self):
         """Reimplement QScintilla method"""
         stringPaste = unicode(QApplication.clipboard().text())

diff --git a/python/gui/raster/qgssinglebandgrayrendererwidget.sip b/python/gui/raster/qgssinglebandgrayrendererwidget.sip
@@ -20,5 +20,5 @@ class QgsSingleBandGrayRendererWidget: QgsRasterRendererWidget
     int selectedBand( int index = 0 );
 
   public slots:
-    void loadMinMax( int theBandNo, double theMin, double theMax );
+    void loadMinMax( int theBandNo, double theMin, double theMax, int theOrigin );
 };
diff --git a/python/helpConsole/help.htm b/python/helpConsole/help.htm
@@ -26,7 +26,7 @@
 	<table id="header">
 		<tr>
 		<td>
-			<img src="qrc:/iconConsole/imgHelpDialog.png" />
+			<img src="qrc:/images/console/imgHelpDialog.png" />
 		</td>
 		<td>
 			<h2 id="headerTitle">Python Console for QGIS</h2>

diff --git a/python/helpConsole/i18n/de_DE.properties → python/helpConsole/i18n/de.properties b/python/helpConsole/i18n/de_DE.properties → python/helpConsole/i18n/de.properties
diff --git a/src/core/raster/qgsrasterrenderer.cpp b/src/core/raster/qgsrasterrenderer.cpp
@@ -26,11 +26,14 @@
 #include "qgsbilinearrasterresampler.h"
 #include "qgscubicrasterresampler.h"
 
+#include <QCoreApplication>
 #include <QDomDocument>
 #include <QDomElement>
 #include <QImage>
 #include <QPainter>
 
+#define tr( sourceText ) QCoreApplication::translate ( "QgsRasterRenderer", sourceText )
+
 QgsRasterRenderer::QgsRasterRenderer( QgsRasterInterface* input, const QString& type )
     : QgsRasterInterface( input )
     , mType( type ), mOpacity( 1.0 ), mRasterTransparency( 0 )
@@ -140,3 +143,146 @@ void QgsRasterRenderer::readXML( const QDomElement& rendererElem )
     mRasterTransparency->readXML( rasterTransparencyElem );
   }
 }
+
+QString QgsRasterRenderer::minMaxOriginName( int theOrigin )
+{
+  if ( theOrigin == MinMaxUnknown )
+  {
+    return "Unknown";
+  }
+  else if ( theOrigin == MinMaxUser )
+  {
+    return "User";
+  }
+
+  QString name;
+  if ( theOrigin & MinMaxMinMax )
+  {
+    name += "MinMax";
+  }
+  else if ( theOrigin & MinMaxCumulativeCut )
+  {
+    name += "CumulativeCut";
+  }
+  else if ( theOrigin & MinMaxStdDev )
+  {
+    name += "StdDev";
+  }
+
+  if ( theOrigin & MinMaxFullExtent )
+  {
+    name += "FullExtent";
+  }
+  else if ( theOrigin & MinMaxSubExtent )
+  {
+    name += "SubExtent";
+  }
+
+  if ( theOrigin & MinMaxEstimated )
+  {
+    name += "Estimated";
+  }
+  else if ( theOrigin & MinMaxExact )
+  {
+    name += "Exact";
+  }
+  return name;
+}
+
+QString QgsRasterRenderer::minMaxOriginLabel( int theOrigin )
+{
+  if ( theOrigin == MinMaxUnknown )
+  {
+    return tr( "Unknown" );
+  }
+  else if ( theOrigin == MinMaxUser )
+  {
+    return tr( "User defined" );
+  }
+
+  QString name;
+  if ( theOrigin & MinMaxEstimated )
+  {
+    name += tr( "Estimated" );
+  }
+  else if ( theOrigin & MinMaxExact )
+  {
+    name += tr( "Exact" );
+  }
+
+  name += " ";
+
+  if ( theOrigin & MinMaxMinMax )
+  {
+    name += tr( "min / max" );
+  }
+  else if ( theOrigin & MinMaxCumulativeCut )
+  {
+    name += "cumulative cut";
+  }
+  else if ( theOrigin & MinMaxStdDev )
+  {
+    name += "standard deviation";
+  }
+
+  name += " " + tr( " of " ) + " ";
+
+  if ( theOrigin & MinMaxFullExtent )
+  {
+    name += "full extent";
+  }
+  else if ( theOrigin & MinMaxSubExtent )
+  {
+    name += "sub extent";
+  }
+
+  name += ".";
+
+  return name;
+}
+
+int QgsRasterRenderer::minMaxOriginFromName( QString theName )
+{
+  if ( theName.contains( "Unknown" ) )
+  {
+    return MinMaxUnknown;
+  }
+  else if ( theName.contains( "User" ) )
+  {
+    return MinMaxUser;
+  }
+
+  int origin = 0;
+
+  if ( theName.contains( "MinMax" ) )
+  {
+    origin |= MinMaxMinMax;
+  }
+  else if ( theName.contains( "CumulativeCut" ) )
+  {
+    origin |= MinMaxCumulativeCut;
+  }
+  else if ( theName.contains( "StdDev" ) )
+  {
+    origin |= MinMaxStdDev;
+  }
+
+  if ( theName.contains( "FullExtent" ) )
+  {
+    origin |= MinMaxFullExtent;
+  }
+  else if ( theName.contains( "SubExtent" ) )
+  {
+    origin |= MinMaxSubExtent;
+  }
+
+  if ( theName.contains( "Estimated" ) )
+  {
+    origin |= MinMaxEstimated;
+  }
+  else if ( theName.contains( "Exact" ) )
+  {
+    origin |= MinMaxExact;
+  }
+  return origin;
+}
diff --git a/src/core/raster/qgsrasterrenderer.h b/src/core/raster/qgsrasterrenderer.h
@@ -39,6 +39,23 @@ class QDomElement;
 class CORE_EXPORT QgsRasterRenderer : public QgsRasterInterface
 {
   public:
+    // Origin of min / max values
+    enum MinMaxOrigin
+    {
+      MinMaxUnknown         = 0,
+      MinMaxUser            = 1, // entered by user
+      // method
+      MinMaxMinMax          = 1 << 1,
+      MinMaxCumulativeCut   = 1 << 2,
+      MinMaxStdDev          = 1 << 3,
+      // Extent
+      MinMaxFullExtent      = 1 << 4,
+      MinMaxSubExtent       = 1 << 5,
+      // Precision
+      MinMaxEstimated       = 1 << 6,
+      MinMaxExact           = 1 << 7
+    };
+
     QgsRasterRenderer( QgsRasterInterface* input = 0, const QString& type = "" );
     virtual ~QgsRasterRenderer();
 
@@ -82,6 +99,10 @@ class CORE_EXPORT QgsRasterRenderer : public QgsRasterInterface
     /**Returns a list of band numbers used by the renderer*/
     virtual QList<int> usesBands() const { return QList<int>(); }
 
+    static QString minMaxOriginName( int theOrigin );
+    static QString minMaxOriginLabel( int theOrigin );
+    static int minMaxOriginFromName( QString theName );
+
   protected:
 
     /**Write upper class info into rasterrenderer element (called by writeXML method of subclasses)*/

diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp
@@ -24,7 +24,12 @@
 #include <QImage>
 
 QgsSingleBandPseudoColorRenderer::QgsSingleBandPseudoColorRenderer( QgsRasterInterface* input, int band, QgsRasterShader* shader ):
-    QgsRasterRenderer( input, "singlebandpseudocolor" ), mShader( shader ), mBand( band )
+    QgsRasterRenderer( input, "singlebandpseudocolor" )
+    , mShader( shader )
+    , mBand( band )
+    , mClassificationMin( std::numeric_limits<double>::quiet_NaN() )
+    , mClassificationMax( std::numeric_limits<double>::quiet_NaN() )
+    , mClassificationMinMaxOrigin( QgsRasterRenderer::MinMaxUnknown )
 {
 }
 
@@ -85,8 +90,16 @@ QgsRasterRenderer* QgsSingleBandPseudoColorRenderer::create( const QDomElement&
     shader = new QgsRasterShader();
     shader->readXML( rasterShaderElem );
   }
-  QgsRasterRenderer* r = new QgsSingleBandPseudoColorRenderer( input, band, shader );
+
+  //QgsRasterRenderer* r = new QgsSingleBandPseudoColorRenderer( input, band, shader );
+  QgsSingleBandPseudoColorRenderer* r = new QgsSingleBandPseudoColorRenderer( input, band, shader );
   r->readXML( elem );
+
+  // TODO: add _readXML in superclass?
+  r->setClassificationMin( elem.attribute( "classificationMin", "NaN" ).toDouble() );
+  r->setClassificationMax( elem.attribute( "classificationMax", "NaN" ).toDouble() );
+  r->setClassificationMinMaxOrigin( QgsRasterRenderer::minMaxOriginFromName( elem.attribute( "classificationMinMaxOrigin", "Unknown" ) ) );
+
   return r;
 }
 
@@ -210,6 +223,10 @@ void QgsSingleBandPseudoColorRenderer::writeXML( QDomDocument& doc, QDomElement&
   {
     mShader->writeXML( doc, rasterRendererElem ); //todo: include color ramp items directly in this renderer
   }
+  rasterRendererElem.setAttribute( "classificationMin", QString::number( mClassificationMin ) );
+  rasterRendererElem.setAttribute( "classificationMax", QString::number( mClassificationMax ) );
+  rasterRendererElem.setAttribute( "classificationMinMaxOrigin", QgsRasterRenderer::minMaxOriginName( mClassificationMinMaxOrigin ) );
+
   parentElem.appendChild( rasterRendererElem );
 }
 

diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.h b/src/core/raster/qgssinglebandpseudocolorrenderer.h
@@ -49,9 +49,23 @@ class CORE_EXPORT QgsSingleBandPseudoColorRenderer: public QgsRasterRenderer
 
     QList<int> usesBands() const;
 
+    double classificationMin() const { return mClassificationMin; }
+    double classificationMax() const { return mClassificationMax; }
+    void setClassificationMin( double min ) { mClassificationMin = min; }
+    void setClassificationMax( double max ) { mClassificationMax = max; }
+    int classificationMinMaxOrigin() const { return mClassificationMinMaxOrigin; }
+    void setClassificationMinMaxOrigin( int origin ) { mClassificationMinMaxOrigin = origin; }
+
   private:
     QgsRasterShader* mShader;
     int mBand;
+
+    // Minimum and maximum values used for automatic classification, these
+    // values are not used by renderer in rendering process
+    double mClassificationMin;
+    double mClassificationMax;
+
+    int mClassificationMinMaxOrigin;
 };
 
 #endif // QGSSINGLEBANDPSEUDOCOLORRENDERER_H
diff --git a/src/gui/raster/qgsrasterminmaxwidget.cpp b/src/gui/raster/qgsrasterminmaxwidget.cpp
@@ -44,6 +44,7 @@ void QgsRasterMinMaxWidget::on_mLoadPushButton_clicked()
 
   foreach ( int myBand, mBands )
   {
+    int origin = QgsRasterRenderer::MinMaxUnknown;
     QgsDebugMsg( QString( "myBand = %1" ).arg( myBand ) );
     if ( myBand < 1 || myBand > mLayer->dataProvider()->bandCount() )
     {
@@ -56,37 +57,49 @@ void QgsRasterMinMaxWidget::on_mLoadPushButton_clicked()
     if ( mCurrentExtentRadioButton->isChecked() )
     {
       myExtent = mExtent; // current
+      origin |= QgsRasterRenderer::MinMaxSubExtent;
+    }
+    else
+    {
+      origin |= QgsRasterRenderer::MinMaxFullExtent;
     }
     QgsDebugMsg( QString( "myExtent.isEmpty() = %1" ).arg( myExtent.isEmpty() ) );
 
     int mySampleSize = 0; // 0 == exact
     if ( mEstimateRadioButton->isChecked() )
     {
       mySampleSize = 250000;
+      origin |= QgsRasterRenderer::MinMaxEstimated;
+    }
+    else
+    {
+      origin |= QgsRasterRenderer::MinMaxExact;
     }
 
     if ( mCumulativeCutRadioButton->isChecked() )
     {
       double myLower = mCumulativeCutLowerDoubleSpinBox->value() / 100.0;
       double myUpper = mCumulativeCutUpperDoubleSpinBox->value() / 100.0;
       mLayer->dataProvider()->cumulativeCut( myBand, myLower, myUpper, myMin, myMax, myExtent, mySampleSize );
+      origin |= QgsRasterRenderer::MinMaxCumulativeCut;
     }
     else if ( mMinMaxRadioButton->isChecked() )
     {
       // TODO: consider provider minimum/maximumValue() (has to be defined well in povider)
       QgsRasterBandStats myRasterBandStats = mLayer->dataProvider()->bandStatistics( myBand, QgsRasterBandStats::Min | QgsRasterBandStats::Max, myExtent, mySampleSize );
       myMin = myRasterBandStats.minimumValue;
       myMax = myRasterBandStats.maximumValue;
+      origin |= QgsRasterRenderer::MinMaxMinMax;
     }
     else if ( mStdDevRadioButton->isChecked() )
     {
       QgsRasterBandStats myRasterBandStats = mLayer->dataProvider()->bandStatistics( myBand, QgsRasterBandStats::Mean | QgsRasterBandStats::StdDev, myExtent, mySampleSize );
       double myStdDev = mStdDevSpinBox->value();
       myMin = myRasterBandStats.mean - ( myStdDev * myRasterBandStats.stdDev );
       myMax = myRasterBandStats.mean + ( myStdDev * myRasterBandStats.stdDev );
-
+      origin |= QgsRasterRenderer::MinMaxStdDev;
     }
 
-    emit load( myBand, myMin, myMax );
+    emit load( myBand, myMin, myMax, origin );
   }
 }