Element editor : Add animation for some undo/redo

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4060 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2015-07-20 21:06:00 +00:00
parent 50d98b2167
commit 012ba2ccd7
17 changed files with 278 additions and 39 deletions

View File

@@ -0,0 +1,5 @@
HEADERS += \
$$PWD/qpropertyundocommand.h
SOURCES += \
$$PWD/qpropertyundocommand.cpp

View File

@@ -0,0 +1,138 @@
/*
Copyright 2006-2015 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "qpropertyundocommand.h"
#include <QAnimationGroup>
/**
* @brief QPropertyUndoCommand::QPropertyUndoCommand
* Default constructor with old and new value
* This command don't take ownership of @object
* @param object
* @param old_value
* @param new_value
*/
QPropertyUndoCommand::QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, const QVariant &new_value, QUndoCommand *parent) :
QUndoCommand(parent),
m_object(object),
m_property_name(property_name),
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
* Default constructor with old value.
* Call setNewValue to setup the new value of the edited QObject
* This command don't take ownership of @object
* @param object
* @param old_value
* @param parent
*/
QPropertyUndoCommand::QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, QUndoCommand *parent) :
QUndoCommand(parent),
m_object(object),
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)
{
m_new_value = new_value;
m_animation.setEndValue(new_value);
}
/**
* @brief QPropertyUndoCommand::enableAnimation
* True to enable animation
* @param animate
*/
void QPropertyUndoCommand::enableAnimation (bool animate) {
m_animate = animate;
}
/**
* @brief QPropertyUndoCommand::mergeWith
* Try to merge this command with other command
* @param other
* @return true if was merged, else false
*/
bool QPropertyUndoCommand::mergeWith(const QUndoCommand *other)
{
if (id() != other->id() || other->childCount()) return false;
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;
}
/**
* @brief QPropertyUndoCommand::redo
* Redo this command
*/
void QPropertyUndoCommand::redo()
{
if (m_object->property(m_property_name) != m_new_value)
{
if (m_animate)
{
m_animation.setDirection(QAnimationGroup::Forward);
m_animation.start();
}
else
m_object->setProperty(m_property_name, m_new_value);
}
QUndoCommand::redo();
}
/**
* @brief QPropertyUndoCommand::undo
* Undo this command
*/
void QPropertyUndoCommand::undo()
{
if (m_object->property(m_property_name) != m_old_value)
{
if (m_animate)
{
m_animation.setDirection(QAnimationGroup::Backward);
m_animation.start();
}
else
m_object->setProperty(m_property_name, m_old_value);
}
QUndoCommand::undo();
}

View File

@@ -0,0 +1,56 @@
/*
Copyright 2006-2015 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef QPROPERTYUNDOCOMMAND_H
#define QPROPERTYUNDOCOMMAND_H
#include <QUndoCommand>
#include <QVariant>
#include <QPropertyAnimation>
class QObject;
/**
* @brief The QPropertyUndoCommand class
* This undo command manage QProperty of a QObject.
* This undo command can use QPropertyAnimation to animate the change when undo/redo is call
* To use animation call setAnimated(true). By default animation is disable.
* Some QVariant date can't be animated and result this command don't work.
*/
class QPropertyUndoCommand : public QUndoCommand
{
public:
QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, const QVariant &new_value, QUndoCommand *parent = 0);
QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, QUndoCommand *parent = 0);
void setNewValue(const QVariant &new_value);
void enableAnimation (bool animate = true);
int id() const{return 10000;}
virtual bool mergeWith(const QUndoCommand *other);
void redo();
void undo();
private:
QObject *m_object;
const char *m_property_name;
QVariant m_old_value, m_new_value;
bool m_animate;
QPropertyAnimation m_animation;
};
#endif // QPROPERTYUNDOCOMMAND_H