QmlDesigner: Test mode for qml puppet streams

Change-Id: I93128c60892900d6b4728569b84efb0ed835b51f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri

@@ -1,7 +1,8 @@
 INCLUDEPATH += $$PWD/
 
 HEADERS += $$PWD/qt5nodeinstanceserver.h
-HEADERS += $$PWD//graphicalnodeinstance.h
+HEADERS += $$PWD/qt5testnodeinstanceserver.h
+HEADERS += $$PWD/graphicalnodeinstance.h
 HEADERS += $$PWD/qt5informationnodeinstanceserver.h
 HEADERS += $$PWD/qt5rendernodeinstanceserver.h
 HEADERS += $$PWD/qt5previewnodeinstanceserver.h
@@ -26,26 +27,27 @@ HEADERS += $$PWD/quickwindownodeinstance.h
 HEADERS += $$PWD/layoutnodeinstance.h
 
 SOURCES += $$PWD/qt5nodeinstanceserver.cpp
+SOURCES += $$PWD/qt5testnodeinstanceserver.cpp
 SOURCES += $$PWD/graphicalnodeinstance.cpp
 SOURCES += $$PWD/qt5informationnodeinstanceserver.cpp
 SOURCES += $$PWD/qt5rendernodeinstanceserver.cpp
 SOURCES += $$PWD/qt5previewnodeinstanceserver.cpp
 SOURCES += $$PWD/qt5nodeinstanceclientproxy.cpp
 SOURCES += $$PWD/quickitemnodeinstance.cpp
-SOURCES +=  $$PWD/behaviornodeinstance.cpp
-SOURCES +=  $$PWD/dummycontextobject.cpp
-SOURCES +=  $$PWD/childrenchangeeventfilter.cpp
-SOURCES +=  $$PWD/componentnodeinstance.cpp
-SOURCES +=  $$PWD/dummynodeinstance.cpp
-SOURCES +=  $$PWD/nodeinstancemetaobject.cpp
-SOURCES +=  $$PWD/nodeinstanceserver.cpp
-SOURCES +=  $$PWD/nodeinstancesignalspy.cpp
-SOURCES +=  $$PWD/objectnodeinstance.cpp
-SOURCES +=  $$PWD/qmlpropertychangesnodeinstance.cpp
-SOURCES +=  $$PWD/qmlstatenodeinstance.cpp
-SOURCES +=  $$PWD/qmltransitionnodeinstance.cpp
-SOURCES +=  $$PWD/servernodeinstance.cpp
-SOURCES +=  $$PWD/anchorchangesnodeinstance.cpp
+SOURCES += $$PWD/behaviornodeinstance.cpp
+SOURCES += $$PWD/dummycontextobject.cpp
+SOURCES += $$PWD/childrenchangeeventfilter.cpp
+SOURCES += $$PWD/componentnodeinstance.cpp
+SOURCES += $$PWD/dummynodeinstance.cpp
+SOURCES += $$PWD/nodeinstancemetaobject.cpp
+SOURCES += $$PWD/nodeinstanceserver.cpp
+SOURCES += $$PWD/nodeinstancesignalspy.cpp
+SOURCES += $$PWD/objectnodeinstance.cpp
+SOURCES += $$PWD/qmlpropertychangesnodeinstance.cpp
+SOURCES += $$PWD/qmlstatenodeinstance.cpp
+SOURCES += $$PWD/qmltransitionnodeinstance.cpp
+SOURCES += $$PWD/servernodeinstance.cpp
+SOURCES += $$PWD/anchorchangesnodeinstance.cpp
 SOURCES += $$PWD/positionernodeinstance.cpp
 SOURCES += $$PWD/quickwindownodeinstance.cpp
 SOURCES += $$PWD/layoutnodeinstance.cpp

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp

@@ -34,6 +34,7 @@
 #include "qt5informationnodeinstanceserver.h"
 #include "qt5previewnodeinstanceserver.h"
 #include "qt5rendernodeinstanceserver.h"
+#include "qt5testnodeinstanceserver.h"
 
 #include <designersupport.h>
 
