Merge pull request #217 from zhujun98/gui

Change GUI cmd interface
zhujun98 · Sep 26, 2023 · b0c5496 · b0c5496
2 parents dc3929e + 77ab065
commit b0c5496
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/docs/docs/user_guide/usage.md b/docs/docs/user_guide/usage.md
@@ -29,19 +29,19 @@ conda activate recastx-gui
 
 You can specify the reconstruction server
 ```sh
-recastx-gui --recon-host <hostname>
+recastx-gui --server <hostname:port>
 ```
 
 or make use of local port forwarding
 ```sh
-ssh -L 9971:localhost:9971 <hostname>
+ssh -L <port>:localhost:<port> <hostname>
 recastx-gui
 ```
 
 You can also start the GUI on a node with [NoMachine](https://www.psi.ch/en/photon-science-data-services/remote-interactive-access
 ) installed
 ```sh
-vglrun recastx-gui --recon-host <hostname>
+vglrun recastx-gui --server <hostname:port>
 ```
 
 ## Step 3: Streaming the data

diff --git a/gui/include/rpc_client.hpp b/gui/include/rpc_client.hpp
@@ -76,7 +76,7 @@ class RpcClient {
 
     static std::queue<DataType>& packets();
 
-    RpcClient(const std::string& hostname, int port);
+    explicit RpcClient(const std::string& address);
 
     ~RpcClient();
 

diff --git a/gui/src/main.cpp b/gui/src/main.cpp
@@ -31,10 +31,8 @@ int main(int argc, char** argv) {
     po::options_description desc("Options");
     desc.add_options()
         ("help,h", "print help message")
-        ("recon-host", po::value<std::string>()->default_value("localhost"),
-         "hostname of the reconstruction server")
-        ("rpc-port", po::value<int>()->default_value(9971),
-         "port of the RPC server. ")
+        ("server", po::value<std::string>()->default_value("localhost:9971"),
+         "address (<hostname>:<port>) of the reconstruction server")
     ;
 
     po::variables_map opts;
@@ -48,7 +46,7 @@ int main(int argc, char** argv) {
 
     auto& app = Application::instance();
 
-    RpcClient rpc_client(opts["recon-host"].as<std::string>(), opts["rpc-port"].as<int>());
+    RpcClient rpc_client(opts["server"].as<std::string>());
 
     Scene3d scene(&rpc_client);
 

diff --git a/gui/src/rpc_client.cpp b/gui/src/rpc_client.cpp
@@ -18,13 +18,12 @@ using namespace std::string_literals;
 
 std::queue<RpcClient::DataType>& RpcClient::packets() { return packets_; }
 
-RpcClient::RpcClient(const std::string& hostname, int port) {
+RpcClient::RpcClient(const std::string& address) {
 
     grpc::ChannelArguments ch_args;
     ch_args.SetMaxReceiveMessageSize(K_MAX_RPC_CLIENT_RECV_MESSAGE_SIZE);
-    channel_ = grpc::CreateCustomChannel(hostname + ":"s + std::to_string(port),
-                                         grpc::InsecureChannelCredentials(),
-                                         ch_args);
+    channel_ = grpc::CreateCustomChannel(
+            address, grpc::InsecureChannelCredentials(), ch_args);
 
     control_stub_ = rpc::Control::NewStub(channel_);
     imageproc_stub_ = rpc::Imageproc::NewStub(channel_);