Skip to content

Commit ff41bec

Browse files
author
Hugo Mercier
committed
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into atlas
Conflicts: python/core/qgsexpression.sip Add a missing function to QgsExpression
2 parents 4657c84 + ee593e8 commit ff41bec

576 files changed

Lines changed: 23722 additions & 10041 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmake/Flex.cmake‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,12 @@ MACRO(ADD_FLEX_FILES_PREFIX _sources prefix )
7878
)
7979

8080
SET(${_sources} ${${_sources}} ${_out} )
81+
82+
# Disable warnings
83+
IF(MSVC)
84+
SET_SOURCE_FILES_PROPERTIES(${_out} PROPERTIES COMPILE_FLAGS /W0)
85+
ELSE(MSVC)
86+
SET_SOURCE_FILES_PROPERTIES(${_out} PROPERTIES COMPILE_FLAGS -w)
87+
ENDIF(MSVC)
8188
ENDFOREACH (_current_FILE)
8289
ENDMACRO(ADD_FLEX_FILES_PREFIX)

‎doc/TRANSLATORS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<style>table {font-size:80%;}th {text-align:left; }.bartodo{ background-color:red;width:100px;height:20px;}.bardone{ background-color:green;width:80px;height:20px;font-size:80%;text-align:center;padding-top:4px;height:16px;color:white;}</style><table><tr><th colspan="2" style="width:250px;">Language</th><th>Finished %</th><th>Translators</th></tr>
22

33
<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:8466 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:100px">100.0</div></div></td><td>Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho</td></tr>
4-
<tr><td><img src="qrc:/images/flags/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:8111 unfinished:114 untranslated:195" class="bartodo"><div class="bardone" style="width:96px">96.5</div></div></td><td>Xan Vieiro</td></tr>
4+
<tr><td><img src="qrc:/images/flags/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:8466 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:100px">100.0</div></div></td><td>Xan Vieiro</td></tr>
55
<tr><td><img src="qrc:/images/flags/it.png"></td><td>Italian</td><td><div title="finished:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:91px">91.4</div></div></td><td>Paolo Cavallini, Flavio Rigolon, Maurizio Napolitano, Roberto Angeletti, Alessandro Fanna, Michele Beneventi, Marco Braida, Luca Casagrande, Luca Delucchi, Anne Gishla</td></tr>
66
<tr><td><img src="qrc:/images/flags/ja.png"></td><td>Japanese</td><td><div title="finished:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:91px">91.4</div></div></td><td>BABA Yoshihiko, Yoichi Kayama</td></tr>
77
<tr><td><img src="qrc:/images/flags/nl.png"></td><td>Dutch</td><td><div title="finished:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:91px">91.4</div></div></td><td>Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk</td></tr>

‎doc/index.dox‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,21 @@ fixes, bug reports, contributed documentation, advocacy and supporting other
1919
users on our mailing lists and forums. Financial contributions are also
2020
welcome.
2121

22-
\section index_APIStability API Stability
22+
\section index_APIStability Earlier versions of the API
2323

24-
Versions of QGIS prior to 1.0 did not guarantee API stability since the
25-
application was undergoing rapid development of new features and we did not
26-
want to commit ourselves to a fixed API. With the release of QGIS 1.0 we
27-
guarantee a backwards compatible API for the 1.x and 1.0.x release series. 1.x
28-
releases will be our 'unstable' development builds and 1.0.x releases our
29-
'stable' (bugfixes and very minor tweaks only).
24+
Earlier version of the documentation are also available on the Quantum GIS
25+
website:
26+
27+
<ul>
28+
<li><a href="http://qgis.org/api/1.8">1.8</a>
29+
<li><a href="http://qgis.org/api/1.7">1.7</a>
30+
<li><a href="http://qgis.org/api/1.6">1.6</a>
31+
</ul>
3032

3133
\section index_maillist Mailing Lists
3234
<ul>
3335
<li>For support we encourage you to join our <a
34-
href="http://qgis.osgeo.org/community/mailing-lists.html">mailing lists</a> for
36+
href="http://qgis.org/en/community/mailing-lists.html">mailing lists</a> for
3537
developers.</li> </ul>
3638

3739
\section index_bugs Bug Reporting

‎i18n/qgis_de.ts‎

Lines changed: 688 additions & 646 deletions
Large diffs are not rendered by default.

‎i18n/qgis_gl_ES.ts‎

Lines changed: 2682 additions & 2115 deletions
Large diffs are not rendered by default.

