Skip to content
Permalink
Browse files
Merge branch 'master' of git://github.com/qgis/Quantum-GIS into android
  • Loading branch information
mbernasocchi committed Nov 29, 2011
2 parents 249d889 + 4b86c71 commit 818ebb7b015a4a36c91c723d3d414dc156dd9e73
Showing with 3,209 additions and 1,696 deletions.
  1. +2 −1 debian/changelog
  2. +1 −0 debian/qgis-common.install
  3. +1,855 −1,012 i18n/qgis_de.ts
  4. +15 −0 python/core/qgscomposerscalebar.sip
  5. +3 −0 python/core/qgscomposition.sip
  6. +0 −2 python/gui/qgsprojectionselector.sip
  7. +13 −0 resources/function_help/length-de_DE
  8. +11 −0 resources/function_help/lower-de_DE
  9. +15 −0 resources/function_help/replace-de_DE
  10. +1 −1 resources/function_help/replace-en_US
  11. +15 −0 resources/function_help/substr-de_DE
  12. +13 −0 resources/function_help/upper-de_DE
  13. +0 −2 src/analysis/interpolation/DualEdgeTriangulation.h
  14. +0 −1 src/analysis/interpolation/Node.h
  15. +12 −13 src/analysis/interpolation/ParametricLine.cc
  16. +0 −1 src/analysis/interpolation/Point3D.h
  17. +3 −3 src/analysis/network/qgsgraphanalyzer.cpp
  18. +2 −0 src/app/CMakeLists.txt
  19. +23 −0 src/app/composer/qgscomposerscalebarwidget.cpp
  20. +1 −0 src/app/composer/qgscomposerscalebarwidget.h
  21. +4 −1 src/app/composer/qgscomposershapewidget.cpp
  22. +11 −0 src/app/composer/qgscompositionwidget.cpp
  23. +2 −0 src/app/composer/qgscompositionwidget.h
  24. +275 −0 src/app/legend/qgslayerorder.cpp
  25. +66 −0 src/app/legend/qgslayerorder.h
  26. +127 −31 src/app/legend/qgslegend.cpp
  27. +24 −2 src/app/legend/qgslegend.h
  28. +10 −3 src/app/legend/qgslegendlayer.cpp
  29. +6 −0 src/app/legend/qgslegendlayer.h
  30. +0 −2 src/app/ogr/qgsnewogrconnection.cpp
  31. +25 −14 src/app/qgisapp.cpp
  32. +4 −0 src/app/qgisapp.h
  33. +0 −1 src/app/qgsdecorationnortharrow.cpp
  34. +0 −1 src/app/qgslabelinggui.cpp
  35. +0 −1 src/browser/main.cpp
  36. +19 −0 src/core/composer/qgscomposeritem.cpp
  37. +0 −1 src/core/composer/qgscomposermap.cpp
  38. +74 −1 src/core/composer/qgscomposerscalebar.cpp
  39. +23 −3 src/core/composer/qgscomposerscalebar.h
  40. +34 −10 src/core/composer/qgscomposition.cpp
  41. +8 −2 src/core/composer/qgscomposition.h
  42. +14 −4 src/core/composer/qgsnumericscalebarstyle.cpp
  43. +3 −0 src/core/composer/qgsnumericscalebarstyle.h
  44. +20 −10 src/core/qgsapplication.cpp
  45. +6 −5 src/core/qgsdistancearea.cpp
  46. +54 −46 src/core/qgsexpression.cpp
  47. +5 −3 src/core/qgsexpression.h
  48. +1 −1 src/core/qgsexpressionparser.yy
  49. +17 −11 src/core/qgslogger.cpp
  50. +0 −2 src/core/qgsmaplayerregistry.cpp
  51. +10 −7 src/core/qgsmaprenderer.cpp
  52. +4 −0 src/core/qgsmessagelog.cpp
  53. +3 −0 src/core/qgsmimedatautils.cpp
  54. +0 −1 src/core/qgspallabeling.cpp
  55. +5 −5 src/core/qgsproviderregistry.cpp
  56. +0 −1 src/core/qgssearchtreenode.cpp
  57. +1 −1 src/core/qgsvectorlayer.cpp
  58. +3 −1 src/core/qgsvectorlayerimport.cpp
  59. +1 −1 src/core/spatialindex/include/tools/PointerPool.h
  60. +0 −1 src/core/spatialindex/include/tools/Tools.h
  61. +41 −38 src/gui/qgsexpressionbuilderwidget.cpp
  62. +8 −8 src/gui/qgsgenericprojectionselector.cpp
  63. +4 −0 src/gui/qgsmapcanvas.cpp
  64. +2 −1 src/gui/qgsmapcanvasmap.cpp
  65. +19 −15 src/gui/qgsmessagelogviewer.cpp
  66. +3 −0 src/gui/qgsmessagelogviewer.h
  67. +0 −126 src/gui/qgsprojectionselector.cpp
  68. +0 −2 src/gui/qgsprojectionselector.h
  69. +1 −1 src/helpviewer/qgshelpviewer.cpp
  70. +0 −3 src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
  71. +0 −2 src/plugins/dxf2shp_converter/dxflib/src/dl_writer.h
  72. +0 −1 src/plugins/georeferencer/qgsimagewarper.cpp
  73. +4 −6 src/plugins/gps_importer/qgsgpsdevicedialog.cpp
  74. +4 −4 src/plugins/gps_importer/qgsgpsplugingui.cpp
  75. +0 −2 src/plugins/spit/qgsspit.cpp
  76. +0 −1 src/providers/gpx/qgsgpxprovider.cpp
  77. +3 −2 src/providers/ogr/qgsogrdataitems.cpp
  78. +43 −46 src/providers/ogr/qgsogrprovider.cpp
  79. +0 −1 src/providers/osm/osmhandler.cpp
  80. +1 −1 src/providers/postgres/qgspgnewconnection.cpp
  81. +42 −15 src/providers/postgres/qgspostgresprovider.cpp
  82. +7 −1 src/providers/postgres/qgspostgresprovider.h
  83. +21 −11 src/ui/qgscomposerscalebarwidgetbase.ui
  84. +9 −2 src/ui/qgscompositionwidgetbase.ui
  85. +3 −0 src/ui/qgsmessagelogviewer.ui
  86. +148 −197 src/ui/qgsprojectionselectorbase.ui
  87. +2 −1 tests/bench/qgsbench.cpp
