From 1c899df06341318a7a2bab32980ebe601716cf9d Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 3 Jun 2024 07:46:58 +0200 Subject: [PATCH] Octave: Change default port number and add custom port number to Preferences --- .../Application/RiaApplication.cpp | 15 +++++++++- .../Application/RiaPreferences.cpp | 28 +++++++++++++++++-- .../Application/RiaPreferences.h | 13 +++++++-- .../SocketInterface/RiaSocketServer.cpp | 13 +++++++-- .../SocketInterface/RiaSocketServerDefines.h | 12 ++++++++ OctavePlugin/riGetActiveCellCenters.cpp | 2 +- OctavePlugin/riGetActiveCellCorners.cpp | 2 +- OctavePlugin/riGetActiveCellInfo.cpp | 2 +- OctavePlugin/riGetActiveCellProperty.cpp | 2 +- OctavePlugin/riGetCaseGroups.cpp | 2 +- OctavePlugin/riGetCases.cpp | 2 +- OctavePlugin/riGetCellCenters.cpp | 2 +- OctavePlugin/riGetCellCorners.cpp | 2 +- OctavePlugin/riGetCoarseningInfo.cpp | 2 +- OctavePlugin/riGetCurrentCase.cpp | 2 +- OctavePlugin/riGetDynamicNNCValues.cpp | 2 +- OctavePlugin/riGetGridDimensions.cpp | 2 +- OctavePlugin/riGetGridProperty.cpp | 2 +- .../riGetGridPropertyForSelectedCells.cpp | 2 +- OctavePlugin/riGetMainGridDimensions.cpp | 4 +-- OctavePlugin/riGetNNCConnections.cpp | 2 +- OctavePlugin/riGetNNCPropertyNames.cpp | 2 +- OctavePlugin/riGetPropertyNames.cpp | 2 +- OctavePlugin/riGetSelectedCases.cpp | 2 +- OctavePlugin/riGetSelectedCells.cpp | 2 +- OctavePlugin/riGetStaticNNCValues.cpp | 2 +- OctavePlugin/riGetTimeStepDates.cpp | 2 +- OctavePlugin/riGetTimeStepDays.cpp | 2 +- OctavePlugin/riGetWellCells.cpp | 2 +- OctavePlugin/riGetWellNames.cpp | 2 +- OctavePlugin/riGetWellStatus.cpp | 2 +- OctavePlugin/riSetActiveCellProperty.cpp | 2 +- OctavePlugin/riSetGridProperty.cpp | 2 +- OctavePlugin/riSetNNCProperty.cpp | 2 +- OctavePlugin/riSettings.h | 11 ++++++++ 35 files changed, 113 insertions(+), 39 deletions(-) diff --git a/ApplicationLibCode/Application/RiaApplication.cpp b/ApplicationLibCode/Application/RiaApplication.cpp index b0fcc129a9..f40f2ae5c6 100644 --- a/ApplicationLibCode/Application/RiaApplication.cpp +++ b/ApplicationLibCode/Application/RiaApplication.cpp @@ -1076,7 +1076,7 @@ QStringList RiaApplication::octaveArguments() const arguments.append( "--path" ); arguments << QApplication::applicationDirPath(); - if ( !m_preferences->octaveShowHeaderInfoWhenExecutingScripts ) + if ( !m_preferences->octaveShowHeaderInfoWhenExecutingScripts() ) { // -q // Don't print the usual greeting and version message at startup. @@ -1119,6 +1119,19 @@ QProcessEnvironment RiaApplication::octaveProcessEnvironment() const penv.insert( "LD_LIBRARY_PATH", ldPath ); #endif + // Set the environment variable for the port number used by Octave plugins + // The plugins can access the port number using riOctavePlugin::portNumber() + // If the port number is not set in preferences, the plugins will use the default port number + const QString key = QString::fromStdString( riOctavePlugin::portNumberKey() ); + if ( !m_preferences->octavePortNumber().isEmpty() ) + { + penv.insert( key, m_preferences->octavePortNumber() ); + } + else + { + penv.remove( key ); + } + return penv; } diff --git a/ApplicationLibCode/Application/RiaPreferences.cpp b/ApplicationLibCode/Application/RiaPreferences.cpp index 9e6807d30d..6174a0d9df 100644 --- a/ApplicationLibCode/Application/RiaPreferences.cpp +++ b/ApplicationLibCode/Application/RiaPreferences.cpp @@ -118,11 +118,14 @@ RiaPreferences::RiaPreferences() m_octaveExecutable.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); m_octaveExecutable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); - CAF_PDM_InitField( &octaveShowHeaderInfoWhenExecutingScripts, + CAF_PDM_InitField( &m_octaveShowHeaderInfoWhenExecutingScripts, "octaveShowHeaderInfoWhenExecutingScripts", false, "Show Text Header When Executing Scripts" ); - caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &octaveShowHeaderInfoWhenExecutingScripts ); + caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_octaveShowHeaderInfoWhenExecutingScripts ); + + CAF_PDM_InitFieldNoDefault( &m_octavePortNumber, "octavePortNumber", "Octave Port Number" ); + m_octavePortNumber.uiCapability()->setUiEditorTypeName( caf::PdmUiCheckBoxAndTextEditor::uiEditorTypeName() ); CAF_PDM_InitField( &m_pythonExecutable, "pythonExecutable", QString( "python" ), "Python Executable Location" ); m_pythonExecutable.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); @@ -449,7 +452,8 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& { caf::PdmUiGroup* octaveGroup = uiOrdering.addNewGroup( "Octave" ); octaveGroup->add( &m_octaveExecutable ); - octaveGroup->add( &octaveShowHeaderInfoWhenExecutingScripts ); + octaveGroup->add( &m_octaveShowHeaderInfoWhenExecutingScripts ); + octaveGroup->add( &m_octavePortNumber ); #ifdef ENABLE_GRPC caf::PdmUiGroup* pythonGroup = uiOrdering.addNewGroup( "Python" ); @@ -1008,6 +1012,24 @@ QString RiaPreferences::octaveExecutable() const return m_octaveExecutable().trimmed(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RiaPreferences::octaveShowHeaderInfoWhenExecutingScripts() const +{ + return m_octaveShowHeaderInfoWhenExecutingScripts(); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaPreferences::octavePortNumber() const +{ + if ( m_octavePortNumber().first ) return m_octavePortNumber().second; + + return {}; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Application/RiaPreferences.h b/ApplicationLibCode/Application/RiaPreferences.h index 5ecf7f78b3..2ff2e814a0 100644 --- a/ApplicationLibCode/Application/RiaPreferences.h +++ b/ApplicationLibCode/Application/RiaPreferences.h @@ -119,7 +119,11 @@ public: // Script paths QString pythonExecutable() const; + + // Octave QString octaveExecutable() const; + bool octaveShowHeaderInfoWhenExecutingScripts() const; + QString octavePortNumber() const; QString loggerFilename() const; int loggerFlushInterval() const; @@ -137,7 +141,6 @@ public: caf::PdmField scriptDirectories; caf::PdmField scriptEditorExecutable; - caf::PdmField octaveShowHeaderInfoWhenExecutingScripts; caf::PdmField showPythonDebugInfo; caf::PdmField ssihubAddress; @@ -211,8 +214,12 @@ private: caf::PdmField m_gridCalculationExpressionFolder; caf::PdmField m_summaryCalculationExpressionFolder; - // Script paths - caf::PdmField m_octaveExecutable; + // Octave + caf::PdmField m_octaveExecutable; + caf::PdmField m_octaveShowHeaderInfoWhenExecutingScripts; + caf::PdmField> m_octavePortNumber; + + // Python caf::PdmField m_pythonExecutable; // Logging diff --git a/ApplicationLibCode/SocketInterface/RiaSocketServer.cpp b/ApplicationLibCode/SocketInterface/RiaSocketServer.cpp index 56d5a76584..c137a9043a 100644 --- a/ApplicationLibCode/SocketInterface/RiaSocketServer.cpp +++ b/ApplicationLibCode/SocketInterface/RiaSocketServer.cpp @@ -56,15 +56,24 @@ RiaSocketServer::RiaSocketServer( QObject* parent ) m_nextPendingConnectionTimer->setInterval( 100 ); m_nextPendingConnectionTimer->setSingleShot( true ); - if ( !m_tcpServer->listen( QHostAddress::LocalHost, 40001 ) ) + int portNumber = riOctavePlugin::defaultPortNumber; + if ( !RiaPreferences::current()->octavePortNumber().isEmpty() ) { - QString txt = "Disabled communication with Octave due to another ResInsight process running."; + portNumber = RiaPreferences::current()->octavePortNumber().toInt(); + } + + if ( !m_tcpServer->listen( QHostAddress::LocalHost, portNumber ) ) + { + QString txt = QString( "Not able to communicate with Octave plugins. Failed to use port number : %1" ).arg( portNumber ); RiaLogging::warning( txt ); return; } + QString txt = QString( "Octave is using port: %1" ).arg( portNumber ); + RiaLogging::info( txt ); + connect( m_nextPendingConnectionTimer, SIGNAL( timeout() ), this, SLOT( slotNewClientConnection() ) ); connect( m_tcpServer, SIGNAL( newConnection() ), this, SLOT( slotNewClientConnection() ) ); } diff --git a/ApplicationLibCode/SocketInterface/RiaSocketServerDefines.h b/ApplicationLibCode/SocketInterface/RiaSocketServerDefines.h index 0a5a1e997f..e46b264ffe 100644 --- a/ApplicationLibCode/SocketInterface/RiaSocketServerDefines.h +++ b/ApplicationLibCode/SocketInterface/RiaSocketServerDefines.h @@ -16,9 +16,21 @@ // ///////////////////////////////////////////////////////////////////////////////// +#pragma once + #include namespace riOctavePlugin { const int qtDataStreamVersion = QDataStream::Qt_4_0; + +// https://en.wikipedia.org/wiki/List_of_TCP_and_UDP_port_numbers +// Use a port number in the dynamic/private range (49152-65535) +const int defaultPortNumber = 52025; + +inline const std::string portNumberKey() +{ + return "RESINSIGHT_OCTAVE_PORT_NUMBER"; } + +} // namespace riOctavePlugin diff --git a/OctavePlugin/riGetActiveCellCenters.cpp b/OctavePlugin/riGetActiveCellCenters.cpp index 300cf68d5a..1ef594a30a 100644 --- a/OctavePlugin/riGetActiveCellCenters.cpp +++ b/OctavePlugin/riGetActiveCellCenters.cpp @@ -143,7 +143,7 @@ DEFUN_DLD (riGetActiveCellCenters, args, nargout, } NDArray cellCenterValues; - getActiveCellCenters(cellCenterValues, "127.0.0.1", 40001, caseId, porosityModel.c_str()); + getActiveCellCenters(cellCenterValues, "127.0.0.1", riOctavePlugin::portNumber(), caseId, porosityModel.c_str()); return octave_value(cellCenterValues); } diff --git a/OctavePlugin/riGetActiveCellCorners.cpp b/OctavePlugin/riGetActiveCellCorners.cpp index 1c7ba597da..91e7d2df92 100644 --- a/OctavePlugin/riGetActiveCellCorners.cpp +++ b/OctavePlugin/riGetActiveCellCorners.cpp @@ -143,7 +143,7 @@ DEFUN_DLD (riGetActiveCellCorners, args, nargout, } NDArray cellCornerValues; - getActiveCellCorners(cellCornerValues, "127.0.0.1", 40001, caseId, porosityModel.c_str()); + getActiveCellCorners(cellCornerValues, "127.0.0.1", riOctavePlugin::portNumber(), caseId, porosityModel.c_str()); return octave_value(cellCornerValues); } diff --git a/OctavePlugin/riGetActiveCellInfo.cpp b/OctavePlugin/riGetActiveCellInfo.cpp index 9b8e07744d..ef472d8162 100644 --- a/OctavePlugin/riGetActiveCellInfo.cpp +++ b/OctavePlugin/riGetActiveCellInfo.cpp @@ -158,7 +158,7 @@ DEFUN_DLD (riGetActiveCellInfo, args, nargout, } } - getActiveCellInfo(propertyFrames, "127.0.0.1", 40001, caseId, porosityModel); + getActiveCellInfo(propertyFrames, "127.0.0.1", riOctavePlugin::portNumber(), caseId, porosityModel); return octave_value(propertyFrames); } diff --git a/OctavePlugin/riGetActiveCellProperty.cpp b/OctavePlugin/riGetActiveCellProperty.cpp index 088ab3890f..abdf2a8609 100644 --- a/OctavePlugin/riGetActiveCellProperty.cpp +++ b/OctavePlugin/riGetActiveCellProperty.cpp @@ -193,7 +193,7 @@ DEFUN_DLD (riGetActiveCellProperty, args, nargout, return octave_value_list (); } - getActiveCellProperty(propertyFrames, "127.0.0.1", 40001, caseId, propertyName.c_str(), requestedTimeSteps, porosityModel.c_str()); + getActiveCellProperty(propertyFrames, "127.0.0.1", riOctavePlugin::portNumber(), caseId, propertyName.c_str(), requestedTimeSteps, porosityModel.c_str()); return octave_value(propertyFrames); } diff --git a/OctavePlugin/riGetCaseGroups.cpp b/OctavePlugin/riGetCaseGroups.cpp index c78cb9c9b1..a3234ef0a6 100644 --- a/OctavePlugin/riGetCaseGroups.cpp +++ b/OctavePlugin/riGetCaseGroups.cpp @@ -103,7 +103,7 @@ DEFUN_DLD (riGetCaseGroups, args, nargout, { std::vector groupNames; std::vector groupIds; - getCaseGroups(groupNames, groupIds, "127.0.0.1", 40001); + getCaseGroups(groupNames, groupIds, "127.0.0.1", riOctavePlugin::portNumber()); size_t groupCount = groupNames.size(); diff --git a/OctavePlugin/riGetCases.cpp b/OctavePlugin/riGetCases.cpp index a3500e0287..7a52dcf932 100644 --- a/OctavePlugin/riGetCases.cpp +++ b/OctavePlugin/riGetCases.cpp @@ -115,7 +115,7 @@ DEFUN_DLD (riGetCases, args, nargout, caseGroupId = argCaseId; } - getCases(caseIds, caseNames, caseTypes, caseGroupIds, caseGroupId, "127.0.0.1", 40001); + getCases(caseIds, caseNames, caseTypes, caseGroupIds, caseGroupId, "127.0.0.1", riOctavePlugin::portNumber()); size_t caseCount = caseIds.size(); diff --git a/OctavePlugin/riGetCellCenters.cpp b/OctavePlugin/riGetCellCenters.cpp index c4807c5b7b..7aa957485c 100644 --- a/OctavePlugin/riGetCellCenters.cpp +++ b/OctavePlugin/riGetCellCenters.cpp @@ -126,7 +126,7 @@ DEFUN_DLD (riGetCellCenters, args, nargout, gridIndex = args(1).uint_value(); } - getCellCenters(cellCenterValues, "127.0.0.1", 40001, caseId, gridIndex); + getCellCenters(cellCenterValues, "127.0.0.1", riOctavePlugin::portNumber(), caseId, gridIndex); return octave_value(cellCenterValues); } diff --git a/OctavePlugin/riGetCellCorners.cpp b/OctavePlugin/riGetCellCorners.cpp index 782a18a468..3fb010bfb6 100644 --- a/OctavePlugin/riGetCellCorners.cpp +++ b/OctavePlugin/riGetCellCorners.cpp @@ -128,7 +128,7 @@ DEFUN_DLD (riGetCellCorners, args, nargout, gridIndex = args(1).uint_value(); } - getCellCorners(cellCornerValues, "127.0.0.1", 40001, caseId, gridIndex); + getCellCorners(cellCornerValues, "127.0.0.1", riOctavePlugin::portNumber(), caseId, gridIndex); return octave_value(cellCornerValues); } diff --git a/OctavePlugin/riGetCoarseningInfo.cpp b/OctavePlugin/riGetCoarseningInfo.cpp index ed415ff420..d68992c5e1 100644 --- a/OctavePlugin/riGetCoarseningInfo.cpp +++ b/OctavePlugin/riGetCoarseningInfo.cpp @@ -115,7 +115,7 @@ DEFUN_DLD (riGetCoarseningInfo, args, nargout, } int32NDArray coarseningInfo; - getCoarseningInfo(coarseningInfo, "127.0.0.1", 40001, caseId); + getCoarseningInfo(coarseningInfo, "127.0.0.1", riOctavePlugin::portNumber(), caseId); return octave_value(coarseningInfo); } diff --git a/OctavePlugin/riGetCurrentCase.cpp b/OctavePlugin/riGetCurrentCase.cpp index d5bfd2590e..3a90e43dc5 100644 --- a/OctavePlugin/riGetCurrentCase.cpp +++ b/OctavePlugin/riGetCurrentCase.cpp @@ -93,7 +93,7 @@ DEFUN_DLD (riGetCurrentCase, args, nargout, QString caseType; qint64 caseGroupId = -1; - getCurrentCase(caseId, caseName, caseType, caseGroupId, "127.0.0.1", 40001); + getCurrentCase(caseId, caseName, caseType, caseGroupId, "127.0.0.1", riOctavePlugin::portNumber()); octave_map fieldMap; diff --git a/OctavePlugin/riGetDynamicNNCValues.cpp b/OctavePlugin/riGetDynamicNNCValues.cpp index ce8473e44e..3700de2f11 100644 --- a/OctavePlugin/riGetDynamicNNCValues.cpp +++ b/OctavePlugin/riGetDynamicNNCValues.cpp @@ -155,7 +155,7 @@ DEFUN_DLD (riGetDynamicNNCValues, args, nargout, if (argIndices[1] >= 0) propertyName = args(argIndices[1]).char_matrix_value().row_as_string(0); if (argIndices[2] >= 0) requestedTimeSteps = args(argIndices[2]).int32_array_value(); - getDynamicNNCValues(propertyFrames, "127.0.0.1", 40001, caseId, propertyName.c_str(), requestedTimeSteps); + getDynamicNNCValues(propertyFrames, "127.0.0.1", riOctavePlugin::portNumber(), caseId, propertyName.c_str(), requestedTimeSteps); return octave_value(propertyFrames); } diff --git a/OctavePlugin/riGetGridDimensions.cpp b/OctavePlugin/riGetGridDimensions.cpp index 7478b859e8..1e89cbc8ae 100644 --- a/OctavePlugin/riGetGridDimensions.cpp +++ b/OctavePlugin/riGetGridDimensions.cpp @@ -119,7 +119,7 @@ DEFUN_DLD (riGetGridDimensions, args, nargout, } int32NDArray gridDimensions; - getGridDimensions(gridDimensions, "127.0.0.1", 40001, caseId); + getGridDimensions(gridDimensions, "127.0.0.1", riOctavePlugin::portNumber(), caseId); return octave_value(gridDimensions); } diff --git a/OctavePlugin/riGetGridProperty.cpp b/OctavePlugin/riGetGridProperty.cpp index 1507317445..8ddd5572a0 100644 --- a/OctavePlugin/riGetGridProperty.cpp +++ b/OctavePlugin/riGetGridProperty.cpp @@ -211,7 +211,7 @@ DEFUN_DLD (riGetGridProperty, args, nargout, return octave_value_list (); } - getGridProperty(propertyFrames, "127.0.0.1", 40001, caseId, gridIdx, propertyName.c_str(), requestedTimeSteps, porosityModel.c_str()); + getGridProperty(propertyFrames, "127.0.0.1", riOctavePlugin::portNumber(), caseId, gridIdx, propertyName.c_str(), requestedTimeSteps, porosityModel.c_str()); return octave_value(propertyFrames); } diff --git a/OctavePlugin/riGetGridPropertyForSelectedCells.cpp b/OctavePlugin/riGetGridPropertyForSelectedCells.cpp index 8cd71a5774..17f8dddd08 100644 --- a/OctavePlugin/riGetGridPropertyForSelectedCells.cpp +++ b/OctavePlugin/riGetGridPropertyForSelectedCells.cpp @@ -193,7 +193,7 @@ DEFUN_DLD (riGetGridPropertyForSelectedCells, args, nargout, return octave_value_list (); } - getGridPropertyForSelectedCells(propertyFrames, "127.0.0.1", 40001, caseId, propertyName.c_str(), requestedTimeSteps, porosityModel.c_str()); + getGridPropertyForSelectedCells(propertyFrames, "127.0.0.1", riOctavePlugin::portNumber(), caseId, propertyName.c_str(), requestedTimeSteps, porosityModel.c_str()); return octave_value(propertyFrames); } diff --git a/OctavePlugin/riGetMainGridDimensions.cpp b/OctavePlugin/riGetMainGridDimensions.cpp index af009cfd91..385f89fe62 100644 --- a/OctavePlugin/riGetMainGridDimensions.cpp +++ b/OctavePlugin/riGetMainGridDimensions.cpp @@ -101,9 +101,9 @@ DEFUN_DLD (riGetMainGridDimensions, args, nargout, int32NDArray propertyFrames; if (nargin > 0) - getMainGridDimensions(propertyFrames, "127.0.0.1", 40001, args(0).char_matrix_value().row_as_string(0).c_str()); + getMainGridDimensions(propertyFrames, "127.0.0.1", riOctavePlugin::portNumber(), args(0).char_matrix_value().row_as_string(0).c_str()); else - getMainGridDimensions(propertyFrames, "127.0.0.1", 40001, ""); + getMainGridDimensions(propertyFrames, "127.0.0.1", riOctavePlugin::portNumber(), ""); return octave_value(propertyFrames); } diff --git a/OctavePlugin/riGetNNCConnections.cpp b/OctavePlugin/riGetNNCConnections.cpp index 6595047863..7260c1d5c8 100644 --- a/OctavePlugin/riGetNNCConnections.cpp +++ b/OctavePlugin/riGetNNCConnections.cpp @@ -122,7 +122,7 @@ DEFUN_DLD(riGetNNCConnections, args, nargout, } } - getNNCConnections(connections, "127.0.0.1", 40001, caseId); + getNNCConnections(connections, "127.0.0.1", riOctavePlugin::portNumber(), caseId); Cell cellValuesGridIndex(connections.size(), 2); Cell cellValuesI(connections.size(), 2); diff --git a/OctavePlugin/riGetNNCPropertyNames.cpp b/OctavePlugin/riGetNNCPropertyNames.cpp index ba9140d0b9..84ca1f9806 100644 --- a/OctavePlugin/riGetNNCPropertyNames.cpp +++ b/OctavePlugin/riGetNNCPropertyNames.cpp @@ -115,7 +115,7 @@ DEFUN_DLD (riGetNNCPropertyNames, args, nargout, std::vector propertyNames; std::vector propertyTypes; - getNNCPropertyNames(propertyNames, propertyTypes, "127.0.0.1", 40001, argCaseId); + getNNCPropertyNames(propertyNames, propertyTypes, "127.0.0.1", riOctavePlugin::portNumber(), argCaseId); size_t caseCount = propertyNames.size(); diff --git a/OctavePlugin/riGetPropertyNames.cpp b/OctavePlugin/riGetPropertyNames.cpp index b870448d81..6cd313e3d8 100644 --- a/OctavePlugin/riGetPropertyNames.cpp +++ b/OctavePlugin/riGetPropertyNames.cpp @@ -135,7 +135,7 @@ DEFUN_DLD (riGetPropertyNames, args, nargout, std::vector propertyNames; std::vector propertyTypes; - getPropertyNames(propertyNames, propertyTypes, "127.0.0.1", 40001, argCaseId, porosityModel); + getPropertyNames(propertyNames, propertyTypes, "127.0.0.1", riOctavePlugin::portNumber(), argCaseId, porosityModel); size_t caseCount = propertyNames.size(); diff --git a/OctavePlugin/riGetSelectedCases.cpp b/OctavePlugin/riGetSelectedCases.cpp index 7d65e50ed1..077144d3a9 100644 --- a/OctavePlugin/riGetSelectedCases.cpp +++ b/OctavePlugin/riGetSelectedCases.cpp @@ -105,7 +105,7 @@ DEFUN_DLD (riGetSelectedCases, args, nargout, std::vector caseTypes; std::vector caseGroupIds; - getSelectedCases(caseIds, caseNames, caseTypes, caseGroupIds, "127.0.0.1", 40001); + getSelectedCases(caseIds, caseNames, caseTypes, caseGroupIds, "127.0.0.1", riOctavePlugin::portNumber()); size_t caseCount = caseIds.size(); diff --git a/OctavePlugin/riGetSelectedCells.cpp b/OctavePlugin/riGetSelectedCells.cpp index 157549ac5e..16e263e726 100644 --- a/OctavePlugin/riGetSelectedCells.cpp +++ b/OctavePlugin/riGetSelectedCells.cpp @@ -125,7 +125,7 @@ DEFUN_DLD (riGetSelectedCells, args, nargout, int32NDArray propertyFrames; - getSelectedCells(propertyFrames, "127.0.0.1", 40001, caseId); + getSelectedCells(propertyFrames, "127.0.0.1", riOctavePlugin::portNumber(), caseId); return octave_value(propertyFrames); } diff --git a/OctavePlugin/riGetStaticNNCValues.cpp b/OctavePlugin/riGetStaticNNCValues.cpp index 0610f6a4de..e3646fcf0c 100644 --- a/OctavePlugin/riGetStaticNNCValues.cpp +++ b/OctavePlugin/riGetStaticNNCValues.cpp @@ -128,7 +128,7 @@ DEFUN_DLD (riGetStaticNNCValues, args, nargout, if (argIndices[0] >= 0) caseId = args(argIndices[0]).int_value(); if (argIndices[1] >= 0) propertyName = args(argIndices[1]).char_matrix_value().row_as_string(0); - getStaticNNCValues(propertyValues, "127.0.0.1", 40001, caseId, propertyName.c_str()); + getStaticNNCValues(propertyValues, "127.0.0.1", riOctavePlugin::portNumber(), caseId, propertyName.c_str()); dim_vector dv(2, 1); dv(0) = propertyValues.size(); diff --git a/OctavePlugin/riGetTimeStepDates.cpp b/OctavePlugin/riGetTimeStepDates.cpp index 9be5748448..27a116ba65 100644 --- a/OctavePlugin/riGetTimeStepDates.cpp +++ b/OctavePlugin/riGetTimeStepDates.cpp @@ -140,7 +140,7 @@ DEFUN_DLD (riGetTimeStepDates, args, nargout, std::vector minuteValues; std::vector secondValues; - getTimeStepDates(yearValues, monthValues, dayValues, hourValues, minuteValues, secondValues, caseId, "127.0.0.1", 40001); + getTimeStepDates(yearValues, monthValues, dayValues, hourValues, minuteValues, secondValues, caseId, "127.0.0.1", riOctavePlugin::portNumber()); size_t timeStepDateCount = yearValues.size(); diff --git a/OctavePlugin/riGetTimeStepDays.cpp b/OctavePlugin/riGetTimeStepDays.cpp index 62f5cf13f3..c563be2d3e 100644 --- a/OctavePlugin/riGetTimeStepDays.cpp +++ b/OctavePlugin/riGetTimeStepDays.cpp @@ -108,7 +108,7 @@ DEFUN_DLD (riGetTimeStepDays, args, nargout, std::vector decimalDays; - getTimeStepDates(decimalDays, caseId, "127.0.0.1", 40001); + getTimeStepDates(decimalDays, caseId, "127.0.0.1", riOctavePlugin::portNumber()); dim_vector dv(2, 1); dv(0) = decimalDays.size(); diff --git a/OctavePlugin/riGetWellCells.cpp b/OctavePlugin/riGetWellCells.cpp index b967636ba0..fb206b5aec 100644 --- a/OctavePlugin/riGetWellCells.cpp +++ b/OctavePlugin/riGetWellCells.cpp @@ -209,7 +209,7 @@ DEFUN_DLD (riGetWellCells, args, nargout, cellStatuses, branchIds, segmentIds, - "127.0.0.1", 40001, + "127.0.0.1", riOctavePlugin::portNumber(), caseId, QString::fromStdString(wellName), requestedTimeStep); size_t cellCount = cellIs.size(); diff --git a/OctavePlugin/riGetWellNames.cpp b/OctavePlugin/riGetWellNames.cpp index 4bbd17733b..d6d825fee5 100644 --- a/OctavePlugin/riGetWellNames.cpp +++ b/OctavePlugin/riGetWellNames.cpp @@ -106,7 +106,7 @@ DEFUN_DLD (riGetWellNames, args, nargout, std::vector wellNames; - getWellNames(wellNames, "127.0.0.1", 40001, argCaseId); + getWellNames(wellNames, "127.0.0.1", riOctavePlugin::portNumber(), argCaseId); size_t caseCount = wellNames.size(); diff --git a/OctavePlugin/riGetWellStatus.cpp b/OctavePlugin/riGetWellStatus.cpp index 318e9b9d80..dcc9c43f27 100644 --- a/OctavePlugin/riGetWellStatus.cpp +++ b/OctavePlugin/riGetWellStatus.cpp @@ -170,7 +170,7 @@ DEFUN_DLD (riGetWellStatus, args, nargout, std::vector wellType; std::vector wellStatus; - getWellStatus(wellType, wellStatus, "127.0.0.1", 40001, caseId, QString::fromStdString(wellName), requestedTimeSteps); + getWellStatus(wellType, wellStatus, "127.0.0.1", riOctavePlugin::portNumber(), caseId, QString::fromStdString(wellName), requestedTimeSteps); size_t caseCount = wellType.size(); diff --git a/OctavePlugin/riSetActiveCellProperty.cpp b/OctavePlugin/riSetActiveCellProperty.cpp index 91edf8f9cd..ca12495424 100644 --- a/OctavePlugin/riSetActiveCellProperty.cpp +++ b/OctavePlugin/riSetActiveCellProperty.cpp @@ -219,7 +219,7 @@ DEFUN_DLD (riSetActiveCellProperty, args, nargout, return octave_value_list (); } - setEclipseProperty(propertyFrames, "127.0.0.1", 40001, caseId, propertyName.c_str(), requestedTimeSteps, porosityModel.c_str()); + setEclipseProperty(propertyFrames, "127.0.0.1", riOctavePlugin::portNumber(), caseId, propertyName.c_str(), requestedTimeSteps, porosityModel.c_str()); return octave_value_list (); } diff --git a/OctavePlugin/riSetGridProperty.cpp b/OctavePlugin/riSetGridProperty.cpp index 9a77e17173..e38456d10d 100644 --- a/OctavePlugin/riSetGridProperty.cpp +++ b/OctavePlugin/riSetGridProperty.cpp @@ -258,7 +258,7 @@ DEFUN_DLD (riSetGridProperty, args, nargout, return octave_value_list (); } - setEclipseProperty(propertyFrames, "127.0.0.1", 40001, caseId, gridIndex, propertyName.c_str(), timeStepIndices, porosityModel.c_str()); + setEclipseProperty(propertyFrames, "127.0.0.1", riOctavePlugin::portNumber(), caseId, gridIndex, propertyName.c_str(), timeStepIndices, porosityModel.c_str()); return octave_value_list (); } diff --git a/OctavePlugin/riSetNNCProperty.cpp b/OctavePlugin/riSetNNCProperty.cpp index f58e7f56e6..d52b2e13c2 100644 --- a/OctavePlugin/riSetNNCProperty.cpp +++ b/OctavePlugin/riSetNNCProperty.cpp @@ -186,7 +186,7 @@ DEFUN_DLD (riSetNNCProperty, args, nargout, } } - setNNCProperty(propertyFrames, "127.0.0.1", 40001, caseId, propertyName.c_str(), requestedTimeSteps); + setNNCProperty(propertyFrames, "127.0.0.1", riOctavePlugin::portNumber(), caseId, propertyName.c_str(), requestedTimeSteps); return octave_value_list (); } diff --git a/OctavePlugin/riSettings.h b/OctavePlugin/riSettings.h index a7badf6941..a10e41f869 100644 --- a/OctavePlugin/riSettings.h +++ b/OctavePlugin/riSettings.h @@ -76,5 +76,16 @@ namespace riOctavePlugin #endif } + int portNumber() + { + QString portStr = getenv(riOctavePlugin::portNumberKey().data()); + if (!portStr.isEmpty()) + { + return portStr.toInt(); + } + + return riOctavePlugin::defaultPortNumber; + } + }