ULOG handling improved

Author: ecmnet

MAVGCL/src/main/java/com/comino/flight/file/FileHandler.java

@@ -235,7 +235,6 @@ public void fileImport(File file) {
 
 
 					if(file.getName().endsWith("ulg")) {
-						modelService.setCollectorInterval(AnalysisModelService.HISPEED_INTERVAL_US);
 						ULogReader reader = new ULogReader(file.getAbsolutePath());
 						MAVGCLPX4Parameters.getInstance().setParametersFromLog(reader.getParameters());	
 						converter = new UlogtoModelConverter(reader,modelService.getModelList());		

MAVGCL/src/main/java/com/comino/flight/log/ulog/UlogtoModelConverter.java

@@ -68,22 +68,21 @@ public UlogtoModelConverter(ULogReader reader, List<AnalysisDataModel> list) {
 
 	public void doConversion() throws FormatErrorException {
 
-		long tms_slot = 0; long tms = 0; boolean errorFlag = false;
+		long tms_slot = 0; long tms = 0; long tms_old=0; boolean errorFlag = false;
 
 
 		Map<String,Object> data = new HashMap<String,Object>();
 
 		list.clear();
 
 		int interval_us = AnalysisModelService.getInstance().setCollectorInterval(AnalysisModelService.HISPEED_INTERVAL_US);
+		int interval_us2 = interval_us/2;
 
 		try {
 
-			System.out.println(reader.getStartMicroseconds()+"/"+interval_us);
-
 			while(tms < reader.getSizeMicroseconds()) {
 				tms = reader.readUpdate(data) - reader.getStartMicroseconds();
-				if(tms > tms_slot) {
+				if(tms > (tms_slot-interval_us2)) {
 					state.getProgressProperty().set(tms*1.0f/reader.getSizeMicroseconds());
 					AnalysisDataModel model = new AnalysisDataModel();
 					model.tms = tms;

MAVGCL/src/main/java/com/comino/flight/model/KeyFigureMetaData.java

@@ -204,6 +204,8 @@ public Double getValueFromULogModel(Map<String,Object> data) {
 		if(source!=null && source.field!=null) {  // source field specified
 			Object o = data.get(source.field);
 			if(o!=null) {
+				if(o instanceof Long)
+					value = (double)(Long)o;
 				if(o instanceof Integer)
 					value = (double)(Integer)o;
 				else if(o instanceof Double)

MAVGCL/src/main/java/com/comino/flight/model/converter/ULOGDifferenceConverter.java

@@ -39,13 +39,16 @@ public class ULOGDifferenceConverter extends SourceConverter {
 
 	private String ulogKeyFigure1 = null;
 	private String ulogKeyFigure2 = null;
-	
+
+	private double v1=0;
+	private double v2=0;
+
 
 	@Override
 	public void setParameter(String kfname, String[] params) {
 		this.ulogKeyFigure1 = params[0];
 		this.ulogKeyFigure2 = params[1];
-		
+
 	}
 
 	public ULOGDifferenceConverter() {
@@ -54,12 +57,40 @@ public ULOGDifferenceConverter() {
 
 	@Override
 	public double convert(Map<String,Object> ulogdata) {
+
+		Object o1; Object o2;
+
 		try {
-			if(ulogdata.get(ulogKeyFigure1)!=null && ulogdata.get(ulogKeyFigure2)!=null)
-		return (Long)ulogdata.get(ulogKeyFigure1)/1000f - (Long)ulogdata.get(ulogKeyFigure2)/1000f;
-			return 0;
+
+			o1 = ulogdata.get(ulogKeyFigure1);
+			o2 = ulogdata.get(ulogKeyFigure2);
+
+			if(o1!=null) {
+				if(o1 instanceof Long)
+					v1 = (double)(Long)o1 / 1000.0d;
+				if(o1 instanceof Integer)
+					v1 = (double)(Integer)o1;
+				else if(o1 instanceof Double)
+					v1 = ((Double)o1).doubleValue();
+				else if(o1 instanceof Float)
+					v1 = ((Float)o1).doubleValue();
+			}
+			
+
+			if(o2!=null) {
+				if(o2 instanceof Long)
+					v2 = (double)(Long)o2 / 1000.0d;
+				if(o2 instanceof Integer)
+					v2 = (double)(Integer)o2;
+				else if(o2 instanceof Double)
+					v2 = ((Double)o2).doubleValue();
+				else if(o2 instanceof Float)
+					v2 = ((Float)o2).doubleValue();
+			}
+
+			return v1 - v2;
+
 		} catch( Exception e) {
-			e.printStackTrace();
 			return 0;
 		}
 	}