Permalink
Loading
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
[FEATURE] Setting for corner radius for composer rectangle shapes, al…
…lows creation of rounded rectangles in composers Add tests for composer shapes
- Loading branch information
1 parent
e5c40d7
commit 58d0483c46724ed2d7c12ee14cf2a2f0b48a3178
Showing
with
337 additions
and 29 deletions.
- +5 −0 python/core/composer/qgscomposershape.sip
- +29 −0 src/app/composer/qgscomposershapewidget.cpp
- +4 −0 src/app/composer/qgscomposershapewidget.h
- +20 −5 src/core/composer/qgscomposershape.cpp
- +6 −1 src/core/composer/qgscomposershape.h
- +44 −23 src/ui/qgscomposershapewidgetbase.ui
- +1 −0 tests/src/core/CMakeLists.txt
- +112 −0 tests/src/core/testqgscomposershapes.cpp
- +1 −0 tests/src/python/CMakeLists.txt
- +115 −0 tests/src/python/test_qgscomposershapes.py
- BIN tests/testdata/control_images/expected_composershapes/composershape_ellipse.png
- BIN tests/testdata/control_images/expected_composershapes/composershape_rectangle.png
- BIN tests/testdata/control_images/expected_composershapes/composershape_roundedrectangle.png
- BIN tests/testdata/control_images/expected_composershapes/composershape_triangle.png
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,112 @@ | ||
| /*************************************************************************** | ||
| testqgscomposershapes.cpp | ||
| ---------------------- | ||
| begin : April 2013 | ||
| copyright : (C) 2013 by Marco Hugentobler, Nyall Dawson | ||
| email : nyall dot dawson at gmail.com | ||
| ***************************************************************************/ | ||
|
|
||
| /*************************************************************************** | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
|
|
||
| #include "qgsapplication.h" | ||
| #include "qgscomposition.h" | ||
| #include "qgscompositionchecker.h" | ||
| #include "qgscomposershape.h" | ||
| #include <QObject> | ||
| #include <QtTest> | ||
| #include <QColor> | ||
| #include <QPainter> | ||
|
|
||
| class TestQgsComposerShapes: public QObject | ||
| { | ||
| Q_OBJECT; | ||
| private slots: | ||
| void initTestCase();// will be called before the first testfunction is executed. | ||
| void cleanupTestCase();// will be called after the last testfunction was executed. | ||
| void init();// will be called before each testfunction is executed. | ||
| void cleanup();// will be called after every testfunction. | ||
| void rectangle(); //test if rectangle shape is functioning | ||
| void triangle(); //test if triange shape is functioning | ||
| void ellipse(); //test if ellipse shape is functioning | ||
| void roundedRectangle(); //test if rounded rectangle shape is functioning | ||
|
|
||
| private: | ||
| QgsComposition* mComposition; | ||
| QgsComposerShape* mComposerShape; | ||
| }; | ||
|
|
||
| void TestQgsComposerShapes::initTestCase() | ||
| { | ||
| QgsApplication::init(); | ||
| QgsApplication::initQgis(); | ||
|
|
||
| //create composition with two rectangles | ||
| mComposition = new QgsComposition( 0 ); | ||
| mComposition->setPaperSize( 297, 210 ); //A4 landscape | ||
| mComposerShape = new QgsComposerShape( 20, 20, 150, 100, mComposition ); | ||
| mComposerShape->setBackgroundColor( QColor::fromRgb( 255, 150, 0 ) ); | ||
| mComposition->addComposerShape( mComposerShape ); | ||
| } | ||
|
|
||
| void TestQgsComposerShapes::cleanupTestCase() | ||
| { | ||
| delete mComposition; | ||
| } | ||
|
|
||
| void TestQgsComposerShapes::init() | ||
| { | ||
|
|
||
| } | ||
|
|
||
| void TestQgsComposerShapes::cleanup() | ||
| { | ||
|
|
||
| } | ||
|
|
||
| void TestQgsComposerShapes::rectangle() | ||
| { | ||
| mComposerShape->setShapeType( QgsComposerShape::Rectangle ); | ||
|
|
||
| QgsCompositionChecker checker( "Composer shapes", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() + | ||
| "control_images" + QDir::separator() + "expected_composershapes" + QDir::separator() + "composershape_rectangle.png" ) ); | ||
| QVERIFY( checker.testComposition() ); | ||
| } | ||
|
|
||
| void TestQgsComposerShapes::triangle() | ||
| { | ||
| mComposerShape->setShapeType( QgsComposerShape::Triangle ); | ||
|
|
||
| QgsCompositionChecker checker( "Composer shapes", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() + | ||
| "control_images" + QDir::separator() + "expected_composershapes" + QDir::separator() + "composershape_triangle.png" ) ); | ||
| QVERIFY( checker.testComposition() ); | ||
| } | ||
|
|
||
| void TestQgsComposerShapes::ellipse() | ||
| { | ||
| mComposerShape->setShapeType( QgsComposerShape::Ellipse ); | ||
|
|
||
| QgsCompositionChecker checker( "Composer shapes", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() + | ||
| "control_images" + QDir::separator() + "expected_composershapes" + QDir::separator() + "composershape_ellipse.png" ) ); | ||
| QVERIFY( checker.testComposition() ); | ||
| } | ||
|
|
||
| void TestQgsComposerShapes::roundedRectangle() | ||
| { | ||
| mComposerShape->setShapeType( QgsComposerShape::Rectangle ); | ||
| mComposerShape->setCornerRadius( 30 ); | ||
|
|
||
| QgsCompositionChecker checker( "Composer shapes", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() + | ||
| "control_images" + QDir::separator() + "expected_composershapes" + QDir::separator() + "composershape_roundedrectangle.png" ) ); | ||
| QVERIFY( checker.testComposition() ); | ||
| mComposerShape->setCornerRadius( 0 ); | ||
| } | ||
|
|
||
| QTEST_MAIN( TestQgsComposerShapes ) | ||
| #include "moc_testqgscomposershapes.cxx" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.