Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadCommandSystem
Commits
5a16c0f7
Commit
5a16c0f7
authored
Jun 25, 2020
by
Locatelli
Browse files
Ploty2, integrate remote nomad server endpoint
parent
73f1b285
Changes
3
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
5a16c0f7
4.0.22 25/06/2020
------
* Ploty2, integrate remote nomad server endpoint
4.0.21 25/06/2020
------
* getNomadServerEndpoint return address instead of name as getServerEndpoint
...
...
pom.xml
View file @
5a16c0f7
...
...
@@ -2,7 +2,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
fr.ill.ics
</groupId>
<artifactId>
nomadcommandsystem
</artifactId>
<version>
4.0.2
1
</version>
<version>
4.0.2
2
</version>
<name>
NomadCommandSystem
</name>
<description>
Java bridge for the communication with the Nomad server
</description>
<scm>
...
...
src/main/java/fr/ill/ics/nscclient/ploty/PlotyInstance.java
View file @
5a16c0f7
...
...
@@ -26,12 +26,14 @@ import java.util.LinkedHashSet;
import
java.util.List
;
import
java.util.Set
;
import
fr.ill.ics.bridge.command.CommandZoneWrapper
;
import
fr.ill.ics.cameo.Application
;
import
fr.ill.ics.cameo.Application.Info
;
import
fr.ill.ics.cameo.ConnectionTimeout
;
import
fr.ill.ics.cameo.RequesterCreationException
;
import
fr.ill.ics.cameo.Server
;
import
fr.ill.ics.core.property.Property
;
import
fr.ill.ics.nscclient.sessionmanagement.SessionManager
;
import
fr.ill.ics.ploty.DataPlotMessages
;
import
fr.ill.ics.ploty.DataPlotMessages.Message
;
import
fr.ill.ics.ploty.DataPlotMessages.PlotPropertyDataMessage
;
...
...
@@ -81,7 +83,13 @@ public class PlotyInstance {
Application
.
Instance
ploty
=
null
;
String
nomadServerEndpoint
=
ConfigManager
.
getInstance
().
getNomadServerEndpoint
();
String
nomadServerEndpoint
;
if
(
ConfigManager
.
getInstance
().
isMainClient
())
{
nomadServerEndpoint
=
ConfigManager
.
getInstance
().
getNomadServerEndpoint
();
}
else
{
// nomad endpoint is build from selected instrument
nomadServerEndpoint
=
"tcp://"
+
SessionManager
.
getInstance
(
CommandZoneWrapper
.
SERVER_ID
).
getInstrumentName
()
+
":7000"
;
}
if
(
serverEndpoint
.
contentEquals
(
nomadServerEndpoint
))
{
// Client on a same machine as server
try
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment