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

Octave Interface: Cleaned up code, and moved SetActiveCellProperties to the correct file

Browse Source 
p4#: 21716
This commit is contained in:
Jacob Støren
2013-05-24 12:02:52 +02:00
parent 767c1d2409
commit 33bfb287d6
3 changed files with 292 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ApplicationCode/SocketInterface/RiaSocketServer.h
View File

@@ -46,45 +46,33 @@ public:
public:
RiaSocketServer(QObject *parent = 0);
~RiaSocketServer();
unsigned short serverPort();
RimCase* findReservoir(int caseId);
QErrorMessage* errorMessageDialog() { return m_errorMessageDialog; }
QTcpSocket* currentClient() { return m_currentClient; }
unsigned short serverPort();
RimCase* findReservoir(int caseId);
QErrorMessage* errorMessageDialog() { return m_errorMessageDialog; }
QTcpSocket* currentClient() { return m_currentClient; }
private slots:
void slotNewClientConnection();
void slotCurrentClientDisconnected();
void slotReadyRead();
void slotNewClientConnection();
void slotCurrentClientDisconnected();
void slotReadyRead();
private:
void readCommandFromOctave();
void readCommandFromOctave();
void readPropertyDataFromOctave();
void readPropertyDataFromOctave();
void handleClientConnection( QTcpSocket* clientToHandle);
void terminateCurrentConnection();
void handleClientConnection( QTcpSocket* clientToHandle);
void terminateCurrentConnection();
private:
QTcpServer* m_tcpServer;
QErrorMessage* m_errorMessageDialog;
QTcpServer* m_tcpServer;
QErrorMessage* m_errorMessageDialog;
QTcpSocket* m_currentClient;
qint64 m_currentCommandSize; ///< The size in bytes of the command we are currently reading.
QTcpSocket* m_currentClient;
qint64 m_currentCommandSize; ///< The size in bytes of the command we are currently reading.
// 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;
//std::vector< std::vector<double> >*
// m_scalarResultsToAdd;
//RimCase* m_currentReservoir;
//size_t m_currentScalarIndex;
//QString m_currentPropertyName;
//bool m_invalidActiveCellCountDetected;
RiaSocketCommand* m_currentCommand;
};