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

Added current case to socket server.

Browse Source 
Fixed includes on Windows
p4#: 21725
This commit is contained in:
Magne Sjaastad 2013-05-26 21:55:05 +02:00
parent fbc02e79b0
commit 2afca2bd5d
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ApplicationCode/SocketInterface/RiaSocketServer.cpp
View File

@ -30,6 +30,18 @@
#include "RimProject.h" #include "RimProject.h"
#include "RimCase.h" #include "RimCase.h"
#include "RimResultSlot.h"
#include "RimCellEdgeResultSlot.h"
#include "RimCellRangeFilterCollection.h"
#include "RimCellPropertyFilterCollection.h"
#include "RimWellCollection.h"
#include "Rim3dOverlayInfoConfig.h"
#include "RimIdenticalGridCaseGroup.h"
#include "RimScriptCollection.h"
#include "RimCaseCollection.h"
#include "RimWellPathCollection.h"
#include "RimReservoirCellResultsCacher.h"
#include "RigCaseData.h" #include "RigCaseData.h"
#include "RigCaseCellResultsData.h" #include "RigCaseCellResultsData.h"
@ -45,7 +57,8 @@ RiaSocketServer::RiaSocketServer(QObject* parent)
m_tcpServer(NULL), m_tcpServer(NULL),
m_currentClient(NULL), m_currentClient(NULL),
m_currentCommandSize(0), m_currentCommandSize(0),
m_currentCommand(NULL) m_currentCommand(NULL),
m_currentCaseId(-1)
{ {
m_errorMessageDialog = new QErrorMessage(RiuMainWindow::instance()); m_errorMessageDialog = new QErrorMessage(RiuMainWindow::instance());
@ -307,3 +320,19 @@ void RiaSocketServer::slotReadyRead()
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaSocketServer::setCurrentCaseId(int caseId)
{
m_currentCaseId = caseId;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RiaSocketServer::currentCaseId() const
{
return m_currentCaseId;
}

6
ApplicationCode/SocketInterface/RiaSocketServer.h
View File

@ -52,6 +52,9 @@ public:
QErrorMessage* errorMessageDialog() { return m_errorMessageDialog; } QErrorMessage* errorMessageDialog() { return m_errorMessageDialog; }
QTcpSocket* currentClient() { return m_currentClient; } QTcpSocket* currentClient() { return m_currentClient; }
void setCurrentCaseId(int caseId);
int currentCaseId() const;
private slots: private slots:
void slotNewClientConnection(); void slotNewClientConnection();
void slotCurrentClientDisconnected(); void slotCurrentClientDisconnected();
@ -69,5 +72,6 @@ private:
qint64 m_currentCommandSize; ///< The size in bytes of the command we are currently reading. qint64 m_currentCommandSize; ///< The size in bytes of the command we are currently reading.
RiaSocketCommand* m_currentCommand; RiaSocketCommand* m_currentCommand;
};
int m_currentCaseId; // Set to -1 to use default server behavior
};