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

Refactor frame and markup code to use paths.

Browse Source 
- CD frames are currently broken.
This commit is contained in:
Jim Evins
2015-08-12 01:20:52 -04:00
parent 0ad6caeeca
commit 721746007c
13 changed files with 110 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/View.cpp
+31 -6
View File
@@ -510,20 +510,40 @@ glabels::View::leaveEvent( QEvent* event )
void
glabels::View::drawBgLayer( QPainter* painter )
{
/*
* Draw shadow
*/
painter->save();
painter->setBrush( QBrush( shadowColor ) );
painter->setPen( Qt::NoPen );
painter->translate( shadowOffsetPixels/mZoom, shadowOffsetPixels/mZoom );
painter->drawPath( mModel->frame()->path( mModel->rotate() ) );
if ( mModel->rotate() )
{
painter->rotate( -90 );
painter->translate( -mModel->frame()->w(), 0 );
}
painter->drawPath( mModel->frame()->path() );
painter->restore();
/*
* Draw label
*/
painter->save();
painter->setBrush( QBrush( labelColor ) );
painter->setPen( QPen( labelOutlineColor ) );
painter->drawPath( mModel->frame()->path( mModel->rotate() ) );
if ( mModel->rotate() )
{
painter->rotate( -90 );
painter->translate( -mModel->frame()->w(), 0 );
}
painter->drawPath( mModel->frame()->path() );
painter->restore();
}
@@ -537,8 +557,8 @@ glabels::View::drawGridLayer( QPainter* painter )
{
if ( mGridVisible )
{
double w = mModel->w();
double h = mModel->h();
double w = mModel->frame()->w();
double h = mModel->frame()->h();
double x0, y0;
if ( dynamic_cast<const libglabels::FrameRect*>( mModel->frame() ) )
@@ -554,8 +574,13 @@ glabels::View::drawGridLayer( QPainter* painter )
}
painter->save();
if ( mModel->rotate() )
{
painter->rotate( -90 );
painter->translate( -mModel->frame()->w(), 0 );
}
painter->setClipPath( mModel->frame()->path( mModel->rotate() ) );
painter->setClipPath( mModel->frame()->path() );
painter->setPen( QPen( gridLineColor, gridLineWidthPixels/mZoom ) );