Skip to content
Snippets Groups Projects
Commit af8bfad6 authored by helene ortiz's avatar helene ortiz
Browse files

Last version

parent 387ea7cc
No related branches found
No related tags found
No related merge requests found
Future release
--------------
* Add specific simulated tab for 3d viewer * Add specific simulated tab for 3d viewer
* Bug fixed: while starting nomadlogs or charts from nomad, prod argument was not taken into account for standalone or lab versions.
4.3.32 10/07/2024 4.3.32 10/07/2024
------ ------
......
...@@ -704,11 +704,13 @@ public class MainWindow implements ServerConfigurationChangeListener, ServerEnde ...@@ -704,11 +704,13 @@ public class MainWindow implements ServerConfigurationChangeListener, ServerEnde
if (ConfigManager.getInstance().isStandalone()) { if (ConfigManager.getInstance().isStandalone()) {
standaloneArgument = STANDALONE; standaloneArgument = STANDALONE;
} else if (Nomad.isProd()) {
prodArgument = PROD;
} else if (ConfigManager.getInstance().isLabVersion()) { } else if (ConfigManager.getInstance().isLabVersion()) {
labArgument = LAB; labArgument = LAB;
} }
if (Nomad.isProd()) {
prodArgument = PROD;
}
// String authentication = Nomad.base64Encode("ics" + ":" + "icsics"); // String authentication = Nomad.base64Encode("ics" + ":" + "icsics");
......
...@@ -139,7 +139,7 @@ public class UserConnection { ...@@ -139,7 +139,7 @@ public class UserConnection {
instrumentCode = getInstrumentCode(); instrumentCode = getInstrumentCode();
if (investigationsMode == UserConnection.MODE_LABO) { if (investigationsMode == UserConnection.MODE_LABO) {
// Mode labo, replace instrumentCode with a real one // Mode labo, replace instrumentCode with a real one to avoid message "Unable to connect to SI server", as labo instruments haven't go any proposal
instrumentCode = "t13a"; instrumentCode = "t13a";
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment