Add tests for data defined diagram properties

qgis · Jan 23, 2017 · 07315bf · 07315bf
1 parent a4ef9ad
commit 07315bf
Show file tree

Hide file tree

Showing 15 changed files with 130 additions and 7 deletions.
diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp
@@ -25,13 +25,15 @@
 //qgis includes...
 // #include <qgisapp.h>
 #include <diagram/qgspiediagram.h>
+#include <diagram/qgstextdiagram.h>
 #include <qgsdiagramrenderer.h>
 #include <qgsmaplayer.h>
 #include <qgsvectordataprovider.h>
 #include <qgsvectorlayer.h>
 #include <qgsapplication.h>
 #include <qgsproviderregistry.h>
 #include <qgsrenderer.h>
+#include "qgssinglesymbolrenderer.h"
 //qgis test includes
 #include "qgsmultirenderchecker.h"
 #include "qgspallabeling.h"
@@ -87,6 +89,14 @@ class TestQgsDiagram : public QObject
       mPointsLayer = new QgsVectorLayer( myPointFileInfo.filePath(),
                                          myPointFileInfo.completeBaseName(), QStringLiteral( "ogr" ) );
 
+      //we don't want to render the points themselves, just the diagrams
+      QgsStringMap symbolProps;
+      symbolProps.insert( "color", "0,0,0,0" );
+      symbolProps.insert( "outline_style", "no" );
+      QgsMarkerSymbol* symbol = QgsMarkerSymbol::createSimple( symbolProps );
+      QgsSingleSymbolRenderer* symbolRenderer = new QgsSingleSymbolRenderer( symbol );
+      mPointsLayer->setRenderer( symbolRenderer );
+
       // Create map composition to draw on
       mMapSettings->setLayers( QList<QgsMapLayer*>() << mPointsLayer );
 
@@ -204,6 +214,118 @@ class TestQgsDiagram : public QObject
       mPointsLayer->setDiagramRenderer( 0 );
     }
 
+    void testDataDefinedPosition()
+    {
+      QgsDiagramSettings ds;
+      QColor col1 = Qt::red;
+      QColor col2 = Qt::yellow;
+      col1.setAlphaF( 0.5 );
+      col2.setAlphaF( 0.5 );
+      ds.categoryColors = QList<QColor>() << col1 << col2;
+      ds.categoryAttributes = QList<QString>() << "\"Pilots\"" << "\"Cabin Crew\"";
+      ds.maxScaleDenominator = -1;
+      ds.minScaleDenominator = -1;
+      ds.minimumSize = 0;
+      ds.penColor = Qt::green;
+      ds.penWidth = .5;
+      ds.scaleByArea = true;
+      ds.sizeType = QgsUnitTypes::RenderMillimeters;
+      ds.size = QSizeF( 15, 15 );
+      ds.angleOffset = 0;
+
+      QgsSingleCategoryDiagramRenderer *dr = new QgsSingleCategoryDiagramRenderer();
+      dr->setDiagram( new QgsPieDiagram() );
+      dr->setDiagramSettings( ds );
+      mPointsLayer->setDiagramRenderer( dr );
+
+      QgsDiagramLayerSettings dls = QgsDiagramLayerSettings();
+      dls.setPlacement( QgsDiagramLayerSettings::OverPoint );
+      dls.setShowAllDiagrams( true );
+
+      //Set data defined position
+      dls.properties().setProperty( QgsDiagramLayerSettings::PositionX, new QgsExpressionBasedProperty( "$x + -5", true ) );
+      dls.properties().setProperty( QgsDiagramLayerSettings::PositionY, new QgsExpressionBasedProperty( "$y + 5", true ) );
+
+      mPointsLayer->setDiagramLayerSettings( dls );
+
+      QVERIFY( imageCheck( "piediagram_datadefined_position" ) );
+    }
+
+    void testDataDefinedOutline()
+    {
+      QgsDiagramSettings ds;
+      QColor col1 = Qt::red;
+      QColor col2 = Qt::yellow;
+      col1.setAlphaF( 0.5 );
+      col2.setAlphaF( 0.5 );
+      ds.categoryColors = QList<QColor>() << col1 << col2;
+      ds.categoryAttributes = QList<QString>() << "\"Pilots\"" << "\"Cabin Crew\"";
+      ds.maxScaleDenominator = -1;
+      ds.minScaleDenominator = -1;
+      ds.minimumSize = 0;
+      ds.penColor = Qt::green;
+      ds.penWidth = .5;
+      ds.scaleByArea = true;
+      ds.sizeType = QgsUnitTypes::RenderMillimeters;
+      ds.size = QSizeF( 15, 15 );
+      ds.angleOffset = 0;
+
+      QgsSingleCategoryDiagramRenderer *dr = new QgsSingleCategoryDiagramRenderer();
+      dr->setDiagram( new QgsPieDiagram() );
+      dr->setDiagramSettings( ds );
+      mPointsLayer->setDiagramRenderer( dr );
+
+      QgsDiagramLayerSettings dls = QgsDiagramLayerSettings();
+      dls.setPlacement( QgsDiagramLayerSettings::OverPoint );
+      dls.setShowAllDiagrams( true );
+
+      //setup data defined outline
+      dls.properties().setProperty( QgsDiagramLayerSettings::OutlineColor, new QgsExpressionBasedProperty( "if(\"Pilots\">1,'0,0,0,255','255,0,0,255')", true ) );
+      dls.properties().setProperty( QgsDiagramLayerSettings::OutlineWidth, new QgsExpressionBasedProperty( "\"Staff\" / 2.0", true ) );
+
+      mPointsLayer->setDiagramLayerSettings( dls );
+
+      QVERIFY( imageCheck( "piediagram_datadefined_outline" ) );
+    }
+
+
+    void testDataDefinedBackgroundColor()
+    {
+      QgsDiagramSettings ds;
+      QColor col1 = Qt::red;
+      QColor col2 = Qt::yellow;
+      //hide the text so we are just testing the background color
+      col1.setAlphaF( 0 );
+      col2.setAlphaF( 0 );
+      ds.categoryColors = QList<QColor>() << col1 << col2;
+      ds.categoryAttributes = QList<QString>() << "\"Pilots\"" << "\"Cabin Crew\"";
+      ds.maxScaleDenominator = -1;
+      ds.minScaleDenominator = -1;
+      ds.minimumSize = 0;
+      ds.penColor = Qt::green;
+      ds.penWidth = .5;
+      ds.scaleByArea = true;
+      ds.sizeType = QgsUnitTypes::RenderMillimeters;
+      ds.size = QSizeF( 15, 15 );
+      ds.angleOffset = 0;
+
+      QgsSingleCategoryDiagramRenderer *dr = new QgsSingleCategoryDiagramRenderer();
+      dr->setDiagram( new QgsTextDiagram() );
+      dr->setDiagramSettings( ds );
+      mPointsLayer->setDiagramRenderer( dr );
+
+      QgsDiagramLayerSettings dls = QgsDiagramLayerSettings();
+      dls.setPlacement( QgsDiagramLayerSettings::OverPoint );
+      dls.setShowAllDiagrams( true );
+
+      //setup data defined outline
+      dls.properties().setProperty( QgsDiagramLayerSettings::BackgroundColor, new QgsExpressionBasedProperty( "if(\"Pilots\">1,'0,0,255,150','255,0,0,150')", true ) );
+
+      mPointsLayer->setDiagramLayerSettings( dls );
+
+      QVERIFY( imageCheck( "textdiagram_datadefined_background" ) );
+    }
+
 };
 
 bool TestQgsDiagram::imageCheck( const QString& theTestType )
