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
292d366d
Commit
292d366d
authored
Jan 13, 2017
by
yannick legoc
Browse files
Merge remote-tracking branch 'origin/V3'
parents
d2867a55
ac68e8bf
Changes
4
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
292d366d
3.0.
4
-SNAPSHOT
3.0.
5
-SNAPSHOT
--------------
* Catch exception thrown when trying to format a invalid float value (avoid a client crash : see brisp 03 nov 2016).
3.0.4
-----
* New method "getChildrenOfAllDynamicProperties" in PropertyManager
3.0.3
-----
...
...
pom.xml
View file @
292d366d
...
...
@@ -2,7 +2,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
fr.ill.ics
</groupId>
<artifactId>
nomadcommandsystem
</artifactId>
<version>
3.0.
4
-SNAPSHOT
</version>
<version>
3.0.
5
-SNAPSHOT
</version>
<name>
NomadCommandSystem
</name>
<description>
Java bridge for the communication with the Nomad server
</description>
<scm>
...
...
src/main/java/fr/ill/ics/core/property/Float64Property.java
View file @
292d366d
...
...
@@ -29,10 +29,16 @@ public class Float64Property extends FloatProperty {
}
public
String
getServerValue
()
{
if
(
isCommandBox
)
{
return
this
.
propertyFormat
.
formatForDisplay
(
new
Double
(
AtomicCommandBoxAccessorProxy
.
getInstance
(
serverId
).
getFloat64Value
(
containerId
,
id
)).
toString
());
}
else
{
return
this
.
propertyFormat
.
formatForDisplay
(
new
Double
(
DataAccessor
.
getInstance
(
serverId
).
getFloat64Value
(
containerId
,
id
)).
toString
());
try
{
if
(
isCommandBox
)
{
return
this
.
propertyFormat
.
formatForDisplay
(
new
Double
(
AtomicCommandBoxAccessorProxy
.
getInstance
(
serverId
).
getFloat64Value
(
containerId
,
id
)).
toString
());
}
else
{
return
this
.
propertyFormat
.
formatForDisplay
(
new
Double
(
DataAccessor
.
getInstance
(
serverId
).
getFloat64Value
(
containerId
,
id
)).
toString
());
}
}
catch
(
Exception
e
)
{
System
.
err
.
println
(
"Exception while getting value for property "
+
getName
());
ConfigManager
.
CONFIGURATION_ERROR
=
true
;
return
""
;
}
}
...
...
src/main/java/fr/ill/ics/core/property/format/DecimalFormat.java
View file @
292d366d
...
...
@@ -50,7 +50,12 @@ public class DecimalFormat extends PropertyFormat {
"0.000000"
,
"0.0000000"
,
"0.00000000"
,
"0.000000000"
};
"0.000000000"
,
"0.0000000000"
,
"0.00000000000"
,
"0.000000000000"
,
"0.0000000000000"
};
public
DecimalFormat
(
int
numberOfDecimalPlaces
,
boolean
isScientific
)
{
...
...
@@ -120,8 +125,6 @@ public class DecimalFormat extends PropertyFormat {
}
else
{
df
=
new
java
.
text
.
DecimalFormat
(
decimalDisplayFormats
[
nbOfDecimalPlaces
]);
}
return
df
.
format
(
valueAsDouble
);
}
...
...
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