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

Go back to "Object" nomenclature instead of "Item" for label objects.

Browse Source
This commit is contained in:
Jim Evins
2013-12-04 22:45:22 -05:00
parent a64813cf13
commit 385df72c9b
7 changed files with 231 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CMakeLists.txt
+4 -4
View File
@@ -9,8 +9,8 @@ set (glabels_sources
File.cpp
Help.cpp
LabelModel.cpp
LabelModelItem.cpp
LabelModelBoxItem.cpp
LabelModelObject.cpp
LabelModelBoxObject.cpp
LabelRegion.cpp
MainWindow.cpp
MergeField.cpp
@@ -24,8 +24,8 @@ set (glabels_sources
set (glabels_qobject_headers
LabelModel.h
LabelModelItem.h
LabelModelBoxItem.h
LabelModelObject.h
LabelModelBoxObject.h
MainWindow.h
TemplatePicker.h
NewLabelDialog.h
app/LabelModel.cpp
+174 -174
View File
@@ -35,85 +35,85 @@ namespace glabels
/**
* Add item.
* Add object.
*/
void LabelModel::addItem( LabelModelItem *item )
void LabelModel::addObject( LabelModelObject* object )
{
item->setParent( this );
mItemList << item;
object->setParent( this );
mObjectList << object;
connect( item, SIGNAL(changed()), this, SLOT(itemChanged(LabelModelItem*)) );
connect( item, SIGNAL(moved()), this, SLOT(itemMoved(LabelModelItem*)) );
connect( object, SIGNAL(changed()), this, SLOT(objectChanged(LabelModelObject*)) );
connect( object, SIGNAL(moved()), this, SLOT(objectMoved(LabelModelObject*)) );
mModified = true;
emit itemAdded( item );
emit objectAdded( object );
emit changed();
}
void LabelModel::onItemChanged( LabelModelItem *item )
void LabelModel::onObjectChanged( LabelModelObject* object )
{
mModified = true;
emit itemChanged( item );
emit objectChanged( object );
emit changed();
}
void LabelModel::onItemMoved( LabelModelItem *item )
void LabelModel::onObjectMoved( LabelModelObject* object )
{
mModified = true;
emit itemMoved( item );
emit objectMoved( object );
emit changed();
}
void LabelModel::deleteItem( LabelModelItem *item )
void LabelModel::deleteObject( LabelModelObject* object )
{
item->unselect();
mItemList.removeOne( item );
object->unselect();
mObjectList.removeOne( object );
disconnect( item, 0, this, 0 );
disconnect( object, 0, this, 0 );
mModified = true;
emit itemDeleted( item );
emit objectDeleted( object );
emit changed();
}
/**
* Select item.
* Select object.
*/
void LabelModel::selectItem( LabelModelItem *item )
void LabelModel::selectObject( LabelModelObject* object )
{
item->select();
object->select();
emit selectionChanged();
}
/**
* Unselect item.
* Unselect object.
*/
void LabelModel::unselectItem( LabelModelItem *item )
void LabelModel::unselectObject( LabelModelObject* object )
{
item->unselect();
object->unselect();
emit selectionChanged();
}
/**
* Select all items.
* Select all objects.
*/
void LabelModel::selectAll()
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
item->select();
object->select();
}
emit selectionChanged();
@@ -121,13 +121,13 @@ namespace glabels
/**
* Unselect item all items.
* Unselect object all objects.
*/
void LabelModel::unselectAll()
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
item->unselect();
object->unselect();
}
emit selectionChanged();
@@ -141,16 +141,16 @@ namespace glabels
double rX2 = std::max( region.x1(), region.x2() );
double rY2 = std::max( region.y1(), region.y2() );
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
LabelRegion itemExtent = item->getExtent();
LabelRegion objectExtent = object->getExtent();
if ( (itemExtent.x1() >= rX1) &&
(itemExtent.x2() <= rX2) &&
(itemExtent.y1() >= rY1) &&
(itemExtent.y2() <= rY2) )
if ( (objectExtent.x1() >= rX1) &&
(objectExtent.x2() <= rX2) &&
(objectExtent.y1() >= rY1) &&
(objectExtent.y2() <= rY2) )
{
item->select();
object->select();
}
}
@@ -160,9 +160,9 @@ namespace glabels
bool LabelModel::isSelectionEmpty()
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
return false;
}
@@ -176,9 +176,9 @@ namespace glabels
{
int nSelected = 0;
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
nSelected++;
if ( nSelected > 1 )
@@ -192,28 +192,28 @@ namespace glabels
}
QList<LabelModelItem *> LabelModel::getSelection()
QList<LabelModelObject*> LabelModel::getSelection()
{
QList<LabelModelItem*> selectedList;
QList<LabelModelObject*> selectedList;
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
selectedList << item;
selectedList << object;
}
}
}
LabelModelItem *LabelModel::getFirstSelectedItem()
LabelModelObject* LabelModel::getFirstSelectedObject()
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
return item;
return object;
}
}
}
@@ -221,9 +221,9 @@ namespace glabels
bool LabelModel::canSelectionText()
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() && item->canText() )
if ( object->isSelected() && object->canText() )
{
return true;
}
@@ -235,9 +235,9 @@ namespace glabels
bool LabelModel::canSelectionFill()
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() && item->canFill() )
if ( object->isSelected() && object->canFill() )
{
return true;
}
@@ -249,9 +249,9 @@ namespace glabels
bool LabelModel::canSelectionLineColor()
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() && item->canLineColor() )
if ( object->isSelected() && object->canLineColor() )
{
return true;
}
@@ -263,9 +263,9 @@ namespace glabels
bool LabelModel::canSelectionLineWidth()
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() && item->canLineWidth() )
if ( object->isSelected() && object->canLineWidth() )
{
return true;
}
@@ -277,11 +277,11 @@ namespace glabels
void LabelModel::deleteSelection()
{
QList<LabelModelItem*> selectedList = getSelection();
QList<LabelModelObject*> selectedList = getSelection();
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
deleteItem( item );
deleteObject( object );
}
mModified = true;
@@ -293,18 +293,18 @@ namespace glabels
void LabelModel::raiseSelectionToTop()
{
QList<LabelModelItem*> selectedList = getSelection();
QList<LabelModelObject*> selectedList = getSelection();
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
mItemList.removeOne( item );
mObjectList.removeOne( object );
}
/* Move to end of list, representing top most item. */
foreach ( LabelModelItem *item, selectedList )
/* Move to end of list, representing top most object. */
foreach ( LabelModelObject* object, selectedList )
{
mItemList.push_back( item );
emit itemToTop( item );
mObjectList.push_back( object );
emit objectToTop( object );
}
mModified = true;
@@ -315,18 +315,18 @@ namespace glabels
void LabelModel::lowerSelectionToBottom()
{
QList<LabelModelItem*> selectedList = getSelection();
QList<LabelModelObject*> selectedList = getSelection();
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
mItemList.removeOne( item );
mObjectList.removeOne( object );
}
/* Move to front of list, representing bottom most item. */
foreach ( LabelModelItem *item, selectedList )
/* Move to front of list, representing bottom most object. */
foreach ( LabelModelObject* object, selectedList )
{
mItemList.push_front( item );
emit itemToBottom( item );
mObjectList.push_front( object );
emit objectToBottom( object );
}
mModified = true;
@@ -337,11 +337,11 @@ namespace glabels
void LabelModel::rotateSelection( double thetaDegs )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->rotate( thetaDegs );
object->rotate( thetaDegs );
}
}
@@ -365,11 +365,11 @@ namespace glabels
void LabelModel::flipSelectionHoriz()
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->flipHoriz();
object->flipHoriz();
}
}
@@ -381,11 +381,11 @@ namespace glabels
void LabelModel::flipSelectionVert()
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->flipVert();
object->flipVert();
}
}
@@ -402,22 +402,22 @@ namespace glabels
return;
}
QList<LabelModelItem*> selectedList = getSelection();
QList<LabelModelObject*> selectedList = getSelection();
/* Find left-most edge. */
double x1_min = 7200; /* Start with a very large value: 7200pts = 100in */
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
if ( r.x1() < x1_min ) x1_min = r.x1();
}
/* Now adjust the object positions to line up the left edges at left-most edge. */
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
double dx = x1_min - r.x1();
item->setPositionRelative( dx, 0 );
object->setPositionRelative( dx, 0 );
}
mModified = true;
@@ -433,22 +433,22 @@ namespace glabels
return;
}
QList<LabelModelItem*> selectedList = getSelection();
QList<LabelModelObject*> selectedList = getSelection();
/* Find right-most edge. */
double x1_max = -7200; /* Start with a very large negative value: 7200pts = 100in */
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
if ( r.x1() > x1_max ) x1_max = r.x1();
}
/* Now adjust the object positions to line up the right edges at right-most edge. */
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
double dx = x1_max - r.x1();
item->setPositionRelative( dx, 0 );
object->setPositionRelative( dx, 0 );
}
mModified = true;
@@ -464,25 +464,25 @@ namespace glabels
return;
}
QList<LabelModelItem*> selectedList = getSelection();
QList<LabelModelObject*> selectedList = getSelection();
/* Find average center of objects. */
double xsum = 0;
int n = 0;
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
xsum += (r.x1() + r.x2()) / 2.0;
n++;
}
double xavg = xsum / n;
/* Find item closest to average center of objects. */
/* Find object closest to average center of objects. */
double xcenter = 7200; /* Start with very large value. */
double dxmin = fabs( xavg - xcenter );
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
double dx = fabs( xavg - (r.x1() + r.x2())/2.0 );
if ( dx < dxmin )
{
@@ -491,12 +491,12 @@ namespace glabels
}
}
/* Now adjust the object positions to line up with the center of this item. */
foreach ( LabelModelItem *item, selectedList )
/* Now adjust the object positions to line up with the center of this object. */
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
double dx = xcenter - (r.x1() + r.x2())/2.0;
item->setPositionRelative( dx, 0 );
object->setPositionRelative( dx, 0 );
}
mModified = true;
@@ -512,22 +512,22 @@ namespace glabels
return;
}
QList<LabelModelItem*> selectedList = getSelection();
QList<LabelModelObject*> selectedList = getSelection();
/* Find top-most edge. */
double y1_min = 7200; /* Start with a very large value: 7200pts = 100in */
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
if ( r.y1() < y1_min ) y1_min = r.y1();
}
/* Now adjust the object positions to line up the top edges at top-most edge. */
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
double dy = y1_min - r.y1();
item->setPositionRelative( 0, dy );
object->setPositionRelative( 0, dy );
}
mModified = true;
@@ -543,22 +543,22 @@ namespace glabels
return;
}
QList<LabelModelItem*> selectedList = getSelection();
QList<LabelModelObject*> selectedList = getSelection();
/* Find bottom-most edge. */
double y1_max = -7200; /* Start with a very large negative value: 7200pts = 100in */
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
if ( r.y1() > y1_max ) y1_max = r.y1();
}
/* Now adjust the object positions to line up the bottom edges at bottom-most edge. */
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
double dy = y1_max - r.y1();
item->setPositionRelative( 0, dy );
object->setPositionRelative( 0, dy );
}
mModified = true;
@@ -574,25 +574,25 @@ namespace glabels
return;
}
QList<LabelModelItem*> selectedList = getSelection();
QList<LabelModelObject*> selectedList = getSelection();
/* Find average center of objects. */
double ysum = 0;
int n = 0;
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
ysum += (r.y1() + r.y2()) / 2.0;
n++;
}
double yavg = ysum / n;
/* Find item closest to average center of objects. */
/* Find object closest to average center of objects. */
double ycenter = 7200; /* Start with very large value. */
double dymin = fabs( yavg - ycenter );
foreach ( LabelModelItem *item, selectedList )
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
double dy = fabs( yavg - (r.y1() + r.y2())/2.0 );
if ( dy < dymin )
{
@@ -601,12 +601,12 @@ namespace glabels
}
}
/* Now adjust the object positions to line up with the center of this item. */
foreach ( LabelModelItem *item, selectedList )
/* Now adjust the object positions to line up with the center of this object. */
foreach ( LabelModelObject* object, selectedList )
{
LabelRegion r = item->getExtent();
LabelRegion r = object->getExtent();
double dy = ycenter - (r.y1() + r.y2())/2.0;
item->setPositionRelative( 0, dy );
object->setPositionRelative( 0, dy );
}
mModified = true;
@@ -619,14 +619,14 @@ namespace glabels
{
double xLabelCenter = w() / 2.0;
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
LabelRegion r = item->getExtent();
double xItemCenter = (r.x1() + r.x2()) / 2.0;
double dx = xLabelCenter - xItemCenter;
item->setPositionRelative( dx, 0 );
LabelRegion r = object->getExtent();
double xObjectCenter = (r.x1() + r.x2()) / 2.0;
double dx = xLabelCenter - xObjectCenter;
object->setPositionRelative( dx, 0 );
}
}
@@ -640,14 +640,14 @@ namespace glabels
{
double yLabelCenter = h() / 2.0;
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
LabelRegion r = item->getExtent();
double yItemCenter = (r.y1() + r.y2()) / 2.0;
double dy = yLabelCenter - yItemCenter;
item->setPositionRelative( 0, dy );
LabelRegion r = object->getExtent();
double yObjectCenter = (r.y1() + r.y2()) / 2.0;
double dy = yLabelCenter - yObjectCenter;
object->setPositionRelative( 0, dy );
}
}
@@ -659,11 +659,11 @@ namespace glabels
void LabelModel::moveSelection( double dx, double dy )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->setPositionRelative( dx, dy );
object->setPositionRelative( dx, dy );
}
}
@@ -675,11 +675,11 @@ namespace glabels
void LabelModel::setSelectionFontFamily( const QString &fontFamily )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->setFontFamily( fontFamily );
object->setFontFamily( fontFamily );
}
}
@@ -691,11 +691,11 @@ namespace glabels
void LabelModel::setSelectionFontSize( double fontSize )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->setFontSize( fontSize );
object->setFontSize( fontSize );
}
}
@@ -707,11 +707,11 @@ namespace glabels
void LabelModel::setSelectionFontWeight( QFont::Weight fontWeight )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->setFontWeight( fontWeight );
object->setFontWeight( fontWeight );
}
}
@@ -723,11 +723,11 @@ namespace glabels
void LabelModel::setSelectionFontItalicFlag( bool fontItalicFlag )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->setFontItalicFlag( fontItalicFlag );
object->setFontItalicFlag( fontItalicFlag );
}
}
@@ -739,11 +739,11 @@ namespace glabels
void LabelModel::setSelectionTextHAlign( Qt::Alignment textHAlign )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->setTextHAlign( textHAlign );
object->setTextHAlign( textHAlign );
}
}
@@ -755,11 +755,11 @@ namespace glabels
void LabelModel::setSelectionTextVAlign( Qt::Alignment textVAlign )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->setTextVAlign( textVAlign );
object->setTextVAlign( textVAlign );
}
}
@@ -771,11 +771,11 @@ namespace glabels
void LabelModel::setSelectionTextLineSpacing( double textLineSpacing )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->setTextLineSpacing( textLineSpacing );
object->setTextLineSpacing( textLineSpacing );
}
}
@@ -787,11 +787,11 @@ namespace glabels
void LabelModel::setSelectionTextColorNode( ColorNode textColorNode )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->setTextColorNode( textColorNode );
object->setTextColorNode( textColorNode );
}
}
@@ -803,11 +803,11 @@ namespace glabels
void LabelModel::setSelectionLineWidth( double lineWidth )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->setLineWidth( lineWidth );
object->setLineWidth( lineWidth );
}
}
@@ -819,11 +819,11 @@ namespace glabels
void LabelModel::setSelectionLineColorNode( ColorNode lineColorNode )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->setLineColorNode( lineColorNode );
object->setLineColorNode( lineColorNode );
}
}
@@ -835,11 +835,11 @@ namespace glabels
void LabelModel::setSelectionFillColorNode( ColorNode fillColorNode )
{
foreach ( LabelModelItem *item, mItemList )
foreach ( LabelModelObject* object, mObjectList )
{
if ( item->isSelected() )
if ( object->isSelected() )
{
item->setFillColorNode( fillColorNode );
object->setFillColorNode( fillColorNode );
}
}
app/LabelModel.h
+20 -20
View File
@@ -25,7 +25,7 @@
#include <QList>
#include "libglabels/Template.h"
#include "LabelModelItem.h"
#include "LabelModelObject.h"
namespace glabels
@@ -44,12 +44,12 @@ namespace glabels
void nameChanged();
void sizeChanged();
void selectionChanged();
void itemChanged( LabelModelItem *item );
void itemMoved( LabelModelItem *item );
void itemAdded( LabelModelItem *item );
void itemDeleted( LabelModelItem *item );
void itemToTop( LabelModelItem *item );
void itemToBottom( LabelModelItem *item );
void objectChanged( LabelModelObject* object );
void objectMoved( LabelModelObject* object );
void objectAdded( LabelModelObject* object );
void objectDeleted( LabelModelObject* object );
void objectToTop( LabelModelObject* object );
void objectToBottom( LabelModelObject* object );
public:
bool isModified() const { return mModified; }
@@ -68,8 +68,8 @@ namespace glabels
int compressionLevel() const { return mCompressionLevel; }
void setCompressionLevel( int compressionLevel ) { mCompressionLevel = compressionLevel; }
const libglabels::Template *tmplate() const { return mTmplate; }
void setTmplate( const libglabels::Template *tmplate )
const libglabels::Template* tmplate() const { return mTmplate; }
void setTmplate( const libglabels::Template* tmplate )
{
if (mTmplate != tmplate)
{
@@ -97,14 +97,14 @@ namespace glabels
double h() const { return mRotate ? mFrame->w() : mFrame->h(); }
void addItem( LabelModelItem *item );
void addObject( LabelModelObject* object );
void deleteItem( LabelModelItem *item );
void deleteObject( LabelModelObject* object );
void selectItem( LabelModelItem *item );
void selectObject( LabelModelObject* object );
void unselectItem( LabelModelItem *item );
void unselectObject( LabelModelObject* object );
void selectAll();
@@ -117,9 +117,9 @@ namespace glabels
bool isSelectionAtomic();
QList<LabelModelItem *> getSelection();
QList<LabelModelObject*> getSelection();
LabelModelItem *getFirstSelectedItem();
LabelModelObject* getFirstSelectedObject();
bool canSelectionText();
@@ -159,19 +159,19 @@ namespace glabels
private slots:
void onItemChanged( LabelModelItem *item );
void onItemMoved( LabelModelItem *item );
void onObjectChanged( LabelModelObject* object );
void onObjectMoved( LabelModelObject* object );
private:
QList<LabelModelItem*> mItemList;
QList<LabelModelObject*> mObjectList;
bool mModified;
QString mFilename;
int mCompressionLevel;
const libglabels::Template *mTmplate;
const libglabels::Frame *mFrame;
const libglabels::Template* mTmplate;
const libglabels::Frame* mFrame;
bool mRotate;
};
app/LabelModelBoxItem.cpp → app/LabelModelBoxObject.cpp
+4 -4
View File
@@ -1,4 +1,4 @@
/* LabelModelBoxItem.cpp
/* LabelModelBoxObject.cpp
*
* Copyright (C) 2013 Jim Evins <evins@snaught.com>
*
@@ -18,7 +18,7 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#include "LabelModelBoxItem.h"
#include "LabelModelBoxObject.h"
#include <QGraphicsRectItem>
#include <QBrush>
@@ -29,7 +29,7 @@ namespace glabels
{
// Create QGraphicsItem suitable for representing this object
QGraphicsItem* LabelModelBoxItem::createGraphicsItem()
QGraphicsItem* LabelModelBoxObject::createGraphicsItem()
{
QGraphicsRectItem *rectItem = new QGraphicsRectItem( x0(), y0(), w(), h() );
@@ -45,7 +45,7 @@ namespace glabels
// Update a QGraphicsItem to keep it in sync with this object
void LabelModelBoxItem::updateGraphicsItem( QGraphicsItem* graphicsItem )
void LabelModelBoxObject::updateGraphicsItem( QGraphicsItem* graphicsItem )
{
QGraphicsRectItem *rectItem = dynamic_cast<QGraphicsRectItem*>(graphicsItem);
if ( rectItem )
app/LabelModelBoxItem.h → app/LabelModelBoxObject.h
+8 -8
View File
@@ -1,4 +1,4 @@
/* LabelModelBoxItem.h
/* LabelModelBoxObject.h
*
* Copyright (C) 2013 Jim Evins <evins@snaught.com>
*
@@ -18,16 +18,16 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef glabels_LabelModelBoxItem_h
#define glabels_LabelModelBoxItem_h
#ifndef glabels_LabelModelBoxObject_h
#define glabels_LabelModelBoxObject_h
#include "LabelModelItem.h"
#include "LabelModelObject.h"
namespace glabels
{
class LabelModelBoxItem : public LabelModelItem
class LabelModelBoxObject : public LabelModelObject
{
Q_OBJECT
@@ -35,8 +35,8 @@ namespace glabels
// Lifecycle Methods
///////////////////////////////////////////////////////////////
public:
LabelModelBoxItem( QObject *parent = 0 ) : LabelModelItem(parent) { /* TODO: initialize default line and fill poperties. */ };
virtual ~LabelModelBoxItem() {}
LabelModelBoxObject( QObject *parent = 0 ) : LabelModelObject(parent) { /* TODO: initialize default line and fill poperties. */ };
virtual ~LabelModelBoxObject() {}
///////////////////////////////////////////////////////////////
@@ -95,4 +95,4 @@ namespace glabels
}
#endif // glabels_LabelModelBoxItem_h
#endif // glabels_LabelModelBoxObject_h
app/LabelModelItem.cpp → app/LabelModelObject.cpp
+14 -14
View File
@@ -1,4 +1,4 @@
/* LabelModelItem.cpp
/* LabelModelObject.cpp
*
* Copyright (C) 2013 Jim Evins <evins@snaught.com>
*
@@ -18,18 +18,18 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#include "LabelModelItem.h"
#include "LabelModelObject.h"
namespace glabels
{
int LabelModelItem::lastId = 0;
int LabelModelObject::lastId = 0;
/*
* Default constructor.
*/
LabelModelItem::LabelModelItem( QObject *parent = 0 ) : QObject(parent)
LabelModelObject::LabelModelObject( QObject *parent = 0 ) : QObject(parent)
{
mId = lastId++;
@@ -49,7 +49,7 @@ namespace glabels
}
void LabelModelItem::setPosition( double x0, double y0 )
void LabelModelObject::setPosition( double x0, double y0 )
{
if ( ( mX0 != x0 ) || ( mY0 != y0 ) )
{
@@ -61,7 +61,7 @@ namespace glabels
}
void LabelModelItem::setPositionRelative( double dx, double dy )
void LabelModelObject::setPositionRelative( double dx, double dy )
{
if ( ( dx != 0 ) || ( dy != 0 ) )
{
@@ -73,14 +73,14 @@ namespace glabels
}
void LabelModelItem::setSize( double w, double h )
void LabelModelObject::setSize( double w, double h )
{
mW = w;
mH = h;
}
void LabelModelItem::setSizeHonorAspect( double w, double h )
void LabelModelObject::setSizeHonorAspect( double w, double h )
{
double aspectRatio = mH / mW;
@@ -103,7 +103,7 @@ namespace glabels
}
void LabelModelItem::setWHonorAspect( double w )
void LabelModelObject::setWHonorAspect( double w )
{
double aspectRatio = mH / mW;
double h = w * aspectRatio;
@@ -118,7 +118,7 @@ namespace glabels
}
void LabelModelItem::setHHonorAspect( double h )
void LabelModelObject::setHHonorAspect( double h )
{
double aspectRatio = mH / mW;
double w = h / aspectRatio;
@@ -133,7 +133,7 @@ namespace glabels
}
LabelRegion LabelModelItem::getExtent()
LabelRegion LabelModelObject::getExtent()
{
QPointF a1( - lineWidth()/2, - lineWidth()/2 );
QPointF a2( mW + lineWidth()/2, - lineWidth()/2 );
@@ -155,7 +155,7 @@ namespace glabels
}
void LabelModelItem::rotate( double thetaDegs )
void LabelModelObject::rotate( double thetaDegs )
{
if ( thetaDegs != 0 )
{
@@ -165,14 +165,14 @@ namespace glabels
}
void LabelModelItem::flipHoriz()
void LabelModelObject::flipHoriz()
{
mMatrix = mMatrix.scale( -1, 1 );
emit changed();
}
void LabelModelItem::flipVert()
void LabelModelObject::flipVert()
{
mMatrix = mMatrix.scale( 1, -1 );
emit changed();
app/LabelModelItem.h → app/LabelModelObject.h
+7 -7
View File
@@ -1,4 +1,4 @@
/* LabelModelItem.h
/* LabelModelObject.h
*
* Copyright (C) 2013 Jim Evins <evins@snaught.com>
*
@@ -18,8 +18,8 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef glabels_LabelModelItem_h
#define glabels_LabelModelItem_h
#ifndef glabels_LabelModelObject_h
#define glabels_LabelModelObject_h
#include <QObject>
#include <QTransform>
@@ -36,7 +36,7 @@
namespace glabels
{
class LabelModelItem : public QObject
class LabelModelObject : public QObject
{
Q_OBJECT
@@ -44,8 +44,8 @@ namespace glabels
// Lifecycle Methods
///////////////////////////////////////////////////////////////
public:
LabelModelItem( QObject *parent );
virtual ~LabelModelItem() {}
LabelModelObject( QObject *parent );
virtual ~LabelModelObject() {}
///////////////////////////////////////////////////////////////
@@ -456,4 +456,4 @@ namespace glabels
}
#endif // glabels_LabelModelItem_h
#endif // glabels_LabelModelObject_h