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

QmlDesigner: Reactivate stream capturing

Browse Source 
Change-Id: I041392e490bb4e104e917f4164d7d82bae03c2d8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2020-08-13 11:24:24 +02:00
parent bfddaf6f9f
commit 428d82c6bc
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp
View File

@@ -42,10 +42,13 @@ void CapturingConnectionManager::setUp(NodeInstanceServerProxy *nodeInstanceServ
int indexOfCapturePuppetStream = QCoreApplication::arguments().indexOf( int indexOfCapturePuppetStream = QCoreApplication::arguments().indexOf(
"-capture-puppet-stream"); "-capture-puppet-stream");
if (indexOfCapturePuppetStream > 0) { if (indexOfCapturePuppetStream > 0) {
m_captureFileForTest.setFileName( const QString filePath = QCoreApplication::arguments().at(indexOfCapturePuppetStream + 1);
QCoreApplication::arguments().at(indexOfCapturePuppetStream + 1)); m_captureFileForTest.setFileName(filePath);
bool isOpen = m_captureFileForTest.open(QIODevice::WriteOnly); 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); 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 } // namespace QmlDesigner

4
src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.h
View File

@@ -29,7 +29,7 @@
namespace QmlDesigner { namespace QmlDesigner {
class CapturingConnectionManager : public InteractiveConnectionManager class QMLDESIGNERCORE_EXPORT CapturingConnectionManager : public InteractiveConnectionManager
{ {
public: public:
void setUp(NodeInstanceServerProxy *nodeInstanceServerProxy, void setUp(NodeInstanceServerProxy *nodeInstanceServerProxy,
@@ -38,6 +38,8 @@ public:
void processFinished(int exitCode, QProcess::ExitStatus exitStatus) override; void processFinished(int exitCode, QProcess::ExitStatus exitStatus) override;
void writeCommand(const QVariant &command) override;
private: private:
QFile m_captureFileForTest; QFile m_captureFileForTest;
}; };

7
src/plugins/qmldesigner/designercore/model/viewmanager.cpp
View File

@@ -28,6 +28,7 @@
#ifndef QMLDESIGNER_TEST #ifndef QMLDESIGNER_TEST
#include <abstractview.h> #include <abstractview.h>
#include <capturingconnectionmanager.h>
#include <componentaction.h> #include <componentaction.h>
#include <componentview.h> #include <componentview.h>
#include <crumblebar.h> #include <crumblebar.h>
@@ -37,7 +38,6 @@
#include <edit3dview.h> #include <edit3dview.h>
#include <formeditorview.h> #include <formeditorview.h>
#include <importmanagerview.h> #include <importmanagerview.h>
#include <interactiveconnectionmanager.h>
#include <itemlibraryview.h> #include <itemlibraryview.h>
#include <navigatorview.h> #include <navigatorview.h>
#include <nodeinstanceview.h> #include <nodeinstanceview.h>
@@ -61,10 +61,13 @@ class ViewManagerData
{ {
public: public:
InteractiveConnectionManager connectionManager; InteractiveConnectionManager connectionManager;
CapturingConnectionManager capturingConnectionManager;
QmlModelState savedState; QmlModelState savedState;
Internal::DebugView debugView; Internal::DebugView debugView;
DesignerActionManagerView designerActionManagerView; DesignerActionManagerView designerActionManagerView;
NodeInstanceView nodeInstanceView{connectionManager}; NodeInstanceView nodeInstanceView{
QCoreApplication::arguments().contains("-capture-puppet-stream") ? capturingConnectionManager
: connectionManager};
ComponentView componentView; ComponentView componentView;
Edit3DView edit3DView; Edit3DView edit3DView;
FormEditorView formEditorView; FormEditorView formEditorView;