@@ -215,13 +337,14 @@ bool TestQgsDiagram::imageCheck( const QString& theTestType )
   mMapSettings->setExtent( extent );
   mMapSettings->setFlag( QgsMapSettings::ForceVectorOutput );
   mMapSettings->setOutputDpi( 96 );
-  QgsMultiRenderChecker myChecker;
-  myChecker.setControlName( "expected_" + theTestType );
-  myChecker.setMapSettings( *mMapSettings );
-  myChecker.setColorTolerance( 15 );
-  bool myResultFlag = myChecker.runTest( theTestType, 200 );
-  mReport += myChecker.report();
-  return myResultFlag;
+  QgsMultiRenderChecker checker;
+  checker.setControlPathPrefix( "diagrams" );
+  checker.setControlName( "expected_" + theTestType );
+  checker.setMapSettings( *mMapSettings );
+  checker.setColorTolerance( 15 );
+  bool resultFlag = checker.runTest( theTestType, 200 );
+  mReport += checker.report();
+  return resultFlag;
 }
 
 QGSTEST_MAIN( TestQgsDiagram )

diff --git a/tests/testdata/control_images/diagrams/expected_piediagram/expected_piediagram.png b/tests/testdata/control_images/diagrams/expected_piediagram/expected_piediagram.png
diff --git a/...stdata/control_images/diagrams/expected_piediagram/expected_piediagram_mask.png b/...stdata/control_images/diagrams/expected_piediagram/expected_piediagram_mask.png
diff --git a/...cted_piediagram_datadefined_outline/expected_piediagram_datadefined_outline.png b/...cted_piediagram_datadefined_outline/expected_piediagram_datadefined_outline.png
diff --git a/...piediagram_datadefined_outline/expected_piediagram_datadefined_outline_mask.png b/...piediagram_datadefined_outline/expected_piediagram_datadefined_outline_mask.png
diff --git a/...ed_piediagram_datadefined_position/expected_piediagram_datadefined_position.png b/...ed_piediagram_datadefined_position/expected_piediagram_datadefined_position.png
diff --git a/...ediagram_datadefined_position/expected_piediagram_datadefined_position_mask.png b/...ediagram_datadefined_position/expected_piediagram_datadefined_position_mask.png
diff --git a/...ages/diagrams/expected_piediagram_expression/expected_piediagram_expression.png b/...ages/diagrams/expected_piediagram_expression/expected_piediagram_expression.png
diff --git a/...diagrams/expected_piediagram_expression/expected_piediagram_expression_mask.png b/...diagrams/expected_piediagram_expression/expected_piediagram_expression_mask.png
diff --git a/...tdiagram_datadefined_background/expected_textdiagram_datadefined_background.png b/...tdiagram_datadefined_background/expected_textdiagram_datadefined_background.png
diff --git a/...ram_datadefined_background/expected_textdiagram_datadefined_background_mask.png b/...ram_datadefined_background/expected_textdiagram_datadefined_background_mask.png
diff --git a/tests/testdata/control_images/expected_piediagram/expected_piediagram.png b/tests/testdata/control_images/expected_piediagram/expected_piediagram.png
diff --git a/tests/testdata/control_images/expected_piediagram/expected_piediagram_mask.png b/tests/testdata/control_images/expected_piediagram/expected_piediagram_mask.png
diff --git a/...ontrol_images/expected_piediagram_expression/expected_piediagram_expression.png b/...ontrol_images/expected_piediagram_expression/expected_piediagram_expression.png
diff --git a/...l_images/expected_piediagram_expression/expected_piediagram_expression_mask.png b/...l_images/expected_piediagram_expression/expected_piediagram_expression_mask.png