‎i18n/qgis_it.ts‎

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6254,12 +6254,50 @@ Cambiare questa situazione prima, perché il plugin OSM non quale layer è la de
62546254
<translation>Console python</translation>
62556255
</message>
62566256
<message>
6257-
<source>To access Quantum GIS environment from this console
6258-
use qgis.utils.iface object (instance of QgisInterface class).
6257+
<source>Clear console</source>
6258+
<translation>Pulisci console</translation>
6259+
</message>
6260+
<message>
6261+
<source>Import iface class</source>
6262+
<translation>Importa la classe iface</translation>
6263+
</message>
6264+
<message>
6265+
<source>Import sextante class</source>
6266+
<translation>Importa la classe Sextante</translation>
6267+
</message>
6268+
<message>
6269+
<source>Open script file</source>
6270+
<translation>Apri file</translation>
6271+
</message>
6272+
<message>
6273+
<source>Save to script file</source>
6274+
<translation>Salva file</translation>
6275+
</message>
6276+
<message>
6277+
<source>Help</source>
6278+
<translation>Aiuto</translation>
6279+
</message>
6280+
<message>
6281+
<source>Run command</source>
6282+
<translation>Esegui comando</translation>
6283+
</message>
6284+
<message>
6285+
<source>## History saved successfully ##</source>
6286+
<translation>## Storia comandi salvata con successo ##</translation>
6287+
</message>
6288+
<message>
6289+
<source>## History cleared successfully ##</source>
6290+
<translation>## Storia comandi cancellata con successo ##</translation>
6291+
</message>
6292+
<message>
6293+
<source>## To access Quantum GIS environment from this console
6294+
## use qgis.utils.iface object (instance of QgisInterface class). Read help for more info.
62596295

62606296
</source>
6261-
<translation>Per accedere all&apos;ambiente Quantum GIS da questa console
6262-
usa l&apos;oggetto qgis.utils.iface (istanza della classe QgisInterface).</translation>
6297+
<translation>## Per accedere all&apos;ambiente Quantum GIS da questa console
6298+
## usa l&apos;oggetto qgis.utils.iface (istanza della classe QgisInterface). Consulta l'aiuto per ottenere più informazioni.
6299+
6300+
</translation>
62636301
</message>
62646302
</context>
62656303
<context>

‎python/CMakeLists.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,36 @@ INCLUDE_DIRECTORIES(
2828
${QT_QTXML_INCLUDE_DIR}
2929
${GDAL_INCLUDE_DIR}
3030
${GEOS_INCLUDE_DIR}
31+
${QWT_INCLUDE_DIR}
3132

3233
../src/core
34+
../src/core/pal
3335
../src/core/composer
36+
../src/core/diagram
3437
../src/core/gps
3538
../src/core/gps/qextserialport
3639
../src/core/raster
3740
../src/core/renderer
3841
../src/core/symbology
3942
../src/core/symbology-ng
43+
44+
../src/gui/raster
45+
../src/gui/attributetable
46+
47+
../src/analysis/interpolation
48+
../src/analysis/raster
49+
4050
${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
4151
)
4252

53+
IF(NOT WITH_TOUCH)
54+
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_TOUCH)
55+
ENDIF(NOT WITH_TOUCH)
56+
57+
IF(NOT QT_MOBILITY_LOCATION_FOUND)
58+
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} MOBILITY_LOCATION)
59+
ENDIF(NOT QT_MOBILITY_LOCATION_FOUND)
60+
4361
IF(PYQT4_VERSION_NUM LESS 263680) # 0x040600
4462
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
4563
ENDIF(PYQT4_VERSION_NUM LESS 263680)

‎python/analysis/analysis.sip‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,44 @@
99
%Include qgsgeometryanalyzer.sip
1010
%Include qgsoverlayanalyzer.sip
1111
%Include qgszonalstatistics.sip
12+
13+
// %Include interpolation/Bezier3D.sip
14+
// %Include interpolation/CloughTocherInterpolator.sip
15+
// %Include interpolation/DualEdgeTriangulation.sip
16+
// %Include interpolation/HalfEdge.sip
17+
// %Include interpolation/LinTriangleInterpolator.sip
18+
// %Include interpolation/Line3D.sip
19+
// %Include interpolation/Node.sip
20+
// %Include interpolation/NormVecDecorator.sip
21+
// %Include interpolation/ParametricLine.sip
22+
// %Include interpolation/Point3D.sip
23+
// %Include interpolation/TriangleInterpolator.sip
24+
// %Include interpolation/Triangulation.sip
25+
// %Include interpolation/TriDecorator.sip
26+
// %Include interpolation/Vector3D.sip
27+
%Include interpolation/qgsgridfilewriter.sip
28+
%Include interpolation/qgsinterpolator.sip
29+
%Include interpolation/qgsidwinterpolator.sip
30+
%Include interpolation/qgstininterpolator.sip
31+
32+
%Include raster/qgsderivativefilter.sip
33+
%Include raster/qgsaspectfilter.sip
34+
%Include raster/qgshillshadefilter.sip
35+
%Include raster/qgsninecellfilter.sip
36+
%Include raster/qgsrastercalcnode.sip
37+
%Include raster/qgsrastercalculator.sip
38+
%Include raster/qgsrastermatrix.sip
39+
%Include raster/qgsrelief.sip
40+
%Include raster/qgsruggednessfilter.sip
41+
%Include raster/qgsslopefilter.sip
42+
%Include raster/qgstotalcurvaturefilter.sip
43+
44+
%Include network/qgsgraph.sip
45+
%Include network/qgsarcproperter.sip
46+
%Include network/qgsgraphanalyzer.sip
47+
%Include network/qgslinevectorlayerdirector.sip
48+
%Include network/qgsgraphbuilderintr.sip
49+
%Include network/qgsgraphbuilder.sip
50+
%Include network/qgsgraphdirector.sip
51+
%Include network/networkanalysis.sip
52+
%Include network/qgsdistancearcproperter.sip

