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

qgis · Nov 27, 2011 · 301d207 · 301d207
2 parents 545e9a4 + bae8301
commit 301d207
Show file tree

Hide file tree

Showing 76 changed files with 2,934 additions and 1,607 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,9 @@
 qgis (1.9.90) UNRELEASED; urgency=low
 
   * new development version 1.9.90 after branch of 1.8.0
+  * include function help in package
 
- -- Jürgen E. Fischer <jef@norbit.de>  Wed, 16 Nov 2011 09:43:40 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 26 Nov 2011 23:43:48 +0100
 
 qgis (1.8.0) UNRELEASED; urgency=low
 

diff --git a/debian/qgis-common.install b/debian/qgis-common.install
@@ -13,5 +13,6 @@ usr/share/qgis/doc/images
 usr/share/qgis/i18n/*
 usr/share/qgis/images/*
 usr/share/qgis/resources/context_help/*
+usr/share/qgis/resources/function_help/*
 usr/share/qgis/resources/spatialite.db
 usr/share/qgis/resources/qgis_help.db
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/python/core/qgscomposition.sip b/python/core/qgscomposition.sip
@@ -79,6 +79,9 @@ class QgsComposition: QGraphicsScene
     bool printAsRaster() const;
     void setPrintAsRaster(bool enabled);
 
+    double selectionTolerance() const;
+    void setSelectionTolerance( double tol );
+
     /**Returns pointer to map renderer of qgis map canvas*/
     QgsMapRenderer* mapRenderer();
 

diff --git a/python/gui/qgsprojectionselector.sip b/python/gui/qgsprojectionselector.sip
@@ -89,8 +89,6 @@ class QgsProjectionSelector: QWidget //, private Ui::QgsProjectionSelectorBase
        */
       void setOgcWmsCrsFilter(QSet<QString> crsFilter);
 
-      void on_pbnFind_clicked();
-
     protected:
       /** Used to ensure the projection list view is actually populated */
       void showEvent ( QShowEvent * theEvent );

diff --git a/resources/function_help/length-de_DE b/resources/function_help/length-de_DE
@@ -0,0 +1,13 @@
+<h3>Funktion length()</h3>
+Liefert die Länge einer Zeichenkette.
+
+<p><h4>Syntax</h4>
+     length(<i>zeichenkette</i>)</p>
+
+<p><h4>Argumente</h4>
+<!-- List args for functions here-->
+<i>  zeichenkette</i> -> ist eine Zeichenkette.  Die Zeichenkette deren Länge zu bestimmen ist.</p>
+
+<p><h4>Beispiel</h4>
+<!-- Show example of function.-->
+     length('HALLO') -> 5</p>
diff --git a/resources/function_help/lower-de_DE b/resources/function_help/lower-de_DE
@@ -0,0 +1,11 @@
+<h3>Funktion lower()</h3>
+Wandelt eine Zeichenkette in Kleinbuchstaben um.
+
+<p><h4>  Syntax</h4>
+     lower(<i>zeichenkette</i>)</p>
+
+<p><h4>  Argumente</h4>
+<i>  zeichenkette</i> -> ist eine Zeichenkette.  Die Zeichenkette, die in Kleinbuchstaben umzuwandeln ist.</p>
+
+<p><h4>  Beispiel</h4>
+     lower('Hallo Welt') -> 'hallo welt'</p>
diff --git a/resources/function_help/replace-de_DE b/resources/function_help/replace-de_DE
@@ -0,0 +1,15 @@
+<h3>Funktion replace()</h3>
+Liefert eine Zeichenkette in der die angegebene Zeichenkette ersetzt ist.
+
+<p><h4>Syntax</h4>
+     replace(<i>zeichenkette,vorher,nachher</i>)</p>
+
+<p><h4>Argumente</h4>
+<!-- List args for functions here-->
+<i>  zeichenkette</i> -> ist eine Zeichenkette.  Die ursprüngliche Zeichenkette.<br>
+<i>  vorher</i> -> ist eine Zeichenkette.  Die zu ersetzende Zeichenkette.<br>
+<i>  nacher</i> -> ist eine Zeichenkette.  Die Zeichenkette durch die <i>vorher</i> ersetzen soll<br></p>
+
+<p><h4>Beispiel</h4>
+<!-- Show example of function.-->
+     replace('QGIS SHOULD ROCK','SHOULD','DOES') -> 'QGIS DOES ROCK'</p>
diff --git a/resources/function_help/replace-en_US b/resources/function_help/replace-en_US
@@ -8,7 +8,7 @@ Returns a string with the the supplied string replaced.
 <!-- List args for functions here-->
 <i>  string</i> -> is string.  The start string.<br>
 <i>  before</i> -> is string.  The string to replace.<br>
