OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Completed riGetCurrentCase

Browse Source 
p4#: 21603
This commit is contained in:
Magne Sjaastad 2013-05-13 21:41:45 +02:00
parent 65710a8e08
commit 10b49efae9
2 changed files with 73 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/SocketInterface/RiaSocketServer.cpp
View File

@ -288,14 +288,31 @@ void RiaSocketServer::readCommandFromOctave()
if (isGetCurrentCase) if (isGetCurrentCase)
{ {
int caseId = -1; qint64 caseId = -1;
QString caseName;
qint64 caseType = -1;
qint64 caseGroupId = -1;
if (reservoir) if (reservoir)
{ {
caseId = reservoir->caseId(); caseId = reservoir->caseId();
caseName = reservoir->caseUserDescription();
caseType = -1;
if (reservoir->parentGridCaseGroup())
{
caseGroupId = reservoir->parentGridCaseGroup()->groupId();
}
} }
socketStream << (qint64)caseId; quint64 byteCount = 3*sizeof(qint64) + caseName.size()*sizeof(QChar);
socketStream << byteCount;
socketStream << caseId;
socketStream << caseName;
socketStream << caseType;
socketStream << caseGroupId;
return; return;
} }

68
OctavePlugin/riGetCurrentCase.cpp
View File

@ -3,17 +3,17 @@
#include "riSettings.h" #include "riSettings.h"
void getCurrentCase(int& currentCaseId, const QString &hostName, quint16 port) void getCurrentCase(qint64& caseId, QString& caseName, qint64& caseType, qint64& caseGroupId, const QString &hostName, quint16 port)
{ {
QString serverName = hostName; QString serverName = hostName;
quint16 serverPort = port; quint16 serverPort = port;
const int Timeout = riOctavePlugin::timeOutMilliSecs; const int timeout = riOctavePlugin::timeOutMilliSecs;
QTcpSocket socket; QTcpSocket socket;
socket.connectToHost(serverName, serverPort); socket.connectToHost(serverName, serverPort);
if (!socket.waitForConnected(Timeout)) if (!socket.waitForConnected(timeout))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error((("Connection: ") + socket.errorString()).toLatin1().data());
return; return;
@ -25,28 +25,39 @@ void getCurrentCase(int& currentCaseId, const QString &hostName, quint16 port)
QByteArray cmdBytes = command.toLatin1(); QByteArray cmdBytes = command.toLatin1();
QDataStream socketStream(&socket); QDataStream socketStream(&socket);
socketStream.setVersion(QDataStream::Qt_4_0); socketStream.setVersion(riOctavePlugin::qtDataStreamVersion);
socketStream << (qint64)(cmdBytes.size()); socketStream << (qint64)(cmdBytes.size());
socket.write(cmdBytes); socket.write(cmdBytes);
// Get response. First wait for the header // Get response. First wait for the header
while (socket.bytesAvailable() < (int)(sizeof(qint64))) while (socket.bytesAvailable() < (int)(sizeof(quint64)))
{ {
if (!socket.waitForReadyRead(Timeout)) if (!socket.waitForReadyRead(timeout))
{ {
error((("Wating for header: ") + socket.errorString()).toLatin1().data()); error((("Wating for header: ") + socket.errorString()).toLatin1().data());
return; return;
} }
} }
qint64 caseId; quint64 byteCount;
socketStream >> byteCount;
while (socket.bytesAvailable() < (int)(byteCount))
{
if (!socket.waitForReadyRead(timeout))
{
error((("Waiting for data: ") + socket.errorString()).toLatin1().data());
return;
}
OCTAVE_QUIT;
}
socketStream >> caseId; socketStream >> caseId;
socketStream >> caseName;
octave_stdout << "riGetCurrentCase: " << caseId << std::endl; socketStream >> caseType;
socketStream >> caseGroupId;
currentCaseId = caseId;
return; return;
} }
@ -71,11 +82,40 @@ DEFUN_DLD (riGetCurrentCase, args, nargout,
} }
else else
{ {
int caseId; qint64 caseId = -1;
QString caseName;
qint64 caseType = -1;
qint64 caseGroupId = -1;
getCurrentCase(caseId, "127.0.0.1", 40001); getCurrentCase(caseId, caseName, caseType, caseGroupId, "127.0.0.1", 40001);
return octave_value(caseId); octave_value_list retval;
if (nargout >= 1)
{
retval(0) = caseId;
}
if (nargout >= 2)
{
charMatrix ch;
ch.resize(1, caseName.length());
ch.insert(caseName.toLatin1().data(), 0, 0);
retval(1) = octave_value (ch, true, '\'');
}
if (nargout >= 3)
{
retval(2) = caseType;
}
if (nargout >= 4)
{
retval(3) = caseGroupId;
}
return retval;
} }
return octave_value_list (); return octave_value_list ();