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

Renamed LabelRegion to just Region. Reconciled style with Size class.

Browse Source
This commit is contained in:
Jim Evins
2017-01-05 16:46:40 -05:00
parent 9d39b9804a
commit 90ea790e7a
8 changed files with 72 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/CMakeLists.txt
+1 -1
View File
@@ -48,7 +48,6 @@ set (glabels_sources
LabelModelLineObject.cpp LabelModelLineObject.cpp
LabelModelShapeObject.cpp LabelModelShapeObject.cpp
LabelModelTextObject.cpp LabelModelTextObject.cpp
LabelRegion.cpp
MainWindow.cpp MainWindow.cpp
MergeView.cpp MergeView.cpp
ObjectEditor.cpp ObjectEditor.cpp
@@ -59,6 +58,7 @@ set (glabels_sources
PropertiesView.cpp PropertiesView.cpp
Preview.cpp Preview.cpp
PreviewOverlayItem.cpp PreviewOverlayItem.cpp
Region.cpp
SelectProductDialog.cpp SelectProductDialog.cpp
Settings.cpp Settings.cpp
SimplePreview.cpp SimplePreview.cpp
glabels/LabelEditor.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include <QScrollArea> #include <QScrollArea>
#include <QPainter> #include <QPainter>
#include "LabelRegion.h" #include "Region.h"
// Forward References // Forward References
@@ -191,7 +191,7 @@ private:
/* ArrowSelectRegion state */ /* ArrowSelectRegion state */
bool mSelectRegionVisible; bool mSelectRegionVisible;
LabelRegion mSelectRegion; Region mSelectRegion;
/* ArrowMove state */ /* ArrowMove state */
glabels::Distance mMoveLastX; glabels::Distance mMoveLastX;
glabels/LabelModel.cpp
+19 -19
View File
@@ -28,7 +28,7 @@
#include "Merge/None.h" #include "Merge/None.h"
#include "LabelModelObject.h" #include "LabelModelObject.h"
#include "LabelRegion.h" #include "Region.h"
#include "XmlLabelCreator.h" #include "XmlLabelCreator.h"
#include "XmlLabelParser.h" #include "XmlLabelParser.h"
@@ -496,7 +496,7 @@ void LabelModel::unselectAll()
/// ///
/// Select Region /// Select Region
/// ///
void LabelModel::selectRegion( const LabelRegion &region ) void LabelModel::selectRegion( const Region &region )
{ {
glabels::Distance rX1 = min( region.x1(), region.x2() ); glabels::Distance rX1 = min( region.x1(), region.x2() );
glabels::Distance rY1 = min( region.y1(), region.y2() ); glabels::Distance rY1 = min( region.y1(), region.y2() );
@@ -505,7 +505,7 @@ void LabelModel::selectRegion( const LabelRegion &region )
foreach ( LabelModelObject* object, mObjectList ) foreach ( LabelModelObject* object, mObjectList )
{ {
LabelRegion objectExtent = object->getExtent(); Region objectExtent = object->getExtent();
if ( (objectExtent.x1() >= rX1) && if ( (objectExtent.x1() >= rX1) &&
(objectExtent.x2() <= rX2) && (objectExtent.x2() <= rX2) &&
@@ -820,14 +820,14 @@ void LabelModel::alignSelectionLeft()
glabels::Distance x1_min = 7200; /// Start with a very large value: 7200pts = 100in glabels::Distance x1_min = 7200; /// Start with a very large value: 7200pts = 100in
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
if ( r.x1() < x1_min ) x1_min = r.x1(); if ( r.x1() < x1_min ) x1_min = r.x1();
} }
/// Now adjust the object positions to line up the left edges at left-most edge. /// Now adjust the object positions to line up the left edges at left-most edge.
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
glabels::Distance dx = x1_min - r.x1(); glabels::Distance dx = x1_min - r.x1();
object->setPositionRelative( dx, 0 ); object->setPositionRelative( dx, 0 );
} }
@@ -854,14 +854,14 @@ void LabelModel::alignSelectionRight()
glabels::Distance x1_max = -7200; /// Start with a very large negative value: 7200pts = 100in glabels::Distance x1_max = -7200; /// Start with a very large negative value: 7200pts = 100in
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
if ( r.x1() > x1_max ) x1_max = r.x1(); if ( r.x1() > x1_max ) x1_max = r.x1();
} }
/// Now adjust the object positions to line up the right edges at right-most edge. /// Now adjust the object positions to line up the right edges at right-most edge.
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
glabels::Distance dx = x1_max - r.x1(); glabels::Distance dx = x1_max - r.x1();
object->setPositionRelative( dx, 0 ); object->setPositionRelative( dx, 0 );
} }
@@ -889,7 +889,7 @@ void LabelModel::alignSelectionHCenter()
int n = 0; int n = 0;
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
xsum += (r.x1() + r.x2()) / 2.0; xsum += (r.x1() + r.x2()) / 2.0;
n++; n++;
} }
@@ -900,7 +900,7 @@ void LabelModel::alignSelectionHCenter()
glabels::Distance dxmin = fabs( xavg - xcenter ); glabels::Distance dxmin = fabs( xavg - xcenter );
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
glabels::Distance dx = fabs( xavg - (r.x1() + r.x2())/2.0 ); glabels::Distance dx = fabs( xavg - (r.x1() + r.x2())/2.0 );
if ( dx < dxmin ) if ( dx < dxmin )
{ {
@@ -912,7 +912,7 @@ void LabelModel::alignSelectionHCenter()
/// Now adjust the object positions to line up with the center of this object. /// Now adjust the object positions to line up with the center of this object.
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
glabels::Distance dx = xcenter - (r.x1() + r.x2())/2.0; glabels::Distance dx = xcenter - (r.x1() + r.x2())/2.0;
object->setPositionRelative( dx, 0 ); object->setPositionRelative( dx, 0 );
} }
@@ -939,14 +939,14 @@ void LabelModel::alignSelectionTop()
glabels::Distance y1_min = 7200; /// Start with a very large value: 7200pts = 100in glabels::Distance y1_min = 7200; /// Start with a very large value: 7200pts = 100in
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
if ( r.y1() < y1_min ) y1_min = r.y1(); if ( r.y1() < y1_min ) y1_min = r.y1();
} }
/// Now adjust the object positions to line up the top edges at top-most edge. /// Now adjust the object positions to line up the top edges at top-most edge.
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
glabels::Distance dy = y1_min - r.y1(); glabels::Distance dy = y1_min - r.y1();
object->setPositionRelative( 0, dy ); object->setPositionRelative( 0, dy );
} }
@@ -973,14 +973,14 @@ void LabelModel::alignSelectionBottom()
glabels::Distance y1_max = -7200; /// Start with a very large negative value: 7200pts = 100in glabels::Distance y1_max = -7200; /// Start with a very large negative value: 7200pts = 100in
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
if ( r.y1() > y1_max ) y1_max = r.y1(); if ( r.y1() > y1_max ) y1_max = r.y1();
} }
/// Now adjust the object positions to line up the bottom edges at bottom-most edge. /// Now adjust the object positions to line up the bottom edges at bottom-most edge.
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
glabels::Distance dy = y1_max - r.y1(); glabels::Distance dy = y1_max - r.y1();
object->setPositionRelative( 0, dy ); object->setPositionRelative( 0, dy );
} }
@@ -1008,7 +1008,7 @@ void LabelModel::alignSelectionVCenter()
int n = 0; int n = 0;
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
ysum += (r.y1() + r.y2()) / 2.0; ysum += (r.y1() + r.y2()) / 2.0;
n++; n++;
} }
@@ -1019,7 +1019,7 @@ void LabelModel::alignSelectionVCenter()
glabels::Distance dymin = fabs( yavg - ycenter ); glabels::Distance dymin = fabs( yavg - ycenter );
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
glabels::Distance dy = fabs( yavg - (r.y1() + r.y2())/2.0 ); glabels::Distance dy = fabs( yavg - (r.y1() + r.y2())/2.0 );
if ( dy < dymin ) if ( dy < dymin )
{ {
@@ -1031,7 +1031,7 @@ void LabelModel::alignSelectionVCenter()
/// Now adjust the object positions to line up with the center of this object. /// Now adjust the object positions to line up with the center of this object.
foreach ( LabelModelObject* object, selectedList ) foreach ( LabelModelObject* object, selectedList )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
glabels::Distance dy = ycenter - (r.y1() + r.y2())/2.0; glabels::Distance dy = ycenter - (r.y1() + r.y2())/2.0;
object->setPositionRelative( 0, dy ); object->setPositionRelative( 0, dy );
} }
@@ -1053,7 +1053,7 @@ void LabelModel::centerSelectionHoriz()
{ {
if ( object->isSelected() ) if ( object->isSelected() )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
glabels::Distance xObjectCenter = (r.x1() + r.x2()) / 2.0; glabels::Distance xObjectCenter = (r.x1() + r.x2()) / 2.0;
glabels::Distance dx = xLabelCenter - xObjectCenter; glabels::Distance dx = xLabelCenter - xObjectCenter;
object->setPositionRelative( dx, 0 ); object->setPositionRelative( dx, 0 );
@@ -1077,7 +1077,7 @@ void LabelModel::centerSelectionVert()
{ {
if ( object->isSelected() ) if ( object->isSelected() )
{ {
LabelRegion r = object->getExtent(); Region r = object->getExtent();
glabels::Distance yObjectCenter = (r.y1() + r.y2()) / 2.0; glabels::Distance yObjectCenter = (r.y1() + r.y2()) / 2.0;
glabels::Distance dy = yLabelCenter - yObjectCenter; glabels::Distance dy = yLabelCenter - yObjectCenter;
object->setPositionRelative( 0, dy ); object->setPositionRelative( 0, dy );
glabels/LabelModel.h
+2 -2
View File
@@ -35,7 +35,7 @@
// Forward References // Forward References
class LabelModelObject; class LabelModelObject;
class Handle; class Handle;
class LabelRegion; class Region;
class ColorNode; class ColorNode;
@@ -133,7 +133,7 @@ public:
void unselectObject( LabelModelObject* object ); void unselectObject( LabelModelObject* object );
void selectAll(); void selectAll();
void unselectAll(); void unselectAll();
void selectRegion( const LabelRegion& region ); void selectRegion( const Region& region );
bool isSelectionEmpty(); bool isSelectionEmpty();
bool isSelectionAtomic(); bool isSelectionAtomic();
glabels/LabelModelObject.cpp
+3 -3
View File
@@ -26,7 +26,7 @@
#include "ColorNode.h" #include "ColorNode.h"
#include "TextNode.h" #include "TextNode.h"
#include "BarcodeStyle.h" #include "BarcodeStyle.h"
#include "LabelRegion.h" #include "Region.h"
#include "Size.h" #include "Size.h"
@@ -927,7 +927,7 @@ void LabelModelObject::setHHonorAspect( const glabels::Distance& h )
/// ///
/// Get Extent of Bounding Box /// Get Extent of Bounding Box
/// ///
LabelRegion LabelModelObject::getExtent() Region LabelModelObject::getExtent()
{ {
using namespace glabels; using namespace glabels;
@@ -941,7 +941,7 @@ LabelRegion LabelModelObject::getExtent()
a3 = mMatrix.map( a3 ); a3 = mMatrix.map( a3 );
a4 = mMatrix.map( a4 ); a4 = mMatrix.map( a4 );
LabelRegion region; Region region;
region.setX1( min( a1.x(), min( a2.x(), min( a3.x(), a4.x() ) ) ) + mX0 ); region.setX1( min( a1.x(), min( a2.x(), min( a3.x(), a4.x() ) ) ) + mX0 );
region.setY1( min( a1.y(), min( a2.y(), min( a3.y(), a4.y() ) ) ) + mY0 ); region.setY1( min( a1.y(), min( a2.y(), min( a3.y(), a4.y() ) ) ) + mY0 );
region.setX2( max( a1.x(), max( a2.x(), max( a3.x(), a4.x() ) ) ) + mX0 ); region.setX2( max( a1.x(), max( a2.x(), max( a3.x(), a4.x() ) ) ) + mX0 );
glabels/LabelModelObject.h
+2 -2
View File
@@ -36,7 +36,7 @@
// Forward References // Forward References
class LabelRegion; class Region;
class Size; class Size;
@@ -341,7 +341,7 @@ public:
void setSizeHonorAspect( const glabels::Distance& w, const glabels::Distance& h ); void setSizeHonorAspect( const glabels::Distance& w, const glabels::Distance& h );
void setWHonorAspect( const glabels::Distance& w ); void setWHonorAspect( const glabels::Distance& w );
void setHHonorAspect( const glabels::Distance& h ); void setHHonorAspect( const glabels::Distance& h );
LabelRegion getExtent(); Region getExtent();
void rotate( double thetaDegs ); void rotate( double thetaDegs );
void flipHoriz(); void flipHoriz();
void flipVert(); void flipVert();
glabels/LabelRegion.cpp → glabels/Region.cpp
+29 -11
View File
@@ -1,4 +1,4 @@
/* LabelRegion.cpp /* Region.cpp
* *
* Copyright (C) 2013-2016 Jim Evins <evins@snaught.com> * Copyright (C) 2013-2016 Jim Evins <evins@snaught.com>
* *
@@ -18,13 +18,31 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>. * along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "LabelRegion.h" #include "Region.h"
///
/// Constructor
///
Region::Region() : mX1(0), mY1(0), mX2(0), mY2(0)
{
}
///
/// Constructor
///
Region::Region( const glabels::Distance& x1, const glabels::Distance& y1,
const glabels::Distance& x2, const glabels::Distance& y2 )
: mX1(x1), mY1(y1), mX2(x2), mY2(y2)
{
}
/// ///
/// Get x1 /// Get x1
/// ///
glabels::Distance LabelRegion::x1( void ) const glabels::Distance Region::x1( void ) const
{ {
return mX1; return mX1;
} }
@@ -33,7 +51,7 @@ glabels::Distance LabelRegion::x1( void ) const
/// ///
/// Set x1 /// Set x1
/// ///
void LabelRegion::setX1( const glabels::Distance& value ) void Region::setX1( const glabels::Distance& value )
{ {
mX1 = value; mX1 = value;
} }
@@ -42,7 +60,7 @@ void LabelRegion::setX1( const glabels::Distance& value )
/// ///
/// Get y1 /// Get y1
/// ///
glabels::Distance LabelRegion::y1( void ) const glabels::Distance Region::y1( void ) const
{ {
return mY1; return mY1;
} }
@@ -51,7 +69,7 @@ glabels::Distance LabelRegion::y1( void ) const
/// ///
/// Set y1 /// Set y1
/// ///
void LabelRegion::setY1( const glabels::Distance& value ) void Region::setY1( const glabels::Distance& value )
{ {
mY1 = value; mY1 = value;
} }
@@ -60,7 +78,7 @@ void LabelRegion::setY1( const glabels::Distance& value )
/// ///
/// Get x2 /// Get x2
/// ///
glabels::Distance LabelRegion::x2( void ) const glabels::Distance Region::x2( void ) const
{ {
return mX2; return mX2;
} }
@@ -69,7 +87,7 @@ glabels::Distance LabelRegion::x2( void ) const
/// ///
/// Set x2 /// Set x2
/// ///
void LabelRegion::setX2( const glabels::Distance& value ) void Region::setX2( const glabels::Distance& value )
{ {
mX2 = value; mX2 = value;
} }
@@ -78,7 +96,7 @@ void LabelRegion::setX2( const glabels::Distance& value )
/// ///
/// Get y2 /// Get y2
/// ///
glabels::Distance LabelRegion::y2( void ) const glabels::Distance Region::y2( void ) const
{ {
return mY2; return mY2;
} }
@@ -87,7 +105,7 @@ glabels::Distance LabelRegion::y2( void ) const
/// ///
/// Set y2 /// Set y2
/// ///
void LabelRegion::setY2( const glabels::Distance& value ) void Region::setY2( const glabels::Distance& value )
{ {
mY2 = value; mY2 = value;
} }
@@ -96,7 +114,7 @@ void LabelRegion::setY2( const glabels::Distance& value )
/// ///
/// Convert to a QRectF /// Convert to a QRectF
/// ///
QRectF LabelRegion::rect() const QRectF Region::rect() const
{ {
QRectF r; QRectF r;
glabels/LabelRegion.h → glabels/Region.h
+14 -5
View File
@@ -1,4 +1,4 @@
/* LabelRegion.h /* Region.h
* *
* Copyright (C) 2013 Jim Evins <evins@snaught.com> * Copyright (C) 2013 Jim Evins <evins@snaught.com>
* *
@@ -18,8 +18,8 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>. * along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef LabelRegion_h #ifndef Region_h
#define LabelRegion_h #define Region_h
#include <QRectF> #include <QRectF>
#include "libglabels/Distance.h" #include "libglabels/Distance.h"
@@ -28,9 +28,18 @@
/// ///
/// Label Region Type /// Label Region Type
/// ///
struct LabelRegion struct Region
{ {
/////////////////////////////////
// Constructors
/////////////////////////////////
public:
Region();
Region( const glabels::Distance& x1, const glabels::Distance& y1,
const glabels::Distance& x2, const glabels::Distance& y2 );
///////////////////////////////// /////////////////////////////////
// Properties // Properties
///////////////////////////////// /////////////////////////////////
@@ -82,4 +91,4 @@ private:
}; };
#endif // LabelRegion_h #endif // Region_h