feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add ScaleGizmo to 3D edit view

Browse Source 
ScaleGizmo allows scaling in the direction of local or global axes,
as well as uniform scaling. Any scale component cannot be made
negative with ScaleGizmo.

Change-Id: I9b98d9593e07ded340178b07b73fa1b72421ba20
Fixes: QDS-1195
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2019-10-31 10:46:14 +02:00
parent 96f3cef06a
commit c67965fb29
12 changed files with 561 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
View File

@@ -97,12 +97,12 @@ QObject *Qt5InformationNodeInstanceServer::createEditView3D(QQmlEngine *engine)
}
QObject::connect(window, SIGNAL(objectClicked(QVariant)), this, SLOT(objectClicked(QVariant)));
QObject::connect(window, SIGNAL(commitObjectPosition(QVariant)),
this, SLOT(handleObjectPositionCommit(QVariant)));
QObject::connect(window, SIGNAL(moveObjectPosition(QVariant)),
this, SLOT(handleObjectPositionMove(QVariant)));
QObject::connect(&m_moveTimer, &QTimer::timeout,
this, &Qt5InformationNodeInstanceServer::handleObjectPositionMoveTimeout);
QObject::connect(window, SIGNAL(commitObjectProperty(QVariant, QVariant)),
this, SLOT(handleObjectPropertyCommit(QVariant, QVariant)));
QObject::connect(window, SIGNAL(changeObjectProperty(QVariant, QVariant)),
this, SLOT(handleObjectPropertyChange(QVariant, QVariant)));
QObject::connect(&m_propertyChangeTimer, &QTimer::timeout,
this, &Qt5InformationNodeInstanceServer::handleObjectPropertyChangeTimeout);
//For macOS we have to use the 4.1 core profile
QSurfaceFormat surfaceFormat = window->requestedFormat();
@@ -188,28 +188,36 @@ void Qt5InformationNodeInstanceServer::modifyVariantValue(
}
}
void Qt5InformationNodeInstanceServer::handleObjectPositionCommit(const QVariant &object)
void Qt5InformationNodeInstanceServer::handleObjectPropertyCommit(const QVariant &object,
const QVariant &propName)
{
modifyVariantValue(object, "position", ValuesModifiedCommand::TransactionOption::End);
m_movedNode = {};
m_moveTimer.stop();
modifyVariantValue(object, propName.toByteArray(),
ValuesModifiedCommand::TransactionOption::End);
m_changedNode = {};
m_changedProperty = {};
m_propertyChangeTimer.stop();
}
void Qt5InformationNodeInstanceServer::handleObjectPositionMove(const QVariant &object)
void Qt5InformationNodeInstanceServer::handleObjectPropertyChange(const QVariant &object,
const QVariant &propName)
{
if (m_movedNode.isNull()) {
modifyVariantValue(object, "position", ValuesModifiedCommand::TransactionOption::Start);
} else {
if (!m_moveTimer.isActive())
m_moveTimer.start();
PropertyName propertyName(propName.toByteArray());
if (m_changedProperty != propertyName || m_changedNode != object) {
if (!m_changedNode.isNull())
handleObjectPropertyCommit(m_changedNode, m_changedProperty);
modifyVariantValue(object, propertyName,
ValuesModifiedCommand::TransactionOption::Start);
} else if (!m_propertyChangeTimer.isActive()) {
m_propertyChangeTimer.start();
}
m_movedNode = object;
m_changedNode = object;
m_changedProperty = propertyName;
}
Qt5InformationNodeInstanceServer::Qt5InformationNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient) :
Qt5NodeInstanceServer(nodeInstanceClient)
{
m_moveTimer.setInterval(100);
m_propertyChangeTimer.setInterval(100);
}
void Qt5InformationNodeInstanceServer::sendTokenBack()
@@ -282,9 +290,10 @@ void Qt5InformationNodeInstanceServer::modifyProperties(
nodeInstanceClient()->valuesModified(createValuesModifiedCommand(properties));
}
void Qt5InformationNodeInstanceServer::handleObjectPositionMoveTimeout()
void Qt5InformationNodeInstanceServer::handleObjectPropertyChangeTimeout()
{
modifyVariantValue(m_movedNode, "position", ValuesModifiedCommand::TransactionOption::None);
modifyVariantValue(m_changedNode, m_changedProperty,
ValuesModifiedCommand::TransactionOption::None);
}
QObject *Qt5InformationNodeInstanceServer::findRootNodeOf3DViewport(

11
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
View File

@@ -51,8 +51,8 @@ public:
private slots:
void objectClicked(const QVariant &object);
void handleObjectPositionCommit(const QVariant &object);
void handleObjectPositionMove(const QVariant &object);
void handleObjectPropertyCommit(const QVariant &object, const QVariant &propName);
void handleObjectPropertyChange(const QVariant &object, const QVariant &propName);
protected:
void collectItemChangesAndSendChangeCommands() override;
@@ -64,7 +64,7 @@ protected:
void modifyProperties(const QVector<InstancePropertyValueTriple> &properties);
private:
void handleObjectPositionMoveTimeout();
void handleObjectPropertyChangeTimeout();
QObject *createEditView3D(QQmlEngine *engine);
void setup3DEditView(const QList<ServerNodeInstance> &instanceList);
QObject *findRootNodeOf3DViewport(const QList<ServerNodeInstance> &instanceList) const;
@@ -81,8 +81,9 @@ private:
QSet<ServerNodeInstance> m_parentChangedSet;
QList<ServerNodeInstance> m_completedComponentList;
QList<TokenCommand> m_tokenList;
QTimer m_moveTimer;
QVariant m_movedNode;
QTimer m_propertyChangeTimer;
QVariant m_changedNode;
PropertyName m_changedProperty;
};
} // namespace QmlDesigner