-<i>  after</i> -> is string.  The string that will repalce <i>before</i><br></p>
+<i>  after</i> -> is string.  The string that will replace <i>before</i><br></p>
 
 <p><h4>Example</h4>
 <!-- Show example of function.-->

diff --git a/resources/function_help/substr-de_DE b/resources/function_help/substr-de_DE
@@ -0,0 +1,15 @@
+<h3>Funktion substr()</h3>
+Liefert einen Teil einer Zeichenkette
+
+<p><h4>Syntax</h4>
+     substr(<i>zeichenkette,startpos,länge</i>)</p>
+
+<p><h4>Argumente</h4>
+<!-- List args for functions here-->
+<i>  zeichenkette</i> -> ist eine Zeichenkette.  Die vollständige Zeichenkette.<br>
+<i>  startpos</i> -> ist eine Zahl.  Die Startposition des Teils.<br>
+<i>  länge</i> -> ist eine Zahl.  Die Länge des Teils.<br></p>
+
+<p><h4>Beispiel</h4>
+<!-- Show example of function.-->
+     substr('HELLO WORLD',3,5) -> 'LLO W'</p>
diff --git a/resources/function_help/upper-de_DE b/resources/function_help/upper-de_DE
@@ -0,0 +1,13 @@
+<h3>Funktion upper()</h3>
+Wandelt eine Zeichenkette in Großbuchstaben.
+
+<p><h4>Syntax</h4>
+     upper(<i>zeichenkette</i>)</p>
+
+<p><h4>Argumente</h4>
+<!-- List args for functions here-->
+<i>  zeichenkette</i> -> ist eine Zeichenkette.  Die Zeichenkette, die in Großbuchstaben umzuwandeln ist.</p>
+
+<p><h4>Beispiel</h4>
+<!-- Show example of function.-->
+     upper('hello WOrld') -> 'HELLO WORLD'</p>
diff --git a/src/analysis/interpolation/DualEdgeTriangulation.h b/src/analysis/interpolation/DualEdgeTriangulation.h
@@ -23,12 +23,10 @@
 #include <QList>
 #include "MathUtils.h"
 #include "TriangleInterpolator.h"
-//#include <qapp.h>
 #include <QColor>
 #include <QFile>
 #include <QTextStream>
 #include <QMessageBox>
-#include <iostream>
 #include <cfloat>
 #include <QBuffer>
 #include <QStringList>

diff --git a/src/analysis/interpolation/Node.h b/src/analysis/interpolation/Node.h
@@ -18,7 +18,6 @@
 #define NODE_H
 
 #include "Point3D.h"
-#include <iostream>
 
 /**Node is a class used by Line3D. It represents a node in the single directed linked list. Associated Point3D objects are deleted when the node is deleted.*/
 class ANALYSIS_EXPORT Node

diff --git a/src/analysis/interpolation/ParametricLine.cc b/src/analysis/interpolation/ParametricLine.cc
@@ -15,75 +15,74 @@
  ***************************************************************************/
 
 #include "ParametricLine.h"
-#include <iostream>
-
+#include <qgslogger.h>
 
 void ParametricLine::add( ParametricLine* pl )
 {
   Q_UNUSED( pl );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine" );
 }
 
 void ParametricLine::calcFirstDer( float t, Vector3D* v )
 {
   Q_UNUSED( t );
   Q_UNUSED( v );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
 }
 
 void ParametricLine::calcSecDer( float t, Vector3D* v )
 {
   Q_UNUSED( t );
   Q_UNUSED( v );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
 }
 
 void ParametricLine::calcPoint( float t, Point3D *p )
 {
   Q_UNUSED( t );
   Q_UNUSED( p );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
 }
 
 ParametricLine* ParametricLine::getParent() const
 {
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
   return 0;
 }
 
 void ParametricLine::remove( int i )
 {
   Q_UNUSED( i );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
 }
 
 void ParametricLine::setControlPoly( QVector<Point3D*>* cp )
 {
   Q_UNUSED( cp );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
 }
 
 void ParametricLine::setParent( ParametricLine* paral )
 {
   Q_UNUSED( paral );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
 }
 
 int ParametricLine::getDegree() const
 {
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
   return mDegree;
 }
 
 const Point3D* ParametricLine::getControlPoint( int number ) const
 {
   Q_UNUSED( number );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
   return 0;
 }
 
 const QVector<Point3D*>* ParametricLine::getControlPoly() const
 {
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
   return 0;
 }
