Skip to content
Permalink
Browse files

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

  • Loading branch information
timlinux committed Oct 24, 2011
2 parents 513f1c3 + 1a1f5eb commit 0d79669f7dfe8dcade4ece1ff494a420295316c7
Showing with 2,462 additions and 835 deletions.
  1. +657 −511 i18n/qgis_de.ts
  2. +1 −1 ms-windows/osgeo4w/package-nightly.cmd
  3. +1 −1 ms-windows/osgeo4w/package.cmd
  4. +2 −2 src/analysis/interpolation/DualEdgeTriangulation.cc
  5. +3 −2 src/analysis/interpolation/qgsgridfilewriter.cpp
  6. +4 −3 src/analysis/raster/qgsaspectfilter.h
  7. +2 −2 src/analysis/raster/qgsderivativefilter.cpp
  8. +3 −2 src/analysis/raster/qgsderivativefilter.h
  9. +5 −5 src/analysis/raster/qgsninecellfilter.cpp
  10. +6 −5 src/analysis/raster/qgsninecellfilter.h
  11. +1 −1 src/analysis/raster/qgsruggednessfilter.cpp
  12. +1 −1 src/analysis/raster/qgsruggednessfilter.h
  13. +3 −3 src/analysis/raster/qgsslopefilter.cpp
  14. +4 −3 src/analysis/raster/qgsslopefilter.h
  15. +5 −5 src/analysis/raster/qgstotalcurvaturefilter.cpp
  16. +4 −3 src/analysis/raster/qgstotalcurvaturefilter.h
  17. +2 −2 src/analysis/vector/qgsoverlayanalyzer.h
  18. +3 −3 src/analysis/vector/qgszonalstatistics.h
  19. +5 −5 src/app/composer/qgscomposerarrowwidget.cpp
  20. +2 −2 src/app/composer/qgscomposerarrowwidget.h
  21. +1 −1 src/app/composer/qgscomposermanager.h
  22. +1 −1 src/app/qgisapp.cpp
  23. +1 −1 src/app/qgsdecorationscalebardialog.cpp
  24. +1 −1 src/app/qgsfieldcalculator.cpp
  25. +2 −2 src/app/qgsformannotationdialog.cpp
  26. +40 −8 src/app/qgslabelinggui.cpp
  27. +1 −0 src/app/qgslabelinggui.h
  28. +2 −2 src/app/qgsmaptooladdvertex.cpp
  29. +1 −1 src/app/qgsmaptoolrotatepointsymbols.h
  30. +1 −1 src/app/qgspointrotationitem.h
  31. +27 −0 src/app/qgsvectorlayerproperties.cpp
  32. +1 −1 src/core/composer/qgscomposerarrow.cpp
  33. +2 −1 src/core/composer/qgscomposerattributetable.cpp
  34. +1 −1 src/core/composer/qgscomposeritem.h
  35. +2 −2 src/core/composer/qgscomposerlabel.cpp
  36. +6 −6 src/core/composer/qgscomposermap.cpp
  37. +2 −2 src/core/composer/qgscomposerpicture.cpp
  38. +1 −1 src/core/composer/qgscomposertable.cpp
  39. +1 −1 src/core/composer/qgscomposertable.h
  40. +2 −3 src/core/pal/feature.cpp
  41. +42 −31 src/core/qgsexpression.cpp
  42. +16 −3 src/core/qgsexpression.h
  43. +1 −1 src/core/qgsgeometry.cpp
  44. +1 −1 src/core/qgsgeometry.h
  45. +2 −2 src/core/qgslabel.cpp
  46. +1 −1 src/core/qgspalgeometry.h
  47. +69 −17 src/core/qgspallabeling.cpp
  48. +14 −3 src/core/qgspallabeling.h
  49. +3 −1 src/core/qgsvectordataprovider.h
  50. +7 −0 src/gui/CMakeLists.txt
  51. +6 −6 src/gui/qgsannotationitem.cpp
  52. +52 −0 src/gui/qgsexpressionbuilderdialog.cpp
  53. +40 −0 src/gui/qgsexpressionbuilderdialog.h
  54. +339 −0 src/gui/qgsexpressionbuilderwidget.cpp
  55. +170 −0 src/gui/qgsexpressionbuilderwidget.h
  56. +5 −5 src/gui/qgsformannotationitem.cpp
  57. +4 −2 src/mapserver/qgis_map_serv.cpp
  58. +1 −1 src/mapserver/qgscomparisonfilter.h
  59. +8 −4 src/mapserver/qgsconfigparser.cpp
  60. +1 −1 src/mapserver/qgsconfigparser.h
  61. +1 −1 src/mapserver/qgshttprequesthandler.cpp
  62. +1 −1 src/mapserver/qgsmslayerbuilder.h
  63. +1 −1 src/mapserver/qgssldrule.h
  64. +2 −2 src/mapserver/qgswmsserver.h
  65. +1 −1 src/plugins/diagram_overlay/qgsbardiagramfactory.h
  66. +3 −3 src/plugins/diagram_overlay/qgsdiagramfactory.h
  67. +1 −1 src/plugins/diagram_overlay/qgsdiagramrenderer.h
  68. +1 −1 src/plugins/diagram_overlay/qgssvgdiagramfactory.h
  69. +1 −1 src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
  70. +1 −1 src/plugins/georeferencer/qgsgcpcanvasitem.cpp
  71. +5 −3 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  72. +2 −2 src/plugins/georeferencer/qgsgeoreftransform.cpp
  73. +1 −1 src/plugins/georeferencer/qgsresidualplotitem.h
  74. +6 −8 src/plugins/globe/globe_plugin.cpp
  75. +0 −3 src/plugins/globe/globe_plugin_dialog.h
  76. +5 −5 src/plugins/globe/qgsosgearthtilesource.cpp
  77. +1 −1 src/plugins/grass/qgsgrassbrowser.cpp
  78. +3 −3 src/plugins/grass/qgsgrassselect.cpp
  79. +6 −5 src/plugins/grass/qgsgrassshell.cpp
  80. +1 −1 src/plugins/interpolation/qgsinterpolationdialog.cpp
  81. +1 −1 src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp
  82. +1 −1 src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h
  83. +2 −2 src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp
  84. +1 −1 src/plugins/roadgraph/shortestpathwidget.cpp
  85. +36 −8 src/providers/ogr/qgsogrprovider.cpp
  86. +13 −1 src/providers/ogr/qgsogrprovider.h
  87. +1 −1 src/providers/wfs/qgswfsdata.h
  88. +1 −1 src/providers/wfs/qgswfsprovider.cpp
  89. +495 −0 src/ui/qgsexpressionbuilder.ui
  90. +82 −0 src/ui/qgsexpressionbuilderdialogbase.ui
  91. +123 −47 src/ui/qgslabelingguibase.ui
  92. +1 −1 src/ui/qgsoptionsbase.ui
  93. +65 −49 src/ui/qgsvectorlayerpropertiesbase.ui
  94. +5 −0 tests/src/core/testqgsexpression.cpp