@@ -43,15 +44,22 @@ Qt5NodeInstanceClientProxy::Qt5NodeInstanceClientProxy(QObject *parent) :
     NodeInstanceClientProxy(parent)
 {
     DesignerSupport::activateDesignerWindowManager();
-    if (QCoreApplication::arguments().at(2) == QLatin1String("previewmode")) {
+    if (QCoreApplication::arguments().at(1) == QLatin1String("--readcapturedstream")) {
+        qputenv("DESIGNER_DONT_USE_SHARED_MEMORY", "1");
+        setNodeInstanceServer(new Qt5TestNodeInstanceServer(this));
+        initializeCapturedStream(QCoreApplication::arguments().at(2));
+        readDataStream();
+        QCoreApplication::exit();
+    } else if (QCoreApplication::arguments().at(2) == QLatin1String("previewmode")) {
         setNodeInstanceServer(new Qt5PreviewNodeInstanceServer(this));
+        initializeSocket();
     } else if (QCoreApplication::arguments().at(2) == QLatin1String("editormode")) {
         setNodeInstanceServer(new Qt5InformationNodeInstanceServer(this));
+        initializeSocket();
     } else if (QCoreApplication::arguments().at(2) == QLatin1String("rendermode")) {
         setNodeInstanceServer(new Qt5RenderNodeInstanceServer(this));
+        initializeSocket();
     }
-
-    initializeSocket();
 }
 
 } // namespace QmlDesigner

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp

