kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rectangle editor widget : use QPropertyUndoCommand instead of ChangePartCommand

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4064 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2015-07-22 13:19:43 +00:00
parent f24b1dd8d8
commit 6a902ca530
7 changed files with 115 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sources/QPropertyUndoCommand/qpropertyundocommand.cpp
View File

@@ -16,7 +16,7 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "qpropertyundocommand.h"
#include <QAnimationGroup>
#include <QPropertyAnimation>
/**
* @brief QPropertyUndoCommand::QPropertyUndoCommand
@@ -33,12 +33,7 @@ QPropertyUndoCommand::QPropertyUndoCommand(QObject *object, const char *property
m_old_value(old_value),
m_new_value(new_value),
m_animate(false)
{
m_animation.setTargetObject(object);
m_animation.setPropertyName(property_name);
m_animation.setStartValue(old_value);
m_animation.setEndValue(new_value);
}
{}
/**
* @brief QPropertyUndoCommand::QPropertyUndoCommand
@@ -55,21 +50,15 @@ QPropertyUndoCommand::QPropertyUndoCommand(QObject *object, const char *property
m_property_name(property_name),
m_old_value(old_value),
m_animate(false)
{
m_animation.setTargetObject(object);
m_animation.setPropertyName(property_name);
m_animation.setStartValue(old_value);
}
{}
/**
* @brief QPropertyUndoCommand::setNewValue
* Set the new value of the property (set with redo) to @new_value
* @param new_value
*/
void QPropertyUndoCommand::setNewValue(const QVariant &new_value)
{
void QPropertyUndoCommand::setNewValue(const QVariant &new_value) {
m_new_value = new_value;
m_animation.setEndValue(new_value);
}
/**
@@ -93,7 +82,6 @@ bool QPropertyUndoCommand::mergeWith(const QUndoCommand *other)
QPropertyUndoCommand const *undo = static_cast<const QPropertyUndoCommand *>(other);
if (m_object != undo->m_object || m_property_name != undo->m_property_name) return false;
m_new_value = undo->m_new_value;
m_animation.setEndValue(m_new_value);
return true;
}
@@ -107,8 +95,10 @@ void QPropertyUndoCommand::redo()
{
if (m_animate)
{
m_animation.setDirection(QAnimationGroup::Forward);
m_animation.start();
QPropertyAnimation *animation = new QPropertyAnimation(m_object, m_property_name);
animation->setStartValue(m_old_value);
animation->setEndValue(m_new_value);
animation->start(QAbstractAnimation::DeleteWhenStopped);
}
else
m_object->setProperty(m_property_name, m_new_value);
@@ -127,8 +117,10 @@ void QPropertyUndoCommand::undo()
{
if (m_animate)
{
m_animation.setDirection(QAnimationGroup::Backward);
m_animation.start();
QPropertyAnimation *animation = new QPropertyAnimation(m_object, m_property_name);
animation->setStartValue(m_new_value);
animation->setEndValue(m_old_value);
animation->start(QAbstractAnimation::DeleteWhenStopped);
}
else
m_object->setProperty(m_property_name, m_old_value);