Large diffs are not rendered by default.

@@ -1,5 +1,5 @@
@echo off
set GRASS_VERSION=6.4.1
set GRASS_VERSION=6.4.2RC1

set BUILDDIR=%CD%\build
REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -1,5 +1,5 @@
@echo off
set GRASS_VERSION=6.4.1
set GRASS_VERSION=6.4.2RC2

set BUILDDIR=%CD%\build
REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -2939,11 +2939,11 @@ bool DualEdgeTriangulation::saveToTAFF( QString filename ) const

//export the points to the file
outstream << "POIN" << std::endl << std::flush;
outstream << "NPTS " << this->getNumberOfPoints() << std::endl << std::flush;
outstream << "NPTS " << getNumberOfPoints() << std::endl << std::flush;
outstream << "PATT 3" << std::endl << std::flush;
outstream << "DATA ";

for ( int i = 0; i < this->getNumberOfPoints(); i++ )
for ( int i = 0; i < getNumberOfPoints(); i++ )
{
Point3D* p = mPointVector[i];
outstream << p->getX() << " " << p->getY() << " " << p->getZ() << " ";
@@ -20,8 +20,9 @@
#include <QFile>
#include <QProgressDialog>

QgsGridFileWriter::QgsGridFileWriter( QgsInterpolator* i, QString outputPath, QgsRectangle extent, int nCols, int nRows , double cellSizeX, double cellSizeY ): \
mInterpolator( i ), mOutputFilePath( outputPath ), mInterpolationExtent( extent ), mNumColumns( nCols ), mNumRows( nRows ), mCellSizeX( cellSizeX ), mCellSizeY( cellSizeY )
QgsGridFileWriter::QgsGridFileWriter( QgsInterpolator* i, QString outputPath, QgsRectangle extent, int nCols, int nRows , double cellSizeX, double cellSizeY )
: mInterpolator( i ), mOutputFilePath( outputPath ), mInterpolationExtent( extent ), mNumColumns( nCols ), mNumRows( nRows )
, mCellSizeX( cellSizeX ), mCellSizeY( cellSizeY )
{

}
@@ -29,10 +29,11 @@ class ANALYSIS_EXPORT QgsAspectFilter: public QgsDerivativeFilter

protected:
protected:
/**Calculates output value from nine input values. The input values and the output value can be equal to the \
/**Calculates output value from nine input values. The input values and the output value can be equal to the
nodata value if not present or outside of the border. Must be implemented by subclasses*/
float processNineCellWindow( float* x11, float* x21, float* x31, \
float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 );
float processNineCellWindow( float* x11, float* x21, float* x31,
float* x12, float* x22, float* x32,
float* x13, float* x23, float* x33 );
};

