forked from qt-creator/qt-creator
17dbc74cca
When editing values in the puppet we did not take reflection into account. This means that any changes we did from the puppet for notified back from Qt Creator. Since those notifications are asynchronous this leads to various issues especially when more than one axis (property) was modified at once. This patch avoids reflection. The notifications are 'flagged' and then ignored in the Qt5InformationNodeInstanceServer. While a node is moved we ignore any changes to that specific node. Task-number: QDS-1191 Change-Id: Ic74e22ea71832ce12321f9085a7296c2a7d9893d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
146 lines
4.3 KiB
C++
146 lines
4.3 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "propertyvaluecontainer.h"
|
|
|
|
#include <QtDebug>
|
|
|
|
namespace QmlDesigner {
|
|
|
|
PropertyValueContainer::PropertyValueContainer()
|
|
: m_instanceId(-1)
|
|
{
|
|
}
|
|
|
|
PropertyValueContainer::PropertyValueContainer(qint32 instanceId, const PropertyName &name, const QVariant &value, const TypeName &dynamicTypeName)
|
|
: m_instanceId(instanceId),
|
|
m_name(name),
|
|
m_value(value),
|
|
m_dynamicTypeName(dynamicTypeName)
|
|
{
|
|
}
|
|
|
|
PropertyValueContainer::PropertyValueContainer(qint32 option)
|
|
: m_instanceId(option),
|
|
m_name("-option-")
|
|
{
|
|
// '-option-' is not a valid property name and indicates that we store the transaction option.
|
|
}
|
|
|
|
qint32 PropertyValueContainer::instanceId() const
|
|
{
|
|
return m_instanceId;
|
|
}
|
|
|
|
PropertyName PropertyValueContainer::name() const
|
|
{
|
|
return m_name;
|
|
}
|
|
|
|
QVariant PropertyValueContainer::value() const
|
|
{
|
|
return m_value;
|
|
}
|
|
|
|
bool PropertyValueContainer::isDynamic() const
|
|
{
|
|
return !m_dynamicTypeName.isEmpty();
|
|
}
|
|
|
|
TypeName PropertyValueContainer::dynamicTypeName() const
|
|
{
|
|
return m_dynamicTypeName;
|
|
}
|
|
|
|
// The reflection flag indicates that a property change notification
|
|
// is reflected. This means that the notification is the reaction to a
|
|
// property change original done by the puppet itself.
|
|
// In the Qt5InformationNodeInstanceServer such notification are
|
|
// therefore ignored.
|
|
|
|
void PropertyValueContainer::setReflectionFlag(bool b)
|
|
{
|
|
m_isReflected = b;
|
|
}
|
|
|
|
bool PropertyValueContainer::isReflected() const
|
|
{
|
|
return m_isReflected;
|
|
}
|
|
|
|
QDataStream &operator<<(QDataStream &out, const PropertyValueContainer &container)
|
|
{
|
|
out << container.instanceId();
|
|
out << container.name();
|
|
out << container.value();
|
|
out << container.dynamicTypeName();
|
|
out << container.isReflected();
|
|
|
|
return out;
|
|
}
|
|
|
|
QDataStream &operator>>(QDataStream &in, PropertyValueContainer &container)
|
|
{
|
|
in >> container.m_instanceId;
|
|
in >> container.m_name;
|
|
in >> container.m_value;
|
|
in >> container.m_dynamicTypeName;
|
|
in >> container.m_isReflected;
|
|
|
|
return in;
|
|
}
|
|
|
|
bool operator ==(const PropertyValueContainer &first, const PropertyValueContainer &second)
|
|
{
|
|
return first.m_instanceId == second.m_instanceId
|
|
&& first.m_name == second.m_name
|
|
&& first.m_value == second.m_value
|
|
&& first.m_dynamicTypeName == second.m_dynamicTypeName
|
|
&& first.m_isReflected == second.m_isReflected;
|
|
}
|
|
|
|
bool operator <(const PropertyValueContainer &first, const PropertyValueContainer &second)
|
|
{
|
|
return (first.m_instanceId < second.m_instanceId)
|
|
|| (first.m_instanceId == second.m_instanceId && first.m_name < second.m_name);
|
|
}
|
|
|
|
QDebug operator <<(QDebug debug, const PropertyValueContainer &container)
|
|
{
|
|
debug.nospace() << "PropertyValueContainer("
|
|
<< "instanceId: " << container.instanceId() << ", "
|
|
<< "name: " << container.name() << ", "
|
|
<< "value: " << container.value();
|
|
|
|
if (!container.dynamicTypeName().isEmpty())
|
|
debug.nospace() << ", " << "dynamicTypeName: " << container.dynamicTypeName();
|
|
|
|
debug.nospace() << ")";
|
|
|
|
return debug;
|
|
}
|
|
|
|
} // namespace QmlDesigner
|