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

Socket Server: Rolled in separate command handler classes created by factory.

Browse Source 
Translated several commands to the new regime.
p4#: 21645
This commit is contained in:
Jacob Støren
2013-05-16 11:15:34 +02:00
parent 739c530fcf
commit 36d7c46e57
2 changed files with 330 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/SocketInterface/RiaSocketServer.h
View File

@@ -29,6 +29,7 @@ class QTcpSocket;
class QNetworkSession;
class QErrorMessage;
class RimCase;
class RiaSocketCommand;
class RiaSocketServer : public QObject
@@ -42,6 +43,7 @@ public:
RiaSocketServer(QObject *parent = 0);
~RiaSocketServer();
unsigned short serverPort();
RimCase* findReservoir(int caseId);
private slots:
void slotNewClientConnection();
@@ -55,7 +57,6 @@ private:
void handleClientConnection( QTcpSocket* clientToHandle);
RimCase* findReservoir(int caseId);
void terminateCurrentConnection();
void calculateMatrixModelActiveCellInfo( RimCase* reservoirCase,
@@ -70,15 +71,6 @@ private:
std::vector<qint32>& hostCellK,
std::vector<qint32>& coarseBoxIdx);
void getCaseInfoFromCase(RimCase* rimCase, qint64& caseId, QString& caseName, QString& caseType, qint64& caseGroupId);
void getCaseInfoFromCases( std::vector<RimCase*>& cases,
std::vector<qint64>& caseIds,
std::vector<QString>& caseNames,
std::vector<QString>& caseTypes,
std::vector<qint64>& caseGroupIds);
private:
QTcpServer* m_tcpServer;
QErrorMessage* m_errorMessageDialog;
@@ -89,6 +81,8 @@ private:
// Vars used for reading data from octave and adding them to the available results
ReadState m_readState;
RiaSocketCommand* m_currentCommand;
quint64 m_timeStepCountToRead;
quint64 m_bytesPerTimeStepToRead;
size_t m_currentTimeStepToRead;