Skip to content

Commit 4dd0068

Browse files
committed
RicHelpAboutFeature: Display active gRPC port in About dialog
Retrieve the active gRPC port number from the application instance and display it within the version information section of the About dialog.
1 parent d9e331f commit 4dd0068

5 files changed

Lines changed: 28 additions & 0 deletions

File tree

ApplicationExeCode/RiaGrpcGuiApplication.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,15 @@ void RiaGrpcGuiApplication::doIdleProcessing()
8888
}
8989
}
9090

91+
//--------------------------------------------------------------------------------------------------
92+
///
93+
//--------------------------------------------------------------------------------------------------
94+
std::optional<int> RiaGrpcGuiApplication::activeGrpcPortNumber() const
95+
{
96+
if ( m_grpcServer && m_grpcServer->isRunning() ) return m_grpcServer->portNumber();
97+
return std::nullopt;
98+
}
99+
91100
//--------------------------------------------------------------------------------------------------
92101
///
93102
//--------------------------------------------------------------------------------------------------

ApplicationExeCode/RiaGrpcGuiApplication.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#include <QPointer>
2424
#include <QTimer>
2525

26+
#include <optional>
27+
2628
class QProcessEnvironment;
2729

2830
class RiaGrpcGuiApplication : public RiaGuiApplication, public RiaGrpcApplicationInterface
@@ -34,6 +36,7 @@ class RiaGrpcGuiApplication : public RiaGuiApplication, public RiaGrpcApplicatio
3436
~RiaGrpcGuiApplication() override;
3537

3638
QProcessEnvironment pythonProcessEnvironment() const override;
39+
std::optional<int> activeGrpcPortNumber() const override;
3740

3841
private:
3942
void onGuiPreferencesChanged() override;

ApplicationLibCode/Application/RiaApplication.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,6 +1338,14 @@ QProcessEnvironment RiaApplication::pythonProcessEnvironment() const
13381338
return QProcessEnvironment::systemEnvironment();
13391339
}
13401340

1341+
//--------------------------------------------------------------------------------------------------
1342+
///
1343+
//--------------------------------------------------------------------------------------------------
1344+
std::optional<int> RiaApplication::activeGrpcPortNumber() const
1345+
{
1346+
return std::nullopt;
1347+
}
1348+
13411349
//--------------------------------------------------------------------------------------------------
13421350
///
13431351
//--------------------------------------------------------------------------------------------------

ApplicationLibCode/Application/RiaApplication.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ class RiaApplication
164164

165165
QString pythonPath() const;
166166
virtual QProcessEnvironment pythonProcessEnvironment() const;
167+
virtual std::optional<int> activeGrpcPortNumber() const;
167168

168169
bool launchProcess( const QString& program, const QStringList& arguments, const QProcessEnvironment& processEnvironment );
169170
bool launchProcessForMultipleCases( const QString& program,

ApplicationLibCode/Commands/ApplicationCommands/RicHelpFeatures.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,13 @@ void RicHelpAboutFeature::onActionTriggered( bool isChecked )
172172
dlg.addVersionEntry( " ", QString( " Runtime version: " ) + pythonRuntimeVersion );
173173
}
174174

175+
if ( auto grpcPort = RiaApplication::instance()->activeGrpcPortNumber() )
176+
{
177+
dlg.addVersionEntry( " ", "" );
178+
dlg.addVersionEntry( " ", "gRPC Server" );
179+
dlg.addVersionEntry( " ", QString( " Port: %1" ).arg( *grpcPort ) );
180+
}
181+
175182
dlg.addVersionEntry( " ", "" );
176183
QString buildDate = RESINSIGHT_BUILD_DATE;
177184
dlg.addVersionEntry( "", QString( "Build date: " ) + buildDate );

0 commit comments

Comments
 (0)