diff --git a/src/analysis/interpolation/Point3D.h b/src/analysis/interpolation/Point3D.h
@@ -18,7 +18,6 @@
 #define POINT3D_H
 
 #include <cmath>
-#include <iostream>
 
 /**Point3D is a class to represent a three dimensional point*/
 class ANALYSIS_EXPORT Point3D

diff --git a/src/analysis/network/qgsgraphanalyzer.cpp b/src/analysis/network/qgsgraphanalyzer.cpp
@@ -29,10 +29,10 @@
 void QgsGraphAnalyzer::shortestpath( const QgsGraph* source, int startPointIdx, int criterionNum, const QVector<int>& destPointCost, QVector<double>& cost, QgsGraph* treeResult )
 {
 
-  // QMap< cost, vertexIdx > not_begin
+  // QMultiMap< cost, vertexIdx > not_begin
   // I use it and not create any struct or class.
-  QMap< double, int > not_begin;
-  QMap< double, int >::iterator it;
+  QMultiMap< double, int > not_begin;
+  QMultiMap< double, int >::iterator it;
 
   // QVector< QPair< cost, arc id > result
   QVector< QPair< double, int > > result;

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -124,6 +124,7 @@ SET(QGIS_APP_SRCS
   legend/qgslegendsymbologygroup.cpp
   legend/qgslegendsymbologyitem.cpp
   legend/qgslegendvectorsymbologyitem.cpp
+  legend/qgslayerorder.cpp
 
   ogr/qgsogrhelperfunctions.cpp
   ogr/qgsopenvectorlayerdialog.cpp
@@ -238,6 +239,7 @@ SET (QGIS_APP_MOC_HDRS
   legend/qgslegend.h
   legend/qgsapplegendinterface.h
   legend/qgslegendlayer.h
+  legend/qgslayerorder.h
 
   ogr/qgsopenvectorlayerdialog.h
   ogr/qgsnewogrconnection.h

diff --git a/src/app/composer/qgscompositionwidget.cpp b/src/app/composer/qgscompositionwidget.cpp
@@ -91,6 +91,8 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
     {
       mGridStyleComboBox->setCurrentIndex( 2 );
     }
+
+    mSelectionToleranceSpinBox->setValue( mComposition->selectionTolerance() );
   }
   blockSignals( false );
 }
@@ -503,6 +505,14 @@ void QgsCompositionWidget::on_mPenWidthSpinBox_valueChanged( double d )
   }
 }
 
+void QgsCompositionWidget::on_mSelectionToleranceSpinBox_valueChanged( double d )
+{
+  if ( mComposition )
+  {
+    mComposition->setSelectionTolerance( d );
+  }
+}
+
 void QgsCompositionWidget::blockSignals( bool block )
 {
   mPaperSizeComboBox->blockSignals( block );
@@ -519,4 +529,5 @@ void QgsCompositionWidget::blockSignals( bool block )
   mPenWidthSpinBox->blockSignals( block );
   mGridColorButton->blockSignals( block );
   mGridStyleComboBox->blockSignals( block );
+  mSelectionToleranceSpinBox->blockSignals( block );
 }
diff --git a/src/app/composer/qgscompositionwidget.h b/src/app/composer/qgscompositionwidget.h
@@ -55,6 +55,8 @@ class QgsCompositionWidget: public QWidget, private Ui::QgsCompositionWidgetBase
     void on_mGridColorButton_clicked();
     void on_mGridStyleComboBox_currentIndexChanged( const QString& text );
     void on_mPenWidthSpinBox_valueChanged( double d );
+    void on_mSelectionToleranceSpinBox_valueChanged( double d );
+
     /**Sets GUI elements to width/height from composition*/
     void displayCompositionWidthHeight();