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

UserVariables branch merge

Browse Source
This commit is contained in:
gitlost
2019-08-21 03:37:56 +01:00
parent 6ab3a12b92 6a789c9632
commit 2444cacb74
92 changed files with 3624 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/ModelObject.cpp
+6 -3
View File
@@ -1226,7 +1226,10 @@ namespace glabels
///
/// Draw object + shadow
///
void ModelObject::draw( QPainter* painter, bool inEditor, merge::Record* record ) const
void ModelObject::draw( QPainter* painter,
bool inEditor,
merge::Record* record,
Variables* variables ) const
{
painter->save();
painter->translate( mX0.pt(), mY0.pt() );
@@ -1236,12 +1239,12 @@ namespace glabels
painter->save();
painter->translate( mShadowX.pt(), mShadowY.pt() );
painter->setMatrix( mMatrix, true );
drawShadow( painter, inEditor, record );
drawShadow( painter, inEditor, record, variables );
painter->restore();
}
painter->setMatrix( mMatrix, true );
drawObject( painter, inEditor, record );
drawObject( painter, inEditor, record, variables );
painter->restore();
}