Restructuring directory layout. Move towards "Modern CMake" usage.

This commit is contained in:
Jim Evins
2017-11-23 22:15:24 -05:00
parent 8bec3594ec
commit b8ee5e1f73
198 changed files with 4509 additions and 5324 deletions
+18 -18
View File
@@ -74,7 +74,7 @@ namespace glabels
///
/// Template Property Setter
///
void SimplePreview::setTemplate( const Template *tmplate )
void SimplePreview::setTemplate( const model::Template *tmplate )
{
mTmplate = tmplate;
update();
@@ -110,10 +110,10 @@ namespace glabels
if ( mTmplate != nullptr )
{
// Set scene up with a 5% margin around paper
Distance x = -0.05 * mTmplate->pageWidth();
Distance y = -0.05 * mTmplate->pageHeight();
Distance w = 1.10 * mTmplate->pageWidth();
Distance h = 1.10 * mTmplate->pageHeight();
model::Distance x = -0.05 * mTmplate->pageWidth();
model::Distance y = -0.05 * mTmplate->pageHeight();
model::Distance w = 1.10 * mTmplate->pageWidth();
model::Distance h = 1.10 * mTmplate->pageHeight();
mScene->setSceneRect( x.pt(), y.pt(), w.pt(), h.pt() );
fitInView( mScene->sceneRect(), Qt::KeepAspectRatio );
@@ -141,7 +141,7 @@ namespace glabels
///
/// Draw Paper
///
void SimplePreview::drawPaper( const Distance& pw, const Distance& ph )
void SimplePreview::drawPaper( const model::Distance& pw, const model::Distance& ph )
{
QGraphicsDropShadowEffect *shadowEffect = new QGraphicsDropShadowEffect();
shadowEffect->setColor( shadowColor );
@@ -167,9 +167,9 @@ namespace glabels
///
void SimplePreview::drawLabels()
{
Frame *frame = mTmplate->frames().first();
model::Frame *frame = mTmplate->frames().first();
foreach (Point origin, frame->getOrigins() )
foreach (model::Point origin, frame->getOrigins() )
{
drawLabel( origin.x(), origin.y(), frame->path() );
}
@@ -179,9 +179,9 @@ namespace glabels
///
/// Draw a Single Label at x,y
///
void SimplePreview::drawLabel( const Distance& x,
const Distance& y,
const QPainterPath& path )
void SimplePreview::drawLabel( const model::Distance& x,
const model::Distance& y,
const QPainterPath& path )
{
QBrush brush( labelColor );
QPen pen( labelOutlineColor );
@@ -202,12 +202,12 @@ namespace glabels
///
void SimplePreview::drawArrow()
{
Frame *frame = mTmplate->frames().first();
model::Frame *frame = mTmplate->frames().first();
Distance w = frame->w();
Distance h = frame->h();
model::Distance w = frame->w();
model::Distance h = frame->h();
Distance minWH = min( w, h );
model::Distance minWH = min( w, h );
QPen pen( arrowColor );
pen.setWidthF( 0.25*minWH.pt()*arrowScale );
@@ -216,9 +216,9 @@ namespace glabels
QBrush brush( upColor );
Point origin = frame->getOrigins().first();
Distance x0 = origin.x();
Distance y0 = origin.y();
model::Point origin = frame->getOrigins().first();
model::Distance x0 = origin.x();
model::Distance y0 = origin.y();
QPainterPath path;
path.moveTo( 0, minWH.pt()*arrowScale/3 );