Skip to content

Commit d40d481

Browse files
jef-njef-n
committedMay 25, 2015
avoid warning about not created test difference image
·
ltr-3_40archive/master_2
1 parent 98c601d commit d40d481

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed
 

‎python/core/qgspallabeling.sip

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -723,15 +723,15 @@ class QgsPalLabeling : QgsLabelingEngineInterface
723723
// void drawLabel( pal::LabelPosition* label, QgsRenderContext& context, QgsPalLayerSettings& tmpLyr, DrawLabelType drawType );
724724

725725
static void drawLabelBuffer( QgsRenderContext& context,
726-
const QgsLabelComponent& component,
726+
const QgsLabelComponent &component,
727727
const QgsPalLayerSettings& tmpLyr );
728728

729729
static void drawLabelBackground( QgsRenderContext& context,
730730
QgsLabelComponent component,
731731
const QgsPalLayerSettings& tmpLyr );
732732

733-
static void drawLabelShadow( QgsRenderContext& context,
734-
const QgsLabelComponent& component,
733+
static void drawLabelShadow( QgsRenderContext &context,
734+
const QgsLabelComponent &component,
735735
const QgsPalLayerSettings& tmpLyr );
736736

737737
//! load/save engine settings to project file
@@ -764,7 +764,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface
764764
*/
765765
static bool geometryRequiresPreparation( const QgsGeometry *geometry, const QgsRenderContext &context, const QgsCoordinateTransform *ct, QgsGeometry *clipGeometry = 0 );
766766

767-
/** Splits a text string to a list of seperate lines, using a specified wrap character.
767+
/** Splits a text string to a list of separate lines, using a specified wrap character.
768768
* The text string will be split on either newline characters or the wrap character.
769769
* @param text text string to split
770770
* @param wrapCharacter additional character to wrap on

‎src/core/qgspallabeling.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@ class CORE_EXPORT QgsPalLayerSettings
9999

100100
enum UpsideDownLabels
101101
{
102-
Upright, /*!< upside-down labels (90 <= angle < 270) are shown upright*/
103-
ShowDefined, /*!< show upside down when rotation is layer- or data-defined*/
104-
ShowAll /*!< show upside down for all labels, including dynamic ones*/
102+
Upright, /*!< upside-down labels (90 <= angle < 270) are shown upright */
103+
ShowDefined, /*!< show upside down when rotation is layer- or data-defined */
104+
ShowAll /*!< show upside down for all labels, including dynamic ones */
105105
};
106106

107107
enum DirectionSymbols
108108
{
109-
SymbolLeftRight, /*!< place direction symbols on left/right of label*/
110-
SymbolAbove, /*!< place direction symbols on above label*/
111-
SymbolBelow /*!< place direction symbols on below label*/
109+
SymbolLeftRight, /*!< place direction symbols on left/right of label */
110+
SymbolAbove, /*!< place direction symbols on above label */
111+
SymbolBelow /*!< place direction symbols on below label */
112112
};
113113

114114
enum MultiLineAlign

‎src/core/qgsrenderchecker.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
#include <QDebug>
2828
#include <QBuffer>
2929

30-
QgsRenderChecker::QgsRenderChecker() :
31-
mReport( "" ),
32-
mMatchTarget( 0 ),
33-
mElapsedTime( 0 ),
34-
mRenderedImageFile( "" ),
35-
mExpectedImageFile( "" ),
36-
mMismatchCount( 0 ),
37-
mColorTolerance( 0 ),
38-
mElapsedTimeTarget( 0 ),
39-
mBufferDashMessages( false )
30+
QgsRenderChecker::QgsRenderChecker()
31+
: mReport( "" )
32+
, mMatchTarget( 0 )
33+
, mElapsedTime( 0 )
34+
, mRenderedImageFile( "" )
35+
, mExpectedImageFile( "" )
36+
, mMismatchCount( 0 )
37+
, mColorTolerance( 0 )
38+
, mElapsedTimeTarget( 0 )
39+
, mBufferDashMessages( false )
4040
{
4141
}
4242

@@ -359,7 +359,6 @@ bool QgsRenderChecker::compareImages( QString theTestName,
359359
//
360360
emitDashMessage( "Rendered Image " + theTestName + prefix, QgsDartMeasurement::ImagePng, mRenderedImageFile );
361361
emitDashMessage( "Expected Image " + theTestName + prefix, QgsDartMeasurement::ImagePng, mExpectedImageFile );
362-
emitDashMessage( "Difference Image " + theTestName + prefix, QgsDartMeasurement::ImagePng, myDiffImageFile );
363362

364363
//
365364
// Put the same info to debug too
@@ -430,6 +429,7 @@ bool QgsRenderChecker::compareImages( QString theTestName,
430429
//save the diff image to disk
431430
//
432431
myDifferenceImage.save( myDiffImageFile );
432+
emitDashMessage( "Difference Image " + theTestName + prefix, QgsDartMeasurement::ImagePng, myDiffImageFile );
433433
delete maskImage;
434434

435435
//

‎src/gui/qgscomposerruler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ QgsComposerRuler::QgsComposerRuler( QgsComposerRuler::Direction d ) : QWidget( 0
2525
mRulerFont->setPointSize( RULER_FONT_SIZE );
2626
mRulerFontMetrics = new QFontMetrics( *mRulerFont );
2727

28-
//calculate ruler sizes and marker seperations
28+
//calculate ruler sizes and marker separations
2929

3030
//minimum gap required between major ticks is 3 digits * 250%, based on appearance
3131
mScaleMinPixelsWidth = mRulerFontMetrics->width( "000" ) * 2.5;
@@ -345,7 +345,7 @@ int QgsComposerRuler::optimumNumberDivisions( double rulerScale, int scaleMultip
345345
{
346346
//find pixel size for this small division
347347
double candidateSize = largeDivisionSize / ( *divisions_it );
348-
//check if this seperation is more then allowed min seperation
348+
//check if this separation is more then allowed min separation
349349
if ( candidateSize >= mMinPixelsPerDivision )
350350
{
351351
//found a good candidate, return it

0 commit comments

Comments
 (0)
Please sign in to comment.