‎python/analysis/interpolation/Bezier3D.sip‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
class Bezier3D : ParametricLine
2+
{
3+
%TypeHeaderCode
4+
#include <Bezier3D.h>
5+
%End
6+
7+
public:
8+
/**Default constructor*/
9+
Bezier3D();
10+
/**Constructor, par is a pointer to the parent, controlpoly a controlpolygon*/
11+
// Bezier3D( ParametricLine* par, QVector<Point3D*>* controlpoly );
12+
/**Destructor*/
13+
virtual ~Bezier3D();
14+
/**Do not use this method, since a Bezier curve does not consist of other curves*/
15+
virtual void add( ParametricLine *pl );
16+
/**Calculates the first derivative and assigns it to v*/
17+
virtual void calcFirstDer( float t, Vector3D* v );
18+
/**Calculates the second derivative and assigns it to v*/
19+
virtual void calcSecDer( float t, Vector3D* v );
20+
//virtual Point3D calcPoint(float t);
21+
/**Calculates the point on the curve and assigns it to p*/
22+
virtual void calcPoint( float t, Point3D* p );
23+
/**changes the order of control points*/
24+
virtual void changeDirection();
25+
//virtual void draw(QPainter* p);
26+
//virtual bool intersects(ParametricLine* pal);
27+
/**Do not use this method, since a Bezier curve does not consist of other curves*/
28+
virtual void remove( int i );
29+
/**Returns a control point*/
30+
virtual const Point3D* getControlPoint( int number ) const;
31+
/**Returns a pointer to the control polygon*/
32+
// virtual const QVector<Point3D*>* getControlPoly() const;
33+
/**Returns the degree of the curve*/
34+
virtual int getDegree() const;
35+
/**Returns the parent*/
36+
virtual ParametricLine* getParent() const;
37+
/** Sets the parent*/
38+
virtual void setParent( ParametricLine* par );
39+
/**Sets the control polygon*/
40+
// virtual void setControlPoly( QVector<Point3D*>* cp );
41+
};

‎python/analysis/interpolation/CloughTocherInterpolator.sip‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
class CloughTocherInterpolator : TriangleInterpolator
2+
{
3+
%TypeHeaderCode
4+
#include <CloughTocherInterpolator.h>
5+
%End
6+
protected:
7+
/**Finds out, in which triangle the point with the coordinates x and y is*/
8+
void init( double x, double y );
9+
/**Calculates the Bernsteinpolynomials to calculate the Beziertriangle. 'n' is three in the cubical case, 'i', 'j', 'k' are the indices of the controllpoint and 'u', 'v', 'w' are the barycentric coordinates of the point*/
10+
double calcBernsteinPoly( int n, int i, int j, int k, double u, double v, double w );
11+
12+
public:
13+
/**standard constructor*/
14+
CloughTocherInterpolator();
15+
/**constructor with a pointer to the triangulation as argument*/
16+
CloughTocherInterpolator( NormVecDecorator* tin );
17+
/**destructor*/
18+
virtual ~CloughTocherInterpolator();
19+
/**Calculates the normal vector and assigns it to vec (not implemented at the moment)*/
20+
virtual bool calcNormVec( double x, double y, Vector3D* result );
21+
/**Performs a linear interpolation in a triangle and assigns the x-,y- and z-coordinates to point*/
22+
virtual bool calcPoint( double x, double y, Point3D* result );
23+
virtual void setTriangulation( NormVecDecorator* tin );
24+
};

0 commit comments

Comments
 (0)