Skip to content
Permalink
Browse files

rename test images

  • Loading branch information
jef-n committed Aug 7, 2016
1 parent 3f22a7a commit b08a9e7951204e85dc2d5e0ad1021e39b5eb9d72
Showing with 18 additions and 18 deletions.
  1. +1 −1 src/app/qgsprojectproperties.cpp
  2. +6 −6 src/core/symbology-ng/qgssymbologyconversion.cpp
  3. +1 −1 src/gui/symbology-ng/qgsstyleexportimportdialog.cpp
  4. +1 −1 src/gui/symbology-ng/qgsstyleexportimportdialog.h
  5. +1 −1 src/gui/symbology-ng/qgsstylegroupselectiondialog.h
  6. +1 −1 src/gui/symbology-ng/qgsstylemanagerdialog.h
  7. 0 src/ui/{qgsstylev2exportimportdialogbase.ui → qgsstyleexportimportdialogbase.ui}
  8. 0 src/ui/{qgsstylev2groupselectiondialogbase.ui → qgsstylegroupselectiondialogbase.ui}
  9. 0 src/ui/{qgsstylev2managerdialogbase.ui → qgsstylemanagerdialogbase.ui}
  10. +2 −2 tests/src/core/CMakeLists.txt
  11. +4 −4 tests/src/core/testqgssymbol.cpp
  12. +1 −1 tests/src/python/test_qgssymbol.py
  13. BIN ...ted_stylev2_linecanvasclip.png → expected_style_linecanvasclip/expected_style_linecanvasclip.png}
  14. BIN ...2_linecanvasclip_mask.png → expected_style_linecanvasclip/expected_style_linecanvasclip_mask.png}
  15. BIN ...linecanvasclip_off.png → expected_style_linecanvasclip_off/expected_style_linecanvasclip_off.png}
  16. BIN ...clip_off_mask.png → expected_style_linecanvasclip_off/expected_style_linecanvasclip_off_mask.png}
  17. BIN ...ted_stylev2_polycanvasclip.png → expected_style_polycanvasclip/expected_style_polycanvasclip.png}
  18. BIN ...2_polycanvasclip_mask.png → expected_style_polycanvasclip/expected_style_polycanvasclip_mask.png}
  19. BIN ...polycanvasclip_off.png → expected_style_polycanvasclip_off/expected_style_polycanvasclip_off.png}
  20. BIN ...clip_off_mask.png → expected_style_polycanvasclip_off/expected_style_polycanvasclip_off_mask.png}
  21. BIN ...s/{labelingenginev2 → labelingengine}/expected_label_order_layer1/expected_label_order_layer1.png
  22. BIN ...belingenginev2 → labelingengine}/expected_label_order_layer1/expected_label_order_layer1_mask.png
  23. BIN ...s/{labelingenginev2 → labelingengine}/expected_label_order_layer2/expected_label_order_layer2.png
  24. BIN ...belingenginev2 → labelingengine}/expected_label_order_layer2/expected_label_order_layer2_mask.png
  25. BIN ...ges/{labelingenginev2 → labelingengine}/expected_label_order_mixed/expected_label_order_mixed.png
  26. BIN ...labelingenginev2 → labelingengine}/expected_label_order_mixed/expected_label_order_mixed_mask.png
  27. BIN ...mages/{labelingenginev2 → labelingengine}/expected_label_order_size/expected_label_order_size.png
  28. BIN .../{labelingenginev2 → labelingengine}/expected_label_order_size/expected_label_order_size_mask.png
  29. BIN ...s/{labelingenginev2 → labelingengine}/expected_label_order_zindex/expected_label_order_zindex.png
  30. BIN ...belingenginev2 → labelingengine}/expected_label_order_zindex/expected_label_order_zindex_mask.png
  31. BIN ...ol_images/{labelingenginev2 → labelingengine}/expected_labeling_basic/expected_labeling_basic.png
  32. BIN ...ages/{labelingenginev2 → labelingengine}/expected_labeling_basic/expected_labeling_basic_mask.png
  33. BIN ...genginev2 → labelingengine}/expected_labeling_point_diagrams/expected_labeling_point_diagrams.png
  34. BIN ...nev2 → labelingengine}/expected_labeling_point_diagrams/expected_labeling_point_diagrams_mask.png
  35. BIN ...s/{labelingenginev2 → labelingengine}/expected_labeling_rulebased/expected_labeling_rulebased.png
  36. BIN ...belingenginev2 → labelingengine}/expected_labeling_rulebased/expected_labeling_rulebased_mask.png
  37. BIN ...testdata/control_images/{symbolv2 → symbol}/expected_circular_string/expected_circular_string.png
  38. BIN ...ata/control_images/{symbolv2 → symbol}/expected_circular_string/expected_circular_string_mask.png
  39. BIN ...s/testdata/control_images/{symbolv2 → symbol}/expected_compound_curve/expected_compound_curve.png
  40. BIN ...tdata/control_images/{symbolv2 → symbol}/expected_compound_curve/expected_compound_curve_mask.png
  41. BIN tests/testdata/control_images/{symbolv2 → symbol}/expected_curve_polygon/expected_curve_polygon.png
  42. BIN ...estdata/control_images/{symbolv2 → symbol}/expected_curve_polygon/expected_curve_polygon_mask.png
  43. BIN ...ontrol_images/{symbolv2 → symbol}/expected_curve_polygon_no_arc/expected_curve_polygon_no_arc.png
  44. BIN ...l_images/{symbolv2 → symbol}/expected_curve_polygon_no_arc/expected_curve_polygon_no_arc_mask.png
  45. BIN tests/testdata/control_images/{symbolv2 → symbol}/expected_linestring/expected_linestring.png
  46. BIN tests/testdata/control_images/{symbolv2 → symbol}/expected_linestring/expected_linestring_mask.png
  47. BIN tests/testdata/control_images/{symbolv2 → symbol}/expected_multicurve/expected_multicurve.png
  48. BIN tests/testdata/control_images/{symbolv2 → symbol}/expected_multicurve/expected_multicurve_mask.png
  49. BIN ...testdata/control_images/{symbolv2 → symbol}/expected_multilinestring/expected_multilinestring.png
  50. BIN ...ata/control_images/{symbolv2 → symbol}/expected_multilinestring/expected_multilinestring_mask.png
  51. BIN tests/testdata/control_images/{symbolv2 → symbol}/expected_multipoint/expected_multipoint.png
  52. BIN tests/testdata/control_images/{symbolv2 → symbol}/expected_multipoint/expected_multipoint_mask.png
  53. BIN tests/testdata/control_images/{symbolv2 → symbol}/expected_multipolygon/expected_multipolygon.png
  54. BIN .../testdata/control_images/{symbolv2 → symbol}/expected_multipolygon/expected_multipolygon_mask.png
  55. BIN tests/testdata/control_images/{symbolv2 → symbol}/expected_point/expected_point.png
  56. BIN tests/testdata/control_images/{symbolv2 → symbol}/expected_point/expected_point_mask.png
  57. BIN tests/testdata/control_images/{symbolv2 → symbol}/expected_polygon/expected_polygon.png
  58. BIN tests/testdata/control_images/{symbolv2 → symbol}/expected_polygon/expected_polygon_mask.png
