Skip to content
Permalink
Browse files

Resolved merge conflicts

  • Loading branch information
timlinux committed Sep 3, 2012
2 parents 7cc62de + 56c15dc commit 2f6767fa1ec94da85a75141054ebe4dcb9f3b676
Showing with 18,711 additions and 9,853 deletions.
  1. +6 −9 CMakeLists.txt
  2. +1 −6 cmake/UsePythonTest.cmake
  3. +39 −39 doc/TRANSLATORS
  4. +2,321 −1,983 i18n/qgis_de.ts
  5. +3,709 −2,176 i18n/qgis_gl_ES.ts
  6. +7,274 −3,589 i18n/qgis_sv.ts
  7. +3 −0 images/images.qrc
  8. BIN images/themes/default/mIconClose.png
  9. BIN images/themes/default/mIconWarn.png
  10. BIN images/themes/gis/mIconClose.png
  11. BIN images/themes/gis/mIconWarn.png
  12. +4 −0 python/core/qgscomposition.sip
  13. +17 −2 python/core/qgsdistancearea.sip
  14. +11 −0 python/core/qgsexpression.sip
  15. +26 −2 python/core/qgsrasterdataprovider.sip
  16. +8 −8 python/core/qgsrasterlayer.sip
  17. +674 −634 python/core/qgsvectorlayer.sip
  18. +2 −1 python/plugins/db_manager/completer.py
  19. +13 −1 python/plugins/db_manager/db_plugins/postgis/connector.py
  20. +11 −1 python/plugins/db_manager/db_plugins/spatialite/connector.py
  21. +51 −0 python/utils.py
  22. BIN resources/symbology-ng-style.db
  23. +1 −1 scripts/symbol_xml2db.py
  24. +1 −1 src/analysis/network/qgsgraphbuilderintr.h
  25. +3 −0 src/app/CMakeLists.txt
  26. +14 −0 src/app/composer/qgscomposer.cpp
  27. +3 −0 src/app/composer/qgscomposer.h
  28. +12 −6 src/app/main.cpp
  29. +133 −19 src/app/qgisapp.cpp
  30. +16 −1 src/app/qgisapp.h
  31. +53 −3 src/app/qgsattributetypedialog.cpp
  32. +5 −0 src/app/qgsattributetypedialog.h
  33. +1 −5 src/app/qgsdecorationgrid.cpp
  34. +1 −5 src/app/qgsdecorationnortharrow.cpp
  35. +1 −6 src/app/qgsdecorationscalebar.cpp
  36. +90 −0 src/app/qgshtmlannotationdialog.cpp
  37. +40 −0 src/app/qgshtmlannotationdialog.h
  38. +128 −8 src/app/qgslabelinggui.cpp
  39. +8 −0 src/app/qgslabelinggui.h
  40. +8 −0 src/app/qgsmaptoolannotation.cpp
  41. +53 −0 src/app/qgsmaptoolhtmlannotation.cpp
  42. +33 −0 src/app/qgsmaptoolhtmlannotation.h
  43. +8 −28 src/app/qgsmaptoolidentify.cpp
  44. +1 −1 src/app/qgsmaptoolmeasureangle.cpp
  45. +60 −51 src/app/qgsmeasuredialog.cpp
  46. +2 −2 src/app/qgsmeasuredialog.h
  47. +1 −0 src/app/qgsmeasuretool.cpp
  48. +2 −0 src/app/qgsoptions.cpp
  49. +28 −1 src/app/qgsprojectproperties.cpp
  50. +5 −0 src/app/qgsprojectproperties.h
  51. +61 −49 src/app/qgsrasterlayerproperties.cpp
  52. 0 src/app/qgsvectorlayerproperties.cpp
  53. +19 −9 src/core/composer/qgscomposerscalebar.cpp
  54. +1 −1 src/core/composer/qgscomposition.cpp
  55. +2 −2 src/core/composer/qgsnumericscalebarstyle.cpp
  56. 0 src/core/pal/costcalculator.cpp
  57. +36 −1 src/core/qgis.cpp
  58. +13 −0 src/core/qgis.h
  59. +19 −24 src/core/qgsapplication.cpp
  60. +1 −1 src/core/qgsattributeaction.cpp
  61. +17 −3 src/core/qgscoordinatereferencesystem.cpp
  62. +22 −22 src/core/qgsdataitem.cpp
  63. +1 −7 src/core/qgsdiagramrendererv2.cpp
  64. +111 −13 src/core/qgsdistancearea.cpp
  65. +20 −3 src/core/qgsdistancearea.h
  66. +104 −7 src/core/qgsexpression.cpp
  67. +19 −1 src/core/qgsexpression.h
  68. +3 −3 src/core/qgslogger.cpp
  69. +2 −3 src/core/qgsmaprenderer.cpp
  70. +1 −1 src/core/qgsmaprenderer.h
  71. +188 −3 src/core/qgspallabeling.cpp
  72. +6 −0 src/core/qgspallabeling.h
  73. +21 −1 src/core/qgsrasterdataprovider.cpp
  74. +36 −5 src/core/qgsrasterdataprovider.h
  75. +8 −2 src/core/qgsvectorlayer.cpp
  76. +83 −52 src/core/qgsvectorlayer.h
  77. +155 −64 src/core/raster/qgsrasterfilewriter.cpp
  78. +17 −0 src/core/raster/qgsrasterfilewriter.h
  79. +1 −1 src/core/raster/qgsrasterinterface.cpp
  80. +1 −9 src/core/raster/qgsrasterlayer.cpp
  81. +8 −13 src/core/raster/qgsrasterlayer.h
  82. +1 −1 src/core/raster/qgsrasterpipe.cpp
  83. +80 −6 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  84. +1 −0 src/core/symbology-ng/qgsfillsymbollayerv2.h
  85. +8 −8 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  86. +2 −2 src/core/symbology-ng/qgsstylev2.cpp
  87. +5 −5 src/core/symbology-ng/qgsstylev2.h
  88. +76 −30 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  89. +5 −0 src/gui/CMakeLists.txt
  90. +35 −21 src/gui/qgsattributeeditor.cpp
  91. +236 −0 src/gui/qgshtmlannotationitem.cpp
  92. +79 −0 src/gui/qgshtmlannotationitem.h
  93. +4 −0 src/gui/qgsmapcanvas.cpp
  94. +5 −1 src/gui/qgsmapcanvas.h
  95. +1 −45 src/gui/qgsmaptip.cpp
  96. +1 −1 src/gui/qgsmaptool.cpp
  97. +211 −0 src/gui/qgsmessagebar.cpp
  98. +106 −0 src/gui/qgsmessagebar.h
  99. +1 −5 src/gui/qgsquickprint.cpp
  100. +96 −5 src/gui/qgsrasterlayersaveasdialog.cpp
  101. +11 −0 src/gui/qgsrasterlayersaveasdialog.h
  102. +82 −42 src/gui/qgsrasterpyramidsoptionswidget.cpp
  103. +15 −7 src/gui/qgsrasterpyramidsoptionswidget.h
  104. +1 −1 src/gui/raster/qgsrasterhistogramwidget.cpp
  105. +2 −2 src/gui/symbology-ng/qgslayerpropertieswidget.cpp
  106. +50 −14 src/gui/symbology-ng/qgsstylev2managerdialog.cpp
  107. +1 −1 src/gui/symbology-ng/qgssymbolv2selectordialog.h
  108. +1 −1 src/mapserver/qgsconfigparser.h
  109. +0 −1 src/mapserver/qgshttprequesthandler.cpp
  110. +0 −1 src/mapserver/qgswfsserver.cpp
  111. +0 −1 src/mapserver/qgswmsserver.cpp
  112. +1 −1 src/plugins/globe/globe_plugin.cpp
  113. +3 −9 src/plugins/grass/qgsgrassedit.cpp
  114. +1 −1 src/plugins/heatmap/heatmap.cpp
  115. +1 −1 src/plugins/heatmap/heatmapgui.cpp
  116. +11 −8 src/providers/gdal/qgsgdaldataitems.cpp
  117. +183 −49 src/providers/gdal/qgsgdalprovider.cpp
  118. +3 −2 src/providers/gdal/qgsgdalprovider.h
  119. +6 −1 src/providers/mssql/qgsmssqlnewconnection.cpp
  120. +12 −11 src/providers/mssql/qgsmssqlprovider.cpp
  121. +9 −9 src/providers/ogr/qgsogrdataitems.cpp
  122. +1 −1 src/providers/wcs/qgswcscapabilities.cpp
  123. +30 −24 src/providers/wcs/qgswcsprovider.cpp
  124. +6 −0 src/python/qgspythonutilsimpl.cpp
  125. +14 −1 src/ui/qgisapp.ui
  126. +53 −27 src/ui/qgsattributetypeedit.ui
  127. +527 −351 src/ui/qgslabelingguibase.ui
  128. +70 −16 src/ui/qgsoptionsbase.ui
  129. +39 −3 src/ui/qgsprojectpropertiesbase.ui
  130. +1 −1 src/ui/qgsrasterformatsaveoptionswidgetbase.ui
  131. +54 −82 src/ui/qgsrasterlayerpropertiesbase.ui
  132. +116 −17 src/ui/qgsrasterlayersaveasdialogbase.ui
  133. +60 −80 src/ui/qgsrasterpyramidsoptionswidgetbase.ui
  134. +1 −1 src/ui/qgsvectorlayerpropertiesbase.ui
  135. +0 −4 tests/CMakeLists.txt
  136. +2 −0 tests/src/core/CMakeLists.txt
  137. +2 −6 tests/src/core/testqgscomposerhtml.cpp
  138. +2 −2 tests/src/core/testqgscomposermap.cpp
  139. +143 −0 tests/src/core/testqgscomposerscalebar.cpp
  140. +169 −0 tests/src/core/testqgsdistancearea.cpp
  141. +4 −0 tests/src/core/testqgsexpression.cpp
  142. +6 −8 tests/src/core/testqgsrasterlayer.cpp
  143. +1 −1 tests/src/providers/testqgswcsprovider.cpp
  144. +1 −0 tests/src/python/CMakeLists.txt
  145. +2 −8 tests/src/python/qgscompositionchecker.py
  146. +78 −0 tests/src/python/test_qgscomposerhtml.py
  147. +4 −3 tests/src/python/test_qgscomposermap.py
  148. +3 −2 tests/src/python/test_qgscoordinatetransform.py
  149. +2 −13 tests/src/python/test_qgsgeometry.py
  150. +1 −17 tests/src/python/utilities.py
  151. +100 −0 tests/testdata/GeodTest-nano.dat
  152. +13 −0 tests/testdata/GeodTest.README
  153. BIN tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe2.png
  154. BIN tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe3.png
  155. BIN tests/testdata/control_images/expected_composerscalebar/composerscalebar_doublebox.png
  156. BIN tests/testdata/control_images/expected_composerscalebar/composerscalebar_numeric.png
  157. BIN tests/testdata/control_images/expected_composerscalebar/composerscalebar_singlebox.png
  158. BIN tests/testdata/control_images/expected_composerscalebar/composerscalebar_tick.png
  159. +3 −3 tests/testdata/points_uniquevalue_symbol.qml
