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

Removed inlines in LabelModel and LabelRegion.

Browse Source
This commit is contained in:
Jim Evins
2016-05-01 15:33:13 -04:00
parent ec85e2c0ef
commit 3cd0806792
4 changed files with 225 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/LabelModel.cpp
+137 -1
View File
@@ -102,7 +102,143 @@ void LabelModel::restore( const LabelModel *savedModel )
///
/// Short name.
/// Is model modified?
///
bool LabelModel::isModified() const
{
return mModified;
}
///
/// Get filename
///
const QString& LabelModel::fileName() const
{
return mFileName;
}
///
/// Set filename
///
void LabelModel::setFileName( const QString &fileName )
{
if ( mFileName != fileName )
{
mFileName = fileName;
emit nameChanged();
}
}
///
/// Get compression level
///
int LabelModel::compressionLevel() const
{
return mCompressionLevel;
}
///
/// Set compression level
///
void LabelModel::setCompressionLevel( int compressionLevel )
{
mCompressionLevel = compressionLevel;
}
///
/// Get template
///
const glabels::Template* LabelModel::tmplate() const
{
return mTmplate;
}
///
/// Get frame
///
const glabels::Frame* LabelModel::frame() const
{
return mFrame;
}
///
/// Set template
///
void LabelModel::setTmplate( const glabels::Template* tmplate )
{
if (mTmplate != tmplate)
{
mTmplate = tmplate;
mFrame = tmplate->frames().first();
mModified = true;
emit changed();
emit sizeChanged();
Settings::addToRecentTemplateList( tmplate->name() );
}
}
///
/// Get rotation
///
bool LabelModel::rotate() const
{
return mRotate;
}
///
/// Set rotation
///
void LabelModel::setRotate( bool rotate )
{
if (mRotate != rotate)
{
mRotate = rotate;
mModified = true;
emit changed();
emit sizeChanged();
}
}
///
/// Get width
///
glabels::Distance LabelModel::w() const
{
return mRotate ? mFrame->h() : mFrame->w();
}
///
/// Get height
///
glabels::Distance LabelModel::h() const
{
return mRotate ? mFrame->w() : mFrame->h();
}
///
/// Get object list
///
const QList<LabelModelObject*>& LabelModel::objectList() const
{
return mObjectList;
}
///
/// Get short name.
///
QString LabelModel::shortName()
{
glabels/LabelModel.h
+13 -115
View File
@@ -77,27 +77,27 @@ signals:
// Properties
/////////////////////////////////
public:
inline bool isModified() const;
bool isModified() const;
void clearModified();
QString shortName();
inline const QString& fileName() const;
inline void setFileName( const QString &fileName );
const QString& fileName() const;
void setFileName( const QString &fileName );
inline int compressionLevel() const;
inline void setCompressionLevel( int compressionLevel );
int compressionLevel() const;
void setCompressionLevel( int compressionLevel );
inline const glabels::Template* tmplate() const;
inline const glabels::Frame* frame() const;
inline void setTmplate( const glabels::Template* tmplate );
const glabels::Template* tmplate() const;
const glabels::Frame* frame() const;
void setTmplate( const glabels::Template* tmplate );
inline bool rotate() const;
inline void setRotate( bool rotate );
bool rotate() const;
void setRotate( bool rotate );
inline glabels::Distance w() const;
inline glabels::Distance h() const;
glabels::Distance w() const;
glabels::Distance h() const;
inline const QList<LabelModelObject*>& objectList() const;
const QList<LabelModelObject*>& objectList() const;
/////////////////////////////////
@@ -221,106 +221,4 @@ private:
};
/////////////////////////////////
// INLINE METHODS
/////////////////////////////////
inline bool LabelModel::isModified() const
{
return mModified;
}
inline const QString& LabelModel::fileName() const
{
return mFileName;
}
inline void LabelModel::setFileName( const QString &fileName )
{
if ( mFileName != fileName )
{
mFileName = fileName;
emit nameChanged();
}
}
inline int LabelModel::compressionLevel() const
{
return mCompressionLevel;
}
inline void LabelModel::setCompressionLevel( int compressionLevel )
{
mCompressionLevel = compressionLevel;
}
inline const glabels::Template* LabelModel::tmplate() const
{
return mTmplate;
}
inline const glabels::Frame* LabelModel::frame() const
{
return mFrame;
}
inline void LabelModel::setTmplate( const glabels::Template* tmplate )
{
if (mTmplate != tmplate)
{
mTmplate = tmplate;
mFrame = tmplate->frames().first();
mModified = true;
emit changed();
emit sizeChanged();
Settings::addToRecentTemplateList( tmplate->name() );
}
}
inline bool LabelModel::rotate() const
{
return mRotate;
}
inline void LabelModel::setRotate( bool rotate )
{
if (mRotate != rotate)
{
mRotate = rotate;
mModified = true;
emit changed();
emit sizeChanged();
}
}
inline glabels::Distance LabelModel::w() const
{
return mRotate ? mFrame->h() : mFrame->w();
}
inline glabels::Distance LabelModel::h() const
{
return mRotate ? mFrame->w() : mFrame->h();
}
inline const QList<LabelModelObject*>& LabelModel::objectList() const
{
return mObjectList;
}
#endif // LabelModel_h
glabels/LabelRegion.cpp
+75
View File
@@ -24,6 +24,81 @@
#include <cmath>
///
/// Get x1
///
glabels::Distance LabelRegion::x1( void ) const
{
return mX1;
}
///
/// Set x1
///
void LabelRegion::setX1( const glabels::Distance& value )
{
mX1 = value;
}
///
/// Get y1
///
glabels::Distance LabelRegion::y1( void ) const
{
return mY1;
}
///
/// Set y1
///
void LabelRegion::setY1( const glabels::Distance& value )
{
mY1 = value;
}
///
/// Get x2
///
glabels::Distance LabelRegion::x2( void ) const
{
return mX2;
}
///
/// Set x2
///
void LabelRegion::setX2( const glabels::Distance& value )
{
mX2 = value;
}
///
/// Get y2
///
glabels::Distance LabelRegion::y2( void ) const
{
return mY2;
}
///
/// Set y2
///
void LabelRegion::setY2( const glabels::Distance& value )
{
mY2 = value;
}
///
/// Convert to a QRectF
///
QRectF LabelRegion::rect() const
{
using std::min;
glabels/LabelRegion.h
-51
View File
@@ -82,55 +82,4 @@ private:
};
/////////////////////////////////
// INLINE METHODS
/////////////////////////////////
inline glabels::Distance LabelRegion::x1( void ) const
{
return mX1;
}
inline void LabelRegion::setX1( const glabels::Distance& value )
{
mX1 = value;
}
inline glabels::Distance LabelRegion::y1( void ) const
{
return mY1;
}
inline void LabelRegion::setY1( const glabels::Distance& value )
{
mY1 = value;
}
inline glabels::Distance LabelRegion::x2( void ) const
{
return mX2;
}
inline void LabelRegion::setX2( const glabels::Distance& value )
{
mX2 = value;
}
inline glabels::Distance LabelRegion::y2( void ) const
{
return mY2;
}
inline void LabelRegion::setY2( const glabels::Distance& value )
{
mY2 = value;
}
#endif // LabelRegion_h