@@ -1659,7 +1659,7 @@ void QgsProjectProperties::on_pbnExportScales_clicked()

void QgsProjectProperties::populateStyles()
{
// Styles - taken from qgsstylev2managerdialog
// Styles - taken from qgsstylemanagerdialog

// use QComboBox and QString lists for shorter code
QStringList prefList;
@@ -227,16 +227,16 @@ static QgsFeatureRenderer* readOldGraduatedSymbolRenderer( const QDomNode& rnode
QDomNode symbolnode = rnode.namedItem( "symbol" );
while ( !symbolnode.isNull() )
{
QgsSymbol* symbolv2 = readOldSymbol( symbolnode, geomType );
if ( symbolv2 )
QgsSymbol* symbol = readOldSymbol( symbolnode, geomType );
if ( symbol )
{
QgsOldSymbolMeta meta = readSymbolMeta( symbolnode );
double lowerValue = meta.lowerValue.toDouble();
double upperValue = meta.upperValue.toDouble();
QString label = meta.label;
if ( label.isEmpty() )
label = QString( "%1 - %2" ).arg( lowerValue, -1, 'f', 3 ).arg( upperValue, -1, 'f', 3 );
ranges.append( QgsRendererRange( lowerValue, upperValue, symbolv2, label ) );
ranges.append( QgsRendererRange( lowerValue, upperValue, symbol, label ) );
}

symbolnode = symbolnode.nextSibling();
@@ -260,15 +260,15 @@ static QgsFeatureRenderer* readOldUniqueValueRenderer( const QDomNode& rnode, Qg
QDomNode symbolnode = rnode.namedItem( "symbol" );
while ( !symbolnode.isNull() )
{
QgsSymbol* symbolv2 = readOldSymbol( symbolnode, geomType );
if ( symbolv2 )
QgsSymbol* symbol = readOldSymbol( symbolnode, geomType );
if ( symbol )
{
QgsOldSymbolMeta meta = readSymbolMeta( symbolnode );
QVariant value = QVariant( meta.lowerValue );
QString label = meta.label;
if ( label.isEmpty() )
label = value.toString();
cats.append( QgsRendererCategory( value, symbolv2, label, true ) );
cats.append( QgsRendererCategory( value, symbol, label, true ) );
}

symbolnode = symbolnode.nextSibling();
@@ -15,7 +15,7 @@
***************************************************************************/

#include "qgsstyleexportimportdialog.h"
#include "ui_qgsstylev2exportimportdialogbase.h"
#include "ui_qgsstyleexportimportdialogbase.h"

#include "qgsstyle.h"
#include "qgssymbol.h"
@@ -25,7 +25,7 @@
#include <QNetworkReply>
#include <QStandardItem>

#include "ui_qgsstylev2exportimportdialogbase.h"
#include "ui_qgsstyleexportimportdialogbase.h"

class QgsStyle;
class QgsStyleGroupSelectionDialog;
@@ -19,7 +19,7 @@

#include <QDialog>
#include <QStandardItem>
#include "ui_qgsstylev2groupselectiondialogbase.h"
#include "ui_qgsstylegroupselectiondialogbase.h"


class QgsStyle;
@@ -21,7 +21,7 @@
#include <QAction>
#include <QMenu>

#include "ui_qgsstylev2managerdialogbase.h"
#include "ui_qgsstylemanagerdialogbase.h"
#include "qgscontexthelp.h"

class QgsStyle;
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -183,9 +183,9 @@ ADD_QGIS_TEST(snappingutilstest testqgssnappingutils.cpp )
ADD_QGIS_TEST(spatialindextest testqgsspatialindex.cpp)
ADD_QGIS_TEST(statisticalsummarytest testqgsstatisticalsummary.cpp)
ADD_QGIS_TEST(stringutilstest testqgsstringutils.cpp)
ADD_QGIS_TEST(stylev2test testqgsstyle.cpp)
ADD_QGIS_TEST(styletest testqgsstyle.cpp)
ADD_QGIS_TEST(svgmarkertest testqgssvgmarker.cpp)
ADD_QGIS_TEST(symbolv2test testqgssymbol.cpp)
ADD_QGIS_TEST(symboltest testqgssymbol.cpp)
ADD_QGIS_TEST(tracertest testqgstracer.cpp)
#for some obscure reason calling this test "fontutils" kills the build on Ubuntu 15.10
ADD_QGIS_TEST(typographicstylingutils testqgsfontutils.cpp)
@@ -189,11 +189,11 @@ void TestQgsSymbol::testCanvasClip()
bool result;

lineSymbol->setClipFeaturesToExtent( true );
result = imageCheck( ms, "stylev2_linecanvasclip" );
result = imageCheck( ms, "style_linecanvasclip" );
QVERIFY( result );

lineSymbol->setClipFeaturesToExtent( false );
result = imageCheck( ms, "stylev2_linecanvasclip_off" );
result = imageCheck( ms, "style_linecanvasclip_off" );
QVERIFY( result );

//poly
@@ -210,11 +210,11 @@ void TestQgsSymbol::testCanvasClip()
ms.setExtent( extent );

fillSymbol->setClipFeaturesToExtent( true );
result = imageCheck( ms, "stylev2_polycanvasclip" );
result = imageCheck( ms, "style_polycanvasclip" );
QVERIFY( result );

fillSymbol->setClipFeaturesToExtent( false );
result = imageCheck( ms, "stylev2_polycanvasclip_off" );
result = imageCheck( ms, "style_polycanvasclip_off" );
QVERIFY( result );
}

@@ -178,7 +178,7 @@ def imageCheck(self, name, reference_image, image):
file_name = temp_dir + 'symbol_' + name + ".png"
image.save(file_name, "PNG")
checker = QgsRenderChecker()
checker.setControlPathPrefix("symbolv2")
checker.setControlPathPrefix("symbol")
checker.setControlName("expected_" + reference_image)
checker.setRenderedImage(file_name)
checker.setColorTolerance(2)

0 comments on commit b08a9e7

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