Skip to content
Permalink
Browse files

Revert "Merge pull request #245 from Oslandia/atlas_integration"

This reverts commit fe8385e, reversing
changes made to 23352ce.
  • Loading branch information
timlinux committed Oct 1, 2012
1 parent a654e27 commit 8a1953b9e710ea25dac502b32eab9e0e8d652b10
Showing with 200 additions and 2,045 deletions.
  1. +1 −12 python/core/qgsexpression.sip
  2. +66 −466 src/app/composer/qgscomposer.cpp
  3. +0 −29 src/app/composer/qgscomposerlabelwidget.cpp
  4. +0 −1 src/app/composer/qgscomposerlabelwidget.h
  5. +0 −169 src/app/composer/qgscomposermapwidget.cpp
  6. +4 −14 src/app/composer/qgscomposermapwidget.h
  7. +0 −1 src/core/composer/qgscomposeritem.h
  8. +5 −21 src/core/composer/qgscomposerlabel.cpp
  9. +0 −10 src/core/composer/qgscomposerlabel.h
  10. +3 −69 src/core/composer/qgscomposermap.cpp
  11. +1 −32 src/core/composer/qgscomposermap.h
  12. +18 −324 src/core/composer/qgscomposition.cpp
  13. +1 −59 src/core/composer/qgscomposition.h
  14. +9 −107 src/core/qgsexpression.cpp
  15. +1 −19 src/core/qgsexpression.h
  16. +4 −16 src/core/qgsexpressionparser.yy
  17. +7 −7 src/gui/qgscomposerview.cpp
  18. +2 −18 src/gui/qgsexpressionbuilderwidget.cpp
  19. +11 −18 src/ui/qgscomposerlabelwidgetbase.ui
  20. +5 −5 src/ui/qgscomposerlegendwidgetbase.ui
  21. +62 −212 src/ui/qgscomposermapwidgetbase.ui
  22. +0 −2 tests/src/core/CMakeLists.txt
  23. +0 −181 tests/src/core/testqgscomposerlabel.cpp
  24. +0 −224 tests/src/core/testqgscomposermapatlas.cpp
  25. +0 −27 tests/src/core/testqgsexpression.cpp
  26. BIN tests/testdata/control_images/expected_composermapatlas/autoscale_0.png
  27. BIN tests/testdata/control_images/expected_composermapatlas/autoscale_1.png
  28. BIN tests/testdata/control_images/expected_composermapatlas/fixedscale_0.png
  29. BIN tests/testdata/control_images/expected_composermapatlas/fixedscale_1.png
  30. BIN tests/testdata/control_images/expected_composermapatlas/hiding_0.png
  31. BIN tests/testdata/control_images/expected_composermapatlas/hiding_1.png
  32. BIN tests/testdata/france_parts.dbf
  33. +0 −1 tests/testdata/france_parts.prj
  34. +0 −1 tests/testdata/france_parts.qpj
  35. BIN tests/testdata/france_parts.shp
  36. BIN tests/testdata/france_parts.shx
@@ -43,13 +43,6 @@ class QgsExpression
//! Return the number used for $rownum special column
int currentRowNumber();

//! Assign a special column
static void setSpecialColumn( const QString& name, QVariant value );
//! Unset a special column
static void unsetSpecialColumn( const QString& name );
//! Return the value of the given special column or a null QVariant if undefined
static QVariant specialColumn( const QString& name );

void setScale( double scale );

int scale();
@@ -71,6 +64,7 @@ class QgsExpression
static QString replaceExpressionText( QString action, QgsFeature &feat,
QgsVectorLayer* layer,
const QMap<QString, QVariant> *substitutionMap = 0 );

//

enum UnaryOperator
@@ -147,11 +141,6 @@ class QgsExpression
*/
static int functionCount();

/**
* Returns a list of special Column definitions
*/
static QList<QgsExpression::FunctionDef> specialColumns();

//! return quoted column reference (in double quotes)
static QString quotedColumnRef( QString name );
//! return quoted string (in single quotes)

0 comments on commit 8a1953b

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