Commit b2511818 authored by Locatelli's avatar Locatelli

get right nomad server end point for simulated tab

parent 3928a8c8
4.0.49 dd/mm/yyyyy
4.0.49 24/07/2020
------
* Get correct nomad server endpoint for simulated tab
* Restore a little top margin in command box (top margin of 1px in rowlayout and 2px in gridlayout).
4.0.48 22/07/2020
------
* Improve vertical alignment in command box (remove top margin of 4px in gridlayout and rowlayout).
......
......@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.ill.ics</groupId>
<artifactId>nomadgui</artifactId>
<version>4.0.49-SNAPSHOT</version>
<version>4.0.50-SNAPSHOT</version>
<name>NomadGUI</name>
<description>Graphical user interface for Nomad</description>
<scm>
......
......@@ -54,6 +54,7 @@ import fr.ill.ics.client.view.factory.ImageFactory;
import fr.ill.ics.client.view.util.dialog.DialogManager;
import fr.ill.ics.common.Nomad;
import fr.ill.ics.nscclient.servant.ResourceNotFoundException;
import fr.ill.ics.nscclient.sessionmanagement.SessionManager;
import fr.ill.ics.util.ConfigManager;
public class CommandWindow {
......@@ -454,7 +455,7 @@ public class CommandWindow {
if (canCreateSimulationTab()) {
System.out.println("Starting simulation server with Cameo");
if (cameoServer == null) {
String nomadServerLocation = ConfigManager.getInstance().getNomadServerEndpoint();
String nomadServerLocation = "tcp://" + SessionManager.getInstance(CommandZoneWrapper.SERVER_ID).getInstrumentName() + ":7000";
if (nomadServerLocation != null) {
cameoServer = new Server(nomadServerLocation);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment