Merge branch 'master' into 1.4

This commit is contained in:
Arin Alexander 2016-07-25 15:16:32 +03:00
commit faf47cca29
2 changed files with 38 additions and 0 deletions

View File

@ -203,6 +203,38 @@ QString BaseDesignIntf::setItemHeight(qreal height)
return QString();
}
qreal BaseDesignIntf::getItemWidth()
{
return width() / mmFactor();
}
qreal BaseDesignIntf::getItemHeight()
{
return height() / mmFactor();
}
qreal BaseDesignIntf::getItemPosX()
{
return x() / mmFactor();
}
qreal BaseDesignIntf::getItemPosY()
{
return y() / mmFactor();
}
QString BaseDesignIntf::setItemPosX(qreal xValue)
{
setItemPos(xValue * mmFactor(),y());
return QString();
}
QString BaseDesignIntf::setItemPosY(qreal yValue)
{
setItemPos(x(),yValue * mmFactor());
return QString();
}
QFont BaseDesignIntf::transformToSceneFont(const QFont& value) const
{
QFont f = value;

View File

@ -251,6 +251,12 @@ public:
Q_INVOKABLE QString setItemWidth(qreal width);
Q_INVOKABLE QString setItemHeight(qreal height);
Q_INVOKABLE qreal getItemWidth();
Q_INVOKABLE qreal getItemHeight();
Q_INVOKABLE qreal getItemPosX();
Q_INVOKABLE qreal getItemPosY();
Q_INVOKABLE QString setItemPosX(qreal xValue);
Q_INVOKABLE QString setItemPosY(qreal yValue);
protected:
//ICollectionContainer