@@ -461,19 +461,16 @@ SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_LIB_SUBDIR})

# write a marker with source directory path into the output's bin directory
# if run from the build directory QGIS will detect it and alter the paths
FILE(WRITE ${QGIS_OUTPUT_DIRECTORY}/${QGIS_BIN_SUBDIR}/source_path.txt "${CMAKE_SOURCE_DIR}")
FILE(WRITE ${QGIS_OUTPUT_DIRECTORY}/${QGIS_BIN_SUBDIR}/path.txt "${CMAKE_SOURCE_DIR}\n${QGIS_OUTPUT_DIRECTORY}")

# symlink provider plugins dir for Mac unit tests
# symlink extra provider plugin frameworks for Mac unit tests
IF (APPLE AND ENABLE_TESTS)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
"${CMAKE_CURRENT_BINARY_DIR}/Plugins"
"${CMAKE_CURRENT_BINARY_DIR}/output/Plugins")
"${CMAKE_BINARY_DIR}/Plugins/qgis/qgisgrass.framework"
"${CMAKE_BINARY_DIR}/output/lib/qgisgrass.framework")
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
"${CMAKE_CURRENT_BINARY_DIR}/Plugins/qgis/qgisgrass.framework"
"${CMAKE_CURRENT_BINARY_DIR}/output/lib/qgisgrass.framework")
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
"${CMAKE_CURRENT_BINARY_DIR}/Plugins/qgis/qgissqlanyconnection.framework"
"${CMAKE_CURRENT_BINARY_DIR}/output/lib/qgissqlanyconnection.framework")
"${CMAKE_BINARY_DIR}/Plugins/qgis/qgissqlanyconnection.framework"
"${CMAKE_BINARY_DIR}/output/lib/qgissqlanyconnection.framework")
ENDIF (APPLE AND ENABLE_TESTS)

