Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix problem with order of transformations of objects.

Browse Source
This commit is contained in:
Jim Evins
2015-09-07 00:15:49 -04:00
parent 29d50be98a
commit 2959789a49
7 changed files with 69 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/LabelModelObject.h
+6 -6
View File
@@ -23,7 +23,7 @@
#include <QObject>
#include <QFont>
#include <QTransform>
#include <QMatrix>
#include <QPainter>
#include "ColorNode.h"
@@ -123,10 +123,10 @@ namespace glabels
//
// Transformation Matrix Property
//
Q_PROPERTY( QTransform matrix READ matrix WRITE setMatrix );
Q_PROPERTY( QMatrix matrix READ matrix WRITE setMatrix );
QTransform matrix() const;
void setMatrix( const QTransform& value );
QMatrix matrix() const;
void setMatrix( const QMatrix& value );
//
@@ -394,7 +394,7 @@ namespace glabels
///////////////////////////////////////////////////////////////
public:
void draw( QPainter* painter, bool inEditor, MergeRecord* record ) const;
void drawSelectionHighlight( QPainter* painter ) const;
void drawSelectionHighlight( QPainter* painter, double scale ) const;
protected:
virtual void drawShadow( QPainter* painter, bool inEditor, MergeRecord* record ) const = 0;
@@ -430,7 +430,7 @@ namespace glabels
static int msNextId;
int mId;
QTransform mMatrix;
QMatrix mMatrix;
};