@@ -0,0 +1,364 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "qt5testnodeinstanceserver.h"
+
+#include <QQuickItem>
+#include <QQuickView>
+
+#include "servernodeinstance.h"
+#include "childrenchangeeventfilter.h"
+#include "propertyabstractcontainer.h"
+#include "propertybindingcontainer.h"
+#include "propertyvaluecontainer.h"
+#include "instancecontainer.h"
+#include "createinstancescommand.h"
+#include "changefileurlcommand.h"
+#include "clearscenecommand.h"
+#include "reparentinstancescommand.h"
+#include "changevaluescommand.h"
+#include "changebindingscommand.h"
+#include "changeidscommand.h"
+#include "removeinstancescommand.h"
+#include "nodeinstanceclientinterface.h"
+#include "removepropertiescommand.h"
+#include "valueschangedcommand.h"
+#include "informationchangedcommand.h"
+#include "pixmapchangedcommand.h"
+#include "commondefines.h"
+#include "changestatecommand.h"
+#include "childrenchangedcommand.h"
+#include "completecomponentcommand.h"
+#include "componentcompletedcommand.h"
+#include "createscenecommand.h"
+#include "tokencommand.h"
+#include "removesharedmemorycommand.h"
+#include "changeauxiliarycommand.h"
+#include "changenodesourcecommand.h"
+
+#include "dummycontextobject.h"
+
+#include <designersupport.h>
+
+namespace QmlDesigner {
+
+Qt5TestNodeInstanceServer::Qt5TestNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient)
+    : Qt5NodeInstanceServer(nodeInstanceClient)
+{
+}
+
+void Qt5TestNodeInstanceServer::createInstances(const CreateInstancesCommand &command)
+{
+    createInstances(command.instances());
+
+    refreshBindings();
+
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::changeFileUrl(const ChangeFileUrlCommand &command)
+{
+    setupFileUrl(command.fileUrl());
+
+    refreshBindings();
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::changePropertyValues(const ChangeValuesCommand &command)
+{
+    bool hasDynamicProperties = false;
+    foreach (const PropertyValueContainer &container, command.valueChanges()) {
+        hasDynamicProperties |= container.isDynamic();
+        setInstancePropertyVariant(container);
+    }
+
+    if (hasDynamicProperties)
+        refreshBindings();
+
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::changePropertyBindings(const ChangeBindingsCommand &command)
+{
+    bool hasDynamicProperties = false;
+    foreach (const PropertyBindingContainer &container, command.bindingChanges()) {
+        hasDynamicProperties |= container.isDynamic();
+        setInstancePropertyBinding(container);
+    }
+
+    if (hasDynamicProperties)
+        refreshBindings();
+
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::changeAuxiliaryValues(const ChangeAuxiliaryCommand &command)
+{
+    foreach (const PropertyValueContainer &container, command.auxiliaryChanges()) {
+        setInstanceAuxiliaryData(container);
+    }
+
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::changeIds(const ChangeIdsCommand &command)
+{
+    foreach (const IdContainer &container, command.ids()) {
+        if (hasInstanceForId(container.instanceId()))
+            instanceForId(container.instanceId()).setId(container.id());
+    }
+
+    refreshBindings();
+
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::createScene(const CreateSceneCommand &command)
+{
+    Qt5NodeInstanceServer::createScene(command);
+
+    stopRenderTimer();
+
+    refreshBindings();
+
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::clearScene(const ClearSceneCommand &command)
+{
+    Qt5NodeInstanceServer::clearScene(command);
+}
+
+void Qt5TestNodeInstanceServer::removeInstances(const RemoveInstancesCommand &command)
+{
+    ServerNodeInstance oldState = activeStateInstance();
+    if (activeStateInstance().isValid())
+        activeStateInstance().deactivateState();
+
+    foreach (qint32 instanceId, command.instanceIds()) {
+        removeInstanceRelationsip(instanceId);
+    }
+
+    if (oldState.isValid())
+        oldState.activateState();
+
+    refreshBindings();
+
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::removeProperties(const RemovePropertiesCommand &command)
+{
+    bool hasDynamicProperties = false;
+    foreach (const PropertyAbstractContainer &container, command.properties()) {
+        hasDynamicProperties |= container.isDynamic();
+        resetInstanceProperty(container);
+    }
+
+    if (hasDynamicProperties)
+        refreshBindings();
+
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::reparentInstances(const ReparentInstancesCommand &command)
+{
+    foreach (const ReparentContainer &container, command.reparentInstances()) {
+        ServerNodeInstance instance = instanceForId(container.instanceId());
+        if (instance.isValid()) {
+            instance.reparent(instanceForId(container.oldParentInstanceId()), container.oldParentProperty(), instanceForId(container.newParentInstanceId()), container.newParentProperty());
+        }
+    }
+
+    refreshBindings();
+
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::changeState(const ChangeStateCommand &command)
+{
+    if (hasInstanceForId(command.stateInstanceId())) {
+        if (activeStateInstance().isValid())
+            activeStateInstance().deactivateState();
+        ServerNodeInstance instance = instanceForId(command.stateInstanceId());
+        instance.activateState();
+    } else {
+        if (activeStateInstance().isValid())
+            activeStateInstance().deactivateState();
+    }
+
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::completeComponent(const CompleteComponentCommand &command)
+{
+    QList<ServerNodeInstance> instanceList;
+
+    foreach (qint32 instanceId, command.instances()) {
+        if (hasInstanceForId(instanceId)) {
+            ServerNodeInstance instance = instanceForId(instanceId);
+            instance.doComponentComplete();
+            instanceList.append(instance);
+        }
+    }
+
+    refreshBindings();
+
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::changeNodeSource(const ChangeNodeSourceCommand &command)
+{
+    if (hasInstanceForId(command.instanceId())) {
+        ServerNodeInstance instance = instanceForId(command.instanceId());
+        if (instance.isValid())
+            instance.setNodeSource(command.nodeSource());
+    }
+
+    refreshBindings();
+
+    collectItemChangesAndSendChangeCommands();
+}
+
+void Qt5TestNodeInstanceServer::removeSharedMemory(const RemoveSharedMemoryCommand &command)
+{
+    if (command.typeName() == "Values")
+        ValuesChangedCommand::removeSharedMemorys(command.keyNumbers());
+}
+
+void QmlDesigner::Qt5TestNodeInstanceServer::collectItemChangesAndSendChangeCommands()
+{
+    DesignerSupport::polishItems(quickView());
+
+    QSet<ServerNodeInstance> informationChangedInstanceSet;
+    QVector<InstancePropertyPair> propertyChangedList;
+    QSet<ServerNodeInstance> parentChangedSet;
+
+    if (quickView()) {
+        foreach (QQuickItem *item, allItems()) {
+            if (item && hasInstanceForObject(item)) {
+                ServerNodeInstance instance = instanceForObject(item);
+
+                if (isDirtyRecursiveForNonInstanceItems(item))
+                    informationChangedInstanceSet.insert(instance);
+
+
+                if (DesignerSupport::isDirty(item, DesignerSupport::ParentChanged)) {
+                    parentChangedSet.insert(instance);
+                    informationChangedInstanceSet.insert(instance);
+                }
+            }
+        }
+
+        foreach (const InstancePropertyPair& property, changedPropertyList()) {
+            const ServerNodeInstance instance = property.first;
+            const QString propertyName = property.second;
+
+            if (instance.isValid()) {
+                if (propertyName.contains("anchors"))
+                    informationChangedInstanceSet.insert(instance);
+
+                propertyChangedList.append(property);
+            }
+        }
+
+        resetAllItems();
+        clearChangedPropertyList();
+
+        if (!informationChangedInstanceSet.isEmpty()) {
+            InformationChangedCommand command = createAllInformationChangedCommand(informationChangedInstanceSet.toList());
+            command.sort();
+            nodeInstanceClient()->informationChanged(command);
+        }
+        if (!propertyChangedList.isEmpty()) {
+            ValuesChangedCommand command = createValuesChangedCommand(propertyChangedList);
+            command.sort();
+            nodeInstanceClient()->valuesChanged(command);
+        }
+
+        if (!parentChangedSet.isEmpty())
+            sendChildrenChangedCommand(parentChangedSet.toList());
+    }
+}
+
+void Qt5TestNodeInstanceServer::sendChildrenChangedCommand(const QList<ServerNodeInstance> childList)
+{
+    QSet<ServerNodeInstance> parentSet;
+    QList<ServerNodeInstance> noParentList;
+
+    foreach (const ServerNodeInstance &child, childList) {
+        if (!child.hasParent()) {
+            noParentList.append(child);
+        } else {
+            ServerNodeInstance parent = child.parent();
+            if (parent.isValid()) {
+                parentSet.insert(parent);
+            } else {
+                noParentList.append(child);
+            }
+        }
+    }
+
+    foreach (const ServerNodeInstance &parent, parentSet) {
+        ChildrenChangedCommand command = createChildrenChangedCommand(parent, parent.childItems());
+        command.sort();
+        nodeInstanceClient()->childrenChanged(command);
+    }
+
+    if (!noParentList.isEmpty()) {
+        ChildrenChangedCommand command = createChildrenChangedCommand(ServerNodeInstance(), noParentList);
+        command.sort();
+        nodeInstanceClient()->childrenChanged(command);
+    }
+}
+
+bool Qt5TestNodeInstanceServer::isDirtyRecursiveForNonInstanceItems(QQuickItem *item) const
+{
+    static DesignerSupport::DirtyType informationsDirty = DesignerSupport::DirtyType(DesignerSupport::TransformUpdateMask
+                                                                              | DesignerSupport::ContentUpdateMask
+                                                                              | DesignerSupport::Visible
+                                                                              | DesignerSupport::ZValue
+                                                                              | DesignerSupport::OpacityValue);
+
+    if (DesignerSupport::isDirty(item, informationsDirty))
+        return true;
+
+    foreach (QQuickItem *childItem, item->childItems()) {
+        if (!hasInstanceForObject(childItem)) {
+            if (DesignerSupport::isDirty(childItem, informationsDirty))
+                return true;
+            else if (isDirtyRecursiveForNonInstanceItems(childItem))
+                return true;
+        }
+    }
+
+    return false;
+}
+
+} // namespace QmlDesigner

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h

@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+
+#ifndef QMLDESIGNER_QT5TESTNODEINSTANCESERVER_H
+#define QMLDESIGNER_QT5TESTNODEINSTANCESERVER_H
+
+#include "qt5nodeinstanceserver.h"
+
+namespace QmlDesigner {
+
+class Qt5TestNodeInstanceServer : public Qt5NodeInstanceServer
+{
+public:
+    Qt5TestNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
+
+
+    void createInstances(const CreateInstancesCommand &command);
+    void changeFileUrl(const ChangeFileUrlCommand &command);
+    void changePropertyValues(const ChangeValuesCommand &command);
+    void changePropertyBindings(const ChangeBindingsCommand &command);
+    void changeAuxiliaryValues(const ChangeAuxiliaryCommand &command);
+    void changeIds(const ChangeIdsCommand &command);
+    void createScene(const CreateSceneCommand &command);
+    void clearScene(const ClearSceneCommand &command);
+    void removeInstances(const RemoveInstancesCommand &command);
+    void removeProperties(const RemovePropertiesCommand &command);
+    void reparentInstances(const ReparentInstancesCommand &command);
+    void changeState(const ChangeStateCommand &command);
+    void completeComponent(const CompleteComponentCommand &command);
+    void changeNodeSource(const ChangeNodeSourceCommand &command);
+    void removeSharedMemory(const RemoveSharedMemoryCommand &command);
+
+    using Qt5NodeInstanceServer::createInstances;
+
+protected:
+    void collectItemChangesAndSendChangeCommands() Q_DECL_OVERRIDE;
+    void sendChildrenChangedCommand(const QList<ServerNodeInstance> childList);
+    bool isDirtyRecursiveForNonInstanceItems(QQuickItem *item) const;
+};
+
+} // namespace QmlDesigner
+
+#endif // QMLDESIGNER_QT5TESTNODEINSTANCESERVER_H

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp

@@ -446,7 +446,7 @@ QPair<PropertyName, ServerNodeInstance> ServerNodeInstance::anchor(const Propert
     return m_nodeInstance->anchor(name);
 }
 
-QDebug operator<<(QDebug debug, const ServerNodeInstance &instance)
+QDebug operator <<(QDebug debug, const ServerNodeInstance &instance)
 {
     if (instance.isValid()) {
         debug.nospace() << "ServerNodeInstance("
@@ -466,11 +466,17 @@ uint qHash(const ServerNodeInstance &instance)
     return ::qHash(instance.instanceId());
 }
 
-bool operator==(const ServerNodeInstance &first, const ServerNodeInstance &second)
+bool operator ==(const ServerNodeInstance &first, const ServerNodeInstance &second)
 {
     return first.instanceId() == second.instanceId();
 }
 
+bool operator <(const ServerNodeInstance &first, const ServerNodeInstance &second)
+{
+    return first.instanceId() < second.instanceId();
+}
+
+
 bool ServerNodeInstance::isWrappingThisObject(QObject *object) const
 {
     return internalObject() && internalObject() == object;

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h

@@ -55,6 +55,7 @@ class Qt4NodeInstanceServer;
 class Qt4PreviewNodeInstanceServer;
 class Qt5NodeInstanceServer;
 class Qt5PreviewNodeInstanceServer;
+class Qt5TestNodeInstanceServer;
 class InstanceContainer;
 
 namespace Internal {
@@ -73,6 +74,7 @@ class ServerNodeInstance
     friend class Qt4PreviewNodeInstanceServer;
     friend class Qt5NodeInstanceServer;
     friend class Qt5PreviewNodeInstanceServer;
+    friend class Qt5TestNodeInstanceServer;
     friend class QHash<qint32, ServerNodeInstance>;
     friend uint qHash(const ServerNodeInstance &instance);
     friend bool operator==(const ServerNodeInstance &first, const ServerNodeInstance &second);
@@ -209,8 +211,9 @@ private: // variables
 };
 
 uint qHash(const ServerNodeInstance &instance);
-bool operator==(const ServerNodeInstance &first, const ServerNodeInstance &second);
-QDebug operator<<(QDebug debug, const ServerNodeInstance &instance);
+bool operator ==(const ServerNodeInstance &first, const ServerNodeInstance &second);
+bool operator <(const ServerNodeInstance &first, const ServerNodeInstance &second);
+QDebug operator <<(QDebug debug, const ServerNodeInstance &instance);
 }
 
 Q_DECLARE_METATYPE(QmlDesigner::ServerNodeInstance)