# manual page - makes sense only on unix systems
@@ -46,11 +46,6 @@ ELSE(WIN32)
MESSAGE(\"LD_LIBRARY_PATH:\$ENV{LD_LIBRARY_PATH}\")
ENDIF(WIN32)
IF(APPLE)
SET(ENV{QGIS_MAC_PKGDATA_DIR} \"${CMAKE_SOURCE_DIR}\")
SET(ENV{QGIS_MAC_SVG_DIR} \"${CMAKE_SOURCE_DIR}/images/svg\")
ENDIF(APPLE)
MESSAGE(\"PYTHONPATH:\$ENV{PYTHONPATH}\")
MESSAGE(STATUS \"Running ${PYTHON_EXECUTABLE} ${loc} ${wo_semicolon}\")
EXECUTE_PROCESS(
@@ -82,6 +77,6 @@ MACRO(ADD_PYTHON_COMPILEALL_TEST DIRNAME)
GET_FILENAME_COMPONENT(temp_path "${PYTHON_LIBRARIES}" PATH)
# Find the python script:
GET_FILENAME_COMPONENT(PYTHON_COMPILE_ALL_PY "${temp_path}/../compileall.py" ABSOLUTE)
# add test, use DIRNAME to create uniq name for the test:
# add test, use DIRNAME to create unique name for the test:
ADD_TEST(COMPILE_ALL-${DIRNAME} ${PYTHON_EXECUTABLE} "${PYTHON_COMPILE_ALL_PY}" -q ${DIRNAME})
ENDMACRO(ADD_PYTHON_COMPILEALL_TEST)

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -168,6 +168,7 @@
<file>themes/default/mActionZoomOut.png</file>
<file>themes/default/mActionZoomToLayer.png</file>
<file>themes/default/mActionZoomToSelected.png</file>
<file>themes/default/mIconClose.png</file>
<file>themes/default/mIconConnect.png</file>
<file>themes/default/mIconDbSchema.png</file>
<file>themes/default/mIconDelete.png</file>
@@ -369,6 +370,7 @@
<file>themes/gis/mActionZoomOut.png</file>
<file>themes/gis/mActionZoomToLayer.png</file>
<file>themes/gis/mActionZoomToSelected.png</file>
<file>themes/gis/mIconClose.png</file>
<file>themes/gis/mIconEditable.png</file>
<file>themes/gis/mIconLineLayer.png</file>
<file>themes/gis/mIconPointLayer.png</file>
@@ -400,6 +402,7 @@
<file>themes/gis/mIconWcs.png</file>
<file>themes/gis/mIconWms.png</file>
<file>themes/gis/mIconWfs.png</file>
<file>themes/gis/mIconWarn.png</file>
<file>themes/gis/mIconSpatialite.png</file>
<file>themes/gis/mIconRaster.png</file>
<file>themes/gis/mIconPostgis.png</file>
Binary file not shown.
BIN +439 Bytes (300%) images/themes/default/mIconWarn.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -155,6 +155,10 @@ class QgsComposition: QGraphicsScene
/**Deletes current command*/
void cancelCommand();

/**Adds multiframe. The object is owned by QgsComposition until removeMultiFrame is called*/
void addMultiFrame( QgsComposerMultiFrame* multiFrame );
/**Removes multi frame (but does not delete it)*/
void removeMultiFrame( QgsComposerMultiFrame* multiFrame );
/**Adds an arrow item to the graphics scene and advices composer to create a widget for it (through signal)*/
//void addComposerArrow( QgsComposerArrow* arrow );
/**Adds label to the graphics scene and advices composer to create a widget for it (through signal)*/
@@ -13,11 +13,19 @@ class QgsDistanceArea
//! Destructor
~QgsDistanceArea();

//! Copy constructor
QgsDistanceArea(const QgsDistanceArea & origDA );

//! Assignment operator
operator=(const QgsDistanceArea & origDA );

//! sets whether coordinates must be projected to ellipsoid before measuring
void setProjectionsEnabled(bool flag);
void setEllipsoidalMode(bool flag);
void setProjectionsEnabled(bool flag) /Deprecated/;

//! returns projections enabled flag
bool hasCrsTransformEnabled();
bool ellipsoidalEnabled();
bool hasCrsTransformEnabled() /Deprecated/;

//! sets source spatial reference system (by QGIS CRS)
void setSourceCrs(long srsid);
@@ -37,6 +45,10 @@ class QgsDistanceArea
//! sets ellipsoid by its acronym
bool setEllipsoid(const QString& ellipsoid);

//! Sets ellipsoid by supplied radii
// Inverse flattening is calculated with invf = a/(a-b)
bool setEllipsoid( double semiMajor, double semiMinor );

//! returns ellipsoid's acronym
const QString& ellipsoid();

@@ -67,4 +79,7 @@ class QgsDistanceArea

static QString textUnit( double value, int decimals, QGis::UnitType u, bool isArea, bool keepBaseUnit = false );

//! Helper for conversion between physical units
void convertMeasurement( double &measure, QGis::UnitType &measureUnits, QGis::UnitType displayUnits, bool isArea );

};
@@ -50,6 +50,17 @@ public:
//! (used by internal functions)
QgsDistanceArea* geomCalculator();

/** This function currently replaces each expression between [% and %]
in the string with the result of its evaluation on the feature
passed as argument.

Additional substitutions can be passed through the substitutionMap
parameter
*/
static QString replaceExpressionText( QString action, QgsFeature &feat,
QgsVectorLayer* layer,
const QMap<QString, QVariant> *substitutionMap = 0);

//

enum UnaryOperator
@@ -79,8 +79,32 @@ class QgsRasterDataProvider : QgsDataProvider

// TODO: Get the file masks supported by this provider, suitable for feeding into the file open dialog box


/**
// TODO: add other missing bindings (histo, pyramids and others)

/** If the provider supports it, return band stats for the
given band. Default behaviour is to blockwise read the data
and generate the stats unless the provider overloads this function. */
//virtual QgsRasterBandStats bandStatistics( int theBandNo );

/** \brief Get band statistics.
* @param theBandNo The band (number).
* @param theStats Requested statistics
* @param theExtent Extent used to calc histogram, if empty, whole raster extent is used.
* @param theSampleSize Approximate number of cells in sample. If 0, all cells (whole raster will be used). If raster does not have exact size (WCS without exact size for example), provider decides size of sample.
* @return Band statistics.
*/
virtual QgsRasterBandStats bandStatistics( int theBandNo,
int theStats = QgsRasterBandStats::All,
const QgsRectangle & theExtent = QgsRectangle(),
int theSampleSize = 0 );

/** \brief Returns true if histogram is available (cached, already calculated), the parameters are the same as in histogram() */
virtual bool hasStatistics( int theBandNo,
int theStats = QgsRasterBandStats::All,
const QgsRectangle & theExtent = QgsRectangle(),
int theSampleSize = 0 );

/**
* Get metadata in a format suitable for feeding directly
* into a subset of the GUI raster properties "Metadata" tab.
*/
@@ -6,7 +6,7 @@
class QgsRasterLayer : QgsMapLayer
{
%TypeHeaderCode
#include <qgsrasterpyramid.h>
// #include <qgsrasterpyramid.h>
#include <qgsrasterlayer.h>
#include <qgscontrastenhancement.h>
#include <qgsrastertransparency.h>
@@ -91,12 +91,12 @@ public:
* to be added to the list. Each time a RasterPyramid is created
* we will check to see if a pyramid matching these dimensions already exists
* in the raster layer, and if so mark the exists flag as true */
typedef QList<QgsRasterPyramid> RasterPyramidList;
// typedef QList<QgsRasterPyramid> RasterPyramidList;

/** \brief A list containing one RasterBandStats struct per raster band in this raster layer.
* Note that while every RasterBandStats element will have the name and number of its associated
* band populated, any additional stats are calculated on a need to know basis.*/
typedef QList<QgsRasterBandStats> RasterStatsList;
// typedef QList<QgsRasterBandStats> RasterStatsList;



@@ -151,7 +151,7 @@ public:
//QString greenBandName() const; //removed with raster redesign

/** \brief Accessor for mHasPyramids (READ ONLY) */
bool hasPyramids();
// bool hasPyramids();

/** \brief Accessor for mUserDefinedGrayMinimumMaximum */
bool hasUserDefinedGrayMinimumMaximum() const;
@@ -248,7 +248,7 @@ public:
* ACTUALLY exists you need to look at the existsFlag member in each struct stored in the
* list.
*/
RasterPyramidList buildPyramidList();
// RasterPyramidList buildPyramidList();

/** \brief Accessor for color shader algorithm */
QString colorShadingAlgorithmAsString() const;
@@ -470,9 +470,9 @@ public:

public slots:
/** \brief Create GDAL pyramid overviews */
QString buildPyramids( const RasterPyramidList &,
const QString & theResamplingMethod = "NEAREST",
bool theTryInternalFlag = false );
// QString buildPyramids( const RasterPyramidList &,
// const QString & theResamplingMethod = "NEAREST",
// bool theTryInternalFlag = false );

void showStatusMessage( const QString & theMessage );

0 comments on commit 2f6767f

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