#endif // QGSASPECTFILTER_H
@@ -17,8 +17,8 @@

#include "qgsderivativefilter.h"

QgsDerivativeFilter::QgsDerivativeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): \
QgsNineCellFilter( inputFile, outputFile, outputFormat )
QgsDerivativeFilter::QgsDerivativeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat )
: QgsNineCellFilter( inputFile, outputFile, outputFormat )
{

}
@@ -27,8 +27,9 @@ class QgsDerivativeFilter: public QgsNineCellFilter
QgsDerivativeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat );
virtual ~QgsDerivativeFilter();
//to be implemented by subclasses
virtual float processNineCellWindow( float* x11, float* x21, float* x31, float* x12, float* x22, \
float* x32, float* x13, float* x23, float* x33 ) = 0;
virtual float processNineCellWindow( float* x11, float* x21, float* x31,
float* x12, float* x22, float* x32,
float* x13, float* x23, float* x33 ) = 0;

protected:
/**Calculates the first order derivative in x-direction according to Horn (1981)*/
@@ -25,8 +25,8 @@
#define TO8(x) (x).toLocal8Bit().constData()
#endif

QgsNineCellFilter::QgsNineCellFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): \
mInputFile( inputFile ), mOutputFile( outputFile ), mOutputFormat( outputFormat ), mCellSizeX( -1 ), mCellSizeY( -1 ), mInputNodataValue( -1 ), mOutputNodataValue( -1 )
QgsNineCellFilter::QgsNineCellFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat )
: mInputFile( inputFile ), mOutputFile( outputFile ), mOutputFormat( outputFormat ), mCellSizeX( -1 ), mCellSizeY( -1 ), mInputNodataValue( -1 ), mOutputNodataValue( -1 )
{

}
@@ -153,17 +153,17 @@ int QgsNineCellFilter::processRaster( QProgressDialog* p )
{
if ( j == 0 )
{
resultLine[j] = processNineCellWindow( &mInputNodataValue, &scanLine1[j], &scanLine1[j+1], &mInputNodataValue, &scanLine2[j], \
resultLine[j] = processNineCellWindow( &mInputNodataValue, &scanLine1[j], &scanLine1[j+1], &mInputNodataValue, &scanLine2[j],
&scanLine2[j+1], &mInputNodataValue, &scanLine3[j], &scanLine3[j+1] );
}
else if ( j == xSize - 1 )
{
resultLine[j] = processNineCellWindow( &scanLine1[j-1], &scanLine1[j], &mInputNodataValue, &scanLine2[j-1], &scanLine2[j], \
resultLine[j] = processNineCellWindow( &scanLine1[j-1], &scanLine1[j], &mInputNodataValue, &scanLine2[j-1], &scanLine2[j],
&mInputNodataValue, &scanLine3[j-1], &scanLine3[j], &mInputNodataValue );
}
else
{
resultLine[j] = processNineCellWindow( &scanLine1[j-1], &scanLine1[j], &scanLine1[j+1], &scanLine2[j-1], &scanLine2[j], \
resultLine[j] = processNineCellWindow( &scanLine1[j-1], &scanLine1[j], &scanLine1[j+1], &scanLine2[j-1], &scanLine2[j],
&scanLine2[j+1], &scanLine3[j-1], &scanLine3[j], &scanLine3[j+1] );
}
}
@@ -23,8 +23,8 @@

class QProgressDialog;

/**Base class for raster analysis methods that work with a 3x3 cell filter and calculate the value of each cell based on \
the cell value and the eight neighbour cells. Common examples are slope and aspect calculation in DEMs. Subclasses only implement \
/**Base class for raster analysis methods that work with a 3x3 cell filter and calculate the value of each cell based on
the cell value and the eight neighbour cells. Common examples are slope and aspect calculation in DEMs. Subclasses only implement
the method that calculates the new value from the nine values. Everything else (reading file, writing file) is done by this subclass*/

class ANALYSIS_EXPORT QgsNineCellFilter
@@ -52,10 +52,11 @@ class ANALYSIS_EXPORT QgsNineCellFilter
GDALDatasetH openOutputFile( GDALDatasetH inputDataset, GDALDriverH outputDriver );

protected:
/**Calculates output value from nine input values. The input values and the output value can be equal to the \
/**Calculates output value from nine input values. The input values and the output value can be equal to the
nodata value if not present or outside of the border. Must be implemented by subclasses*/
virtual float processNineCellWindow( float* x11, float* x21, float* x31, \
float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 ) = 0;
virtual float processNineCellWindow( float* x11, float* x21, float* x31,
float* x12, float* x22, float* x32,
float* x13, float* x23, float* x33 ) = 0;

QString mInputFile;
QString mOutputFile;
@@ -33,7 +33,7 @@ QgsRuggednessFilter::~QgsRuggednessFilter()

}

float QgsRuggednessFilter::processNineCellWindow( float* x11, float* x21, float* x31, \
float QgsRuggednessFilter::processNineCellWindow( float* x11, float* x21, float* x31,
float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 )
{
//the formula would be that easy without nodata values...
@@ -29,7 +29,7 @@ class ANALYSIS_EXPORT QgsRuggednessFilter: public QgsNineCellFilter
~QgsRuggednessFilter();

protected:
/**Calculates output value from nine input values. The input values and the output value can be equal to the \
/**Calculates output value from nine input values. The input values and the output value can be equal to the
nodata value if not present or outside of the border. Must be implemented by subclasses*/
float processNineCellWindow( float* x11, float* x21, float* x31, \
float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 );
@@ -17,8 +17,8 @@

#include "qgsslopefilter.h"

QgsSlopeFilter::QgsSlopeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): \
QgsDerivativeFilter( inputFile, outputFile, outputFormat )
QgsSlopeFilter::QgsSlopeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat )
: QgsDerivativeFilter( inputFile, outputFile, outputFormat )
{

}
@@ -28,7 +28,7 @@ QgsSlopeFilter::~QgsSlopeFilter()

}

float QgsSlopeFilter::processNineCellWindow( float* x11, float* x21, float* x31, \
float QgsSlopeFilter::processNineCellWindow( float* x11, float* x21, float* x31,
float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 )
{
float derX = calcFirstDerX( x11, x21, x31, x12, x22, x32, x13, x23, x33 );
@@ -28,10 +28,11 @@ class ANALYSIS_EXPORT QgsSlopeFilter: public QgsDerivativeFilter
~QgsSlopeFilter();

protected:
/**Calculates output value from nine input values. The input values and the output value can be equal to the \
/**Calculates output value from nine input values. The input values and the output value can be equal to the
nodata value if not present or outside of the border. Must be implemented by subclasses*/
float processNineCellWindow( float* x11, float* x21, float* x31, \
float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 );
float processNineCellWindow( float* x11, float* x21, float* x31,
float* x12, float* x22, float* x32,
float* x13, float* x23, float* x33 );
};

#endif // QGSSLOPEFILTER_H
@@ -17,8 +17,8 @@

#include "qgstotalcurvaturefilter.h"

QgsTotalCurvatureFilter::QgsTotalCurvatureFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): \
QgsNineCellFilter( inputFile, outputFile, outputFormat )
QgsTotalCurvatureFilter::QgsTotalCurvatureFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat )
: QgsNineCellFilter( inputFile, outputFile, outputFormat )
{

}
@@ -28,12 +28,12 @@ QgsTotalCurvatureFilter::~QgsTotalCurvatureFilter()

}

