Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add getters to ScriptStatusRequest

Browse source
This commit is contained in:
Ryan Huffman 2017-01-19 15:09:16 -08:00
parent 7ba14a5f09
commit 465f5c6789
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -681,7 +681,7 @@ bool EntityScriptingInterface::getServerScriptStatus(QUuid entityID, QScriptValu
auto request = client->createScriptStatusRequest(entityID);
connect(request, &GetScriptStatusRequest::finished, callback.engine(), [callback](GetScriptStatusRequest* request) mutable {
QString statusString;
switch (request->status) {
switch (request->getStatus()) {
case RUNNING:
statusString = "running";
break;
@ -695,7 +695,7 @@ bool EntityScriptingInterface::getServerScriptStatus(QUuid entityID, QScriptValu
statusString = "";
break;
}
QScriptValueList args { request->responseReceived, request->isRunning, statusString, request->errorInfo };
QScriptValueList args { request->getResponseReceived(), request->getIsRunning(), statusString, request->getErrorInfo() };
callback.call(QScriptValue(), args);
request->deleteLater();
});

8
libraries/networking/src/EntityScriptClient.cpp
View file

@ -17,10 +17,10 @@ GetScriptStatusRequest::~GetScriptStatusRequest() {
void GetScriptStatusRequest::start() {
auto client = DependencyManager::get<EntityScriptClient>();
client->getEntityServerScriptStatus(_entityID, [this](bool responseReceived, bool isRunning, EntityScriptStatus status, QString errorInfo) {
this->responseReceived = responseReceived;
this->isRunning = isRunning;
this->status = status;
this->errorInfo = errorInfo;
responseReceived = responseReceived;
isRunning = isRunning;
status = status;
errorInfo = errorInfo;
emit finished(this);
});

13
libraries/networking/src/EntityScriptClient.h
View file

@ -32,10 +32,10 @@ public:
Q_INVOKABLE void start();
bool responseReceived;
bool isRunning;
EntityScriptStatus status;
QString errorInfo;
bool getResponseReceived() const { return _responseReceived; }
bool getIsRunning() const { return _isRunning; }
EntityScriptStatus getStatus() const { return _status; }
QString getErrorInfo() const { return _errorInfo; }
signals:
void finished(GetScriptStatusRequest* request);
@ -43,6 +43,11 @@ signals:
private:
QUuid _entityID;
MessageID _messageID;
bool _responseReceived;
bool _isRunning;
EntityScriptStatus _status;
QString _errorInfo;
};
class EntityScriptClient : public QObject, public Dependency {