aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/designercore
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@qt.io>2020-08-13 11:24:24 +0200
committerMarco Bubke <marco.bubke@qt.io>2020-08-13 15:07:40 +0000
commit428d82c6bc0a679e4ed2d2891868b9f0397aa3e8 (patch)
treef89bc78749276c808cfb2225294b4c04e282c422 /src/plugins/qmldesigner/designercore
parentbfddaf6f9f52ceca2c397c17fc77d59a17000bb0 (diff)
QmlDesigner: Reactivate stream capturing
Change-Id: I041392e490bb4e104e917f4164d7d82bae03c2d8 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/designercore')
-rw-r--r--src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp20
-rw-r--r--src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.h4
-rw-r--r--src/plugins/qmldesigner/designercore/model/viewmanager.cpp7
3 files changed, 25 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp
index 4be52a327c..a47e69bf25 100644
--- a/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp
@@ -42,10 +42,13 @@ void CapturingConnectionManager::setUp(NodeInstanceServerProxy *nodeInstanceServ
int indexOfCapturePuppetStream = QCoreApplication::arguments().indexOf(
"-capture-puppet-stream");
if (indexOfCapturePuppetStream > 0) {
- m_captureFileForTest.setFileName(
- QCoreApplication::arguments().at(indexOfCapturePuppetStream + 1));
+ const QString filePath = QCoreApplication::arguments().at(indexOfCapturePuppetStream + 1);
+ m_captureFileForTest.setFileName(filePath);
bool isOpen = m_captureFileForTest.open(QIODevice::WriteOnly);
- qDebug() << "file is open: " << isOpen;
+ if (isOpen)
+ qDebug() << "capture file is open:" << filePath;
+ else
+ qDebug() << "capture file could not be opened!";
}
}
@@ -62,4 +65,15 @@ void CapturingConnectionManager::processFinished(int exitCode, QProcess::ExitSta
InteractiveConnectionManager::processFinished(exitCode, exitStatus);
}
+void CapturingConnectionManager::writeCommand(const QVariant &command)
+{
+ InteractiveConnectionManager::writeCommand(command);
+
+ if (m_captureFileForTest.isWritable()) {
+ qDebug() << "command name: " << QMetaType(command.userType()).name();
+ writeCommandToIODevice(command, &m_captureFileForTest, m_writeCommandCounter);
+ qDebug() << "\tcatpure file offset: " << m_captureFileForTest.pos();
+ }
+}
+
} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.h b/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.h
index de63da87fc..1bedef440b 100644
--- a/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.h
+++ b/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.h
@@ -29,7 +29,7 @@
namespace QmlDesigner {
-class CapturingConnectionManager : public InteractiveConnectionManager
+class QMLDESIGNERCORE_EXPORT CapturingConnectionManager : public InteractiveConnectionManager
{
public:
void setUp(NodeInstanceServerProxy *nodeInstanceServerProxy,
@@ -38,6 +38,8 @@ public:
void processFinished(int exitCode, QProcess::ExitStatus exitStatus) override;
+ void writeCommand(const QVariant &command) override;
+
private:
QFile m_captureFileForTest;
};
diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
index c3946a5378..34a2d4e4cf 100644
--- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
@@ -28,6 +28,7 @@
#ifndef QMLDESIGNER_TEST
#include <abstractview.h>
+#include <capturingconnectionmanager.h>
#include <componentaction.h>
#include <componentview.h>
#include <crumblebar.h>
@@ -37,7 +38,6 @@
#include <edit3dview.h>
#include <formeditorview.h>
#include <importmanagerview.h>
-#include <interactiveconnectionmanager.h>
#include <itemlibraryview.h>
#include <navigatorview.h>
#include <nodeinstanceview.h>
@@ -61,10 +61,13 @@ class ViewManagerData
{
public:
InteractiveConnectionManager connectionManager;
+ CapturingConnectionManager capturingConnectionManager;
QmlModelState savedState;
Internal::DebugView debugView;
DesignerActionManagerView designerActionManagerView;
- NodeInstanceView nodeInstanceView{connectionManager};
+ NodeInstanceView nodeInstanceView{
+ QCoreApplication::arguments().contains("-capture-puppet-stream") ? capturingConnectionManager
+ : connectionManager};
ComponentView componentView;
Edit3DView edit3DView;
FormEditorView formEditorView;