Skip to content
Permalink
Browse files

Port some more tests to layouts, drop composer tests which

have been ported to layouts
  • Loading branch information
nyalldawson committed Jan 6, 2018
1 parent 0779b88 commit b691998c68cdeee33919970a01e34f8fd8fd08ba
Showing with 711 additions and 7,770 deletions.
  1. +1 −1 src/core/layout/qgslayoutitemlegend.cpp
  2. +3 −0 src/core/layout/qgslayoutitempolyline.cpp
  3. +2 −0 src/core/layout/qgslayoutitempolyline.h
  4. +1 −17 tests/src/core/CMakeLists.txt
  5. +0 −416 tests/src/core/testqgsatlascomposition.cpp
  6. +0 −136 tests/src/core/testqgscomposerdd.cpp
  7. +0 −118 tests/src/core/testqgscomposereffects.cpp
  8. +0 −431 tests/src/core/testqgscomposergroup.cpp
  9. +0 −320 tests/src/core/testqgscomposerhtml.cpp
  10. +0 −264 tests/src/core/testqgscomposerlabel.cpp
  11. +0 −388 tests/src/core/testqgscomposermap.cpp
  12. +0 −704 tests/src/core/testqgscomposermapgrid.cpp
  13. +0 −240 tests/src/core/testqgscomposermapoverview.cpp
  14. +0 −630 tests/src/core/testqgscomposermodel.cpp
  15. +0 −258 tests/src/core/testqgscomposerobject.cpp
  16. +0 −165 tests/src/core/testqgscomposerpaper.cpp
  17. +0 −418 tests/src/core/testqgscomposerpicture.cpp
  18. +0 −189 tests/src/core/testqgscomposerrotation.cpp
  19. +0 −217 tests/src/core/testqgscomposerscalebar.cpp
  20. +0 −156 tests/src/core/testqgscomposershapes.cpp
  21. +0 −1,063 tests/src/core/testqgscomposertablev2.cpp
  22. +0 −754 tests/src/core/testqgscomposerutils.cpp
  23. +1 −870 tests/src/core/testqgscomposition.cpp
  24. +381 −0 tests/src/core/testqgslayout.cpp
  25. +61 −0 tests/src/core/testqgslayoutitem.cpp
  26. +21 −0 tests/src/core/testqgslayoutlabel.cpp
  27. +72 −15 tests/src/core/testqgslayoutmap.cpp
  28. +14 −0 tests/src/core/testqgslayoutpage.cpp
  29. +113 −0 tests/src/core/testqgslayoutpolyline.cpp
  30. +27 −0 tests/src/core/testqgslayoutshapes.cpp
  31. +14 −0 tests/src/core/testqgspagesizeregistry.cpp
  32. BIN ...ol_images/composer_effects/expected_composereffects_blend/expected_composereffects_blend_mask.png
  33. BIN ...oser_effects/expected_composereffects_transparency/expected_composereffects_transparency_mask.png
  34. BIN ...tems/expected_composerrotation_mapitemrotation/expected_composerrotation_mapitemrotation_mask.png
  35. BIN ...mposer_items/expected_composerrotation_maprotation/expected_composerrotation_maprotation_mask.png
  36. BIN ...ol_images/composer_items/expected_composerrotation_shape/expected_composerrotation_shape_mask.png
  37. BIN ...ata/control_images/composer_items/expected_layoutrotation_label/expected_layoutrotation_label.png
  38. BIN ...trol_images/composer_paper/expected_composerpaper_default/expected_composerpaper_default_mask.png
@@ -38,7 +38,7 @@ QgsLayoutItemLegend::QgsLayoutItemLegend( QgsLayout *layout )
: QgsLayoutItem( layout )
, mLegendModel( new QgsLegendModel( layout->project()->layerTreeRoot() ) )
{
#if 0 //TODO
#if 0 //no longer required?
connect( &layout->atlasComposition(), &QgsAtlasComposition::renderEnded, this, &QgsLayoutItemLegend::onAtlasEnded );
#endif

@@ -199,6 +199,9 @@ void QgsLayoutItemPolyline::updateMarkerSvgSizes()

void QgsLayoutItemPolyline::drawArrowHead( QPainter *p, const double x, const double y, const double angle, const double arrowHeadWidth )
{
if ( !p )
return;

double angleRad = angle / 180.0 * M_PI;
QPointF middlePoint( x, y );
//rotate both arrow points
@@ -259,6 +259,8 @@ class CORE_EXPORT QgsLayoutItemPolyline: public QgsLayoutNodesItem
void drawSvgMarker( QPainter *p, QPointF point, double angle, const QString &markerPath, double height ) const;

double computeMarkerMargin() const;

friend class TestQgsLayoutPolyline;
};

#endif // QGSLAYOUTITEMPOLYLINE_H
@@ -73,7 +73,6 @@ ENDMACRO (ADD_QGIS_TEST)
SET(TESTS
testqgs25drenderer.cpp
testqgsapplication.cpp
testqgsatlascomposition.cpp
testqgsauthcrypto.cpp
testqgsauthcertutils.cpp
testqgsauthconfig.cpp
@@ -83,23 +82,8 @@ SET(TESTS
testqgsclipper.cpp
testqgscolorscheme.cpp
testqgscolorschemeregistry.cpp
testqgscomposerdd.cpp
testqgscomposereffects.cpp
testqgscomposergroup.cpp
testqgscomposerlabel.cpp
testqgscomposermapgrid.cpp
testqgscomposermapoverview.cpp
testqgscomposermap.cpp
testqgscomposermodel.cpp
testqgscomposermultiframe.cpp
testqgscomposerobject.cpp
testqgscomposerpaper.cpp
testqgscomposerpicture.cpp
testqgscomposerrotation.cpp
testqgscomposerscalebar.cpp
testqgscomposershapes.cpp
testqgscomposertablev2.cpp
testqgscomposerutils.cpp
testqgsconnectionpool.cpp
testcontrastenhancements.cpp
testqgscoordinatereferencesystem.cpp
@@ -148,6 +132,7 @@ SET(TESTS
testqgslayoutobject.cpp
testqgslayoutpage.cpp
testqgslayoutpicture.cpp
testqgslayoutpolyline.cpp
testqgslayoutscalebar.cpp
testqgslayoutshapes.cpp
testqgslayouttable.cpp
@@ -208,7 +193,6 @@ SET(TESTS

IF(WITH_QTWEBKIT)
SET(TESTS ${TESTS}
testqgscomposerhtml.cpp
testqgscomposition.cpp
)
ENDIF(WITH_QTWEBKIT)

0 comments on commit b691998

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