float QgsTotalCurvatureFilter::processNineCellWindow( float* x11, float* x21, float* x31, float* x12, \
float QgsTotalCurvatureFilter::processNineCellWindow( float* x11, float* x21, float* x31, float* x12,
float* x22, float* x32, float* x13, float* x23, float* x33 )
{
//return nodata if one value is the nodata value
if ( *x11 == mInputNodataValue || *x21 == mInputNodataValue || *x31 == mInputNodataValue || *x12 == mInputNodataValue \
|| *x22 == mInputNodataValue || *x32 == mInputNodataValue || *x13 == mInputNodataValue || *x23 == mInputNodataValue \
if ( *x11 == mInputNodataValue || *x21 == mInputNodataValue || *x31 == mInputNodataValue || *x12 == mInputNodataValue
|| *x22 == mInputNodataValue || *x32 == mInputNodataValue || *x13 == mInputNodataValue || *x23 == mInputNodataValue
|| *x33 == mInputNodataValue )
{
return mOutputNodataValue;
@@ -28,10 +28,11 @@ class ANALYSIS_EXPORT QgsTotalCurvatureFilter: public QgsNineCellFilter
~QgsTotalCurvatureFilter();

protected:
/**Calculates total curvature from nine input values. The input values and the output value can be equal to the \
/**Calculates total curvature from nine input values. The input values and the output value can be equal to the
nodata value if not present or outside of the border. Must be implemented by subclasses*/
float processNineCellWindow( float* x11, float* x21, float* x31, \
float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 );
float processNineCellWindow( float* x11, float* x21, float* x31,
float* x12, float* x22, float* x32,
float* x13, float* x23, float* x33 );
};

#endif // QGSTOTALCURVATUREFILTER_H
@@ -45,8 +45,8 @@ class ANALYSIS_EXPORT QgsOverlayAnalyzer
@param onlySelectedFeatures if true, only selected features are considered, else all the features
@param p progress dialog (or 0 if no progress dialog is to be shown)
@note: added in version 1.4*/
bool intersection( QgsVectorLayer* layerA, QgsVectorLayer* layerB, \
const QString& shapefileName, bool onlySelectedFeatures = false, \
bool intersection( QgsVectorLayer* layerA, QgsVectorLayer* layerB,
const QString& shapefileName, bool onlySelectedFeatures = false,
QProgressDialog* p = 0 );

#if 0
@@ -44,14 +44,14 @@ class ANALYSIS_EXPORT QgsZonalStatistics
int& offsetX, int& offsetY, int& nCellsX, int& nCellsY ) const;

/**Returns statistics by considering the pixels where the center point is within the polygon (fast)*/
void statisticsFromMiddlePointTest( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY, \
void statisticsFromMiddlePointTest( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY,
double cellSizeX, double cellSizeY, const QgsRectangle& rasterBBox, double& sum, double& count );

void statisticsFromMiddlePointTest_improved( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY, \
void statisticsFromMiddlePointTest_improved( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY,
double cellSizeX, double cellSizeY, const QgsRectangle& rasterBBox, double& sum, double& count );

/**Returns statistics with precise pixel - polygon intersection test (slow) */
void statisticsFromPreciseIntersection( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY, \
void statisticsFromPreciseIntersection( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY,
double cellSizeX, double cellSizeY, const QgsRectangle& rasterBBox, double& sum, double& count );


@@ -184,13 +184,13 @@ void QgsComposerArrowWidget::on_mSvgMarkerRadioButton_toggled( bool toggled )
}
}

void QgsComposerArrowWidget::on_mStartMarkerLineEdit_editingFinished( const QString & text )
void QgsComposerArrowWidget::on_mStartMarkerLineEdit_textChanged( const QString & text )
{
if ( mArrow )
{
mArrow->beginCommand( tr( "Arrow start marker" ) );
QFileInfo fi( text );
if ( fi.exists() )
if ( fi.exists() && fi.isFile() )
{
mArrow->setStartMarker( text );
}
@@ -203,13 +203,13 @@ void QgsComposerArrowWidget::on_mStartMarkerLineEdit_editingFinished( const QStr
}
}

void QgsComposerArrowWidget::on_mEndMarkerLineEdit_editingFinished( const QString & text )
void QgsComposerArrowWidget::on_mEndMarkerLineEdit_textChanged( const QString & text )
{
if ( mArrow )
{
mArrow->beginCommand( tr( "Arrow start marker" ) );
mArrow->beginCommand( tr( "Arrow end marker" ) );
QFileInfo fi( text );
if ( fi.exists() )
if ( fi.exists() && fi.isFile() )
{
mArrow->setEndMarker( text );
}
@@ -46,8 +46,8 @@ class QgsComposerArrowWidget: public QWidget, private Ui::QgsComposerArrowWidget
void on_mDefaultMarkerRadioButton_toggled( bool toggled );
void on_mNoMarkerRadioButton_toggled( bool toggled );
void on_mSvgMarkerRadioButton_toggled( bool toggled );
void on_mStartMarkerLineEdit_editingFinished( const QString & text );
void on_mEndMarkerLineEdit_editingFinished( const QString & text );
void on_mStartMarkerLineEdit_textChanged( const QString & text );
void on_mEndMarkerLineEdit_textChanged( const QString & text );
void on_mStartMarkerToolButton_clicked();
void on_mEndMarkerToolButton_clicked();

@@ -22,7 +22,7 @@
class QListWidgetItem;
class QgsComposer;

/**A dialog that shows the existing composer instances. Lets the user add new \
/**A dialog that shows the existing composer instances. Lets the user add new
instances and change title of existing ones*/
class QgsComposerManager: public QDialog, private Ui::QgsComposerManagerBase
{
@@ -3517,7 +3517,7 @@ QgsGeometry* QgisApp::unionGeometries( const QgsVectorLayer* vl, QgsFeatureList&

//convert unionGeom to a multipart geometry in case it is necessary to match the layer type
QGis::WkbType t = vl->wkbType();
bool layerIsMultiType = ( t == QGis::WKBMultiPoint || t == QGis::WKBMultiPoint25D || t == QGis::WKBMultiLineString \
bool layerIsMultiType = ( t == QGis::WKBMultiPoint || t == QGis::WKBMultiPoint25D || t == QGis::WKBMultiLineString
|| t == QGis::WKBMultiLineString25D || t == QGis::WKBMultiPolygon || t == QGis::WKBMultiPoint25D );
if ( layerIsMultiType && !unionGeom->isMultipart() )
{
@@ -42,7 +42,7 @@ QgsDecorationScaleBarDialog::QgsDecorationScaleBarDialog( QgsDecorationScaleBar&
spnSize->setValue( mDeco.mPreferredSize );

chkSnapping->setChecked( mDeco.mSnapping );
\

cboPlacement->clear();
cboPlacement->addItems( mDeco.mPlacementLabels );
cboPlacement->setCurrentIndex( mDeco.mPlacementIndex );
@@ -476,7 +476,7 @@ void QgsFieldCalculator::getFieldValues( int limit )
void QgsFieldCalculator::setOkButtonState()
{
bool okEnabled = true;
if (( mOutputFieldNameLineEdit->text().isEmpty() && mUpdateExistingFieldCheckBox->checkState() == Qt::Unchecked )\
if (( mOutputFieldNameLineEdit->text().isEmpty() && mUpdateExistingFieldCheckBox->checkState() == Qt::Unchecked )
|| mExpressionTextEdit->toPlainText().isEmpty() )
{
okEnabled = false;
@@ -5,8 +5,8 @@
#include <QFileInfo>
#include <QGraphicsScene>

QgsFormAnnotationDialog::QgsFormAnnotationDialog( QgsFormAnnotationItem* item, QWidget * parent, Qt::WindowFlags f ): \
QDialog( parent, f ), mItem( item ), mEmbeddedWidget( 0 )
QgsFormAnnotationDialog::QgsFormAnnotationDialog( QgsFormAnnotationItem* item, QWidget * parent, Qt::WindowFlags f )
: QDialog( parent, f ), mItem( item ), mEmbeddedWidget( 0 )
{
setupUi( this );
mEmbeddedWidget = new QgsAnnotationWidget( mItem );

0 comments on commit 0d79669

Please sign in to comment.
You can’t perform that action at this time.