updated version and added comment about unprecise data merge

This commit is contained in:
2015-08-19 09:50:15 +02:00
parent 1d23c5c4b6
commit 5bbfc94eb3
2 changed files with 5 additions and 1 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.psi.fda</groupId>
<artifactId>ch.psi.fda.xscan</artifactId>
<version>2.6.1</version>
<version>2.6.2</version>
<dependencies>
@@ -115,6 +115,10 @@ public class ScrlogicLoop implements ActionLoop {
@Override
public void propertyChange(PropertyChangeEvent evt) {
if(evt.getPropertyName().equals("value")){
// Merging values this way it is not 100% accurate as theoretically values does not need to come in
// in the correct time sequence. However we tradeoff this accuracy as we are not precise anyway
DoubleTimestamp v = (DoubleTimestamp) evt.getNewValue();
currentValues.set(0, v.getTimestamp().getTime());
currentValues.set(1, v.getNanosecondOffset());