@@ -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

@@ -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

Large diffs are not rendered by default.

@@ -9,6 +9,14 @@ class QgsComposerScaleBar: QgsComposerItem
%End
public:

/**Added in version 1.8*/
enum Alignment
{
Left = 0,
Middle,
Right
};

QgsComposerScaleBar( QgsComposition* composition /TransferThis/);
~QgsComposerScaleBar();

@@ -58,6 +66,13 @@ class QgsComposerScaleBar: QgsComposerItem

double segmentMillimeters() const;

/**Left / Middle/ Right
@note: this method was added in version 1.8*/
Alignment alignment() const;

/**@note: this method was added in version 1.8*/
void setAlignment( Alignment a );

/**Apply default settings*/
void applyDefaultSettings();
/**Apply default size (scale bar 1/5 of map item width)
@@ -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();

@@ -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 );
@@ -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>
@@ -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>
@@ -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>
@@ -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.-->
@@ -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>
@@ -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>
@@ -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>
@@ -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
@@ -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;
}
@@ -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
@@ -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;
@@ -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
@@ -245,6 +246,7 @@ SET (QGIS_APP_MOC_HDRS
legend/qgslegend.h
legend/qgsapplegendinterface.h
legend/qgslegendlayer.h
legend/qgslayerorder.h

ogr/qgsopenvectorlayerdialog.h
ogr/qgsnewogrconnection.h
@@ -31,12 +31,19 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scale
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );

blockMemberSignals( true );

//style combo box
mStyleComboBox->insertItem( 0, tr( "Single Box" ) );
mStyleComboBox->insertItem( 1, tr( "Double Box" ) );
mStyleComboBox->insertItem( 2, tr( "Line Ticks Middle" ) );
mStyleComboBox->insertItem( 3, tr( "Line Ticks Down" ) );
mStyleComboBox->insertItem( 4, tr( "Line Ticks Up" ) );
mStyleComboBox->insertItem( 5, tr( "Numeric" ) );

mAlignmentComboBox->insertItem( 0, tr( "Left" ) );
mAlignmentComboBox->insertItem( 1, tr( "Middle" ) );
mAlignmentComboBox->insertItem( 2, tr( "Right" ) );

setGuiElements(); //set the GUI elements to the state of scaleBar
blockMemberSignals( false );
}
@@ -161,6 +168,9 @@ void QgsComposerScaleBarWidget::setGuiElements()
//style...
QString style = mComposerScaleBar->style();
mStyleComboBox->setCurrentIndex( mStyleComboBox->findText( tr( style.toLocal8Bit().data() ) ) );

//alignment
mAlignmentComboBox->setCurrentIndex(( int )( mComposerScaleBar->alignment() ) );
}

//slots
@@ -371,6 +381,18 @@ void QgsComposerScaleBarWidget::on_mBoxSizeSpinBox_valueChanged( double d )
mComposerScaleBar->endCommand();
}

void QgsComposerScaleBarWidget::on_mAlignmentComboBox_currentIndexChanged( int index )
{
if ( !mComposerScaleBar )
{
return;
}

mComposerScaleBar->beginCommand( tr( "Scalebar alignment" ) );
mComposerScaleBar->setAlignment(( QgsComposerScaleBar::Alignment ) index );
mComposerScaleBar->endCommand();
}

void QgsComposerScaleBarWidget::blockMemberSignals( bool block )
{
mSegmentSizeSpinBox->blockSignals( block );
@@ -384,4 +406,5 @@ void QgsComposerScaleBarWidget::blockMemberSignals( bool block )
mLineWidthSpinBox->blockSignals( block );
mLabelBarSpaceSpinBox->blockSignals( block );
mBoxSizeSpinBox->blockSignals( block );
mAlignmentComboBox->blockSignals( block );
}
@@ -46,6 +46,7 @@ class QgsComposerScaleBarWidget: public QWidget, private Ui::QgsComposerScaleBar
void on_mStyleComboBox_currentIndexChanged( const QString& text );
void on_mLabelBarSpaceSpinBox_valueChanged( double d );
void on_mBoxSizeSpinBox_valueChanged( double d );
void on_mAlignmentComboBox_currentIndexChanged( int index );


protected:
@@ -39,7 +39,10 @@ QgsComposerShapeWidget::QgsComposerShapeWidget( QgsComposerShape* composerShape

blockAllSignals( false );

connect( mShapeComboBox, SIGNAL( currentIndexChanged( int ) ), this, SLOT( setGuiElementValues() ) );
if ( mComposerShape )
{
connect( mComposerShape, SIGNAL( itemChanged() ), this, SLOT( setGuiElementValues() ) );
}
}

QgsComposerShapeWidget::~QgsComposerShapeWidget()
@@ -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 );
}

0 comments on commit 818ebb7

Please sign in to comment.