Distance to target (MSP) added

Author: ecmnet

Diff for: MAVGCL/src/com/comino/flight/model/AnalysisDataModelMetaData.xml

@@ -1668,13 +1668,10 @@
 			<Group>Mapping</Group>
 		</Groups>
 	</KeyFigure>
-	<KeyFigure desc="Obst.Distance" uom="m" mask="#0.00" key="SLAMDIS">
+	<KeyFigure desc="Distance to target" uom="m" mask="#0.00" key="SLAMDIS">
 		<MSPSource class="slam" field="di"></MSPSource>
-		<Groups>
-			<Group>Local Position</Group>
-			<Group>Mapping</Group>
-		</Groups>
 	</KeyFigure>
+
 	<KeyFigure desc="Path.Speed" uom="m/s" mask="#0.0" key="SLAMSPD">
 		<MSPSource class="slam" field="pv"></MSPSource>
 		<Groups>

Diff for: MAVGCL/src/com/comino/flight/ui/tabs/MAVOpenMapTab.fxml

@@ -17,7 +17,7 @@
 							max="20.0" min="15.0" prefHeight="15.0" prefWidth="161.0"
 							showTickMarks="true" value="19.5" />
 						<ChoiceBox fx:id="gpssource" prefWidth="100.0" maxHeight="17.0"  />
-						<CheckBox fx:id="viewdetails" text="GPS Details" />
+						<CheckBox fx:id="viewdetails" text="Details" />
 						<Label text="Center on" prefHeight="19.0" />
 						<ChoiceBox fx:id="center" maxHeight="17.0" prefWidth="60.0" />
 						<ChoiceBox fx:id="provider" prefWidth="100.0" maxHeight="17.0" />
@@ -33,7 +33,7 @@
 			<children>
 				<BorderPane fx:id="mapviewpane" prefWidth="800" />
 				<GPSDetailsWidget fx:id="gpsdetails" moveable="true"
-					initialWidth="220" initialHeight="205" visible="false" styleClass="glass">
+					initialWidth="240" initialHeight="215" visible="false" styleClass="glass">
 
 				</GPSDetailsWidget>
 			</children>

Diff for: MAVGCL/src/com/comino/flight/ui/widgets/charts/annotations/XYSlamAnnotation.java

@@ -125,7 +125,7 @@ public void layoutAnnotation(ValueAxis xAxis, ValueAxis yAxis) {
 
 
 		if(model.getValue("SLAMSPD") != 0) {
-			setArrowLength(plan_dir,(float)model.getValue("SLAMSPD")/scale);
+			setArrowLength(plan_dir,(float)model.getValue("SLAMSPD")*100);
 			plan_dir.setLayoutX(xAxis.getDisplayPosition(model.getValue("LPOSY")));
 			plan_dir.setLayoutY(yAxis.getDisplayPosition(model.getValue("LPOSX")));
 			plan_rotate.angleProperty().set(180+MSPMathUtils.fromRad(model.getValue("SLAMDIR")));
@@ -162,8 +162,7 @@ public void clear() {
 		});
 	}
 
-	private void setArrowLength(Polygon p, float length) {
-		Double k = (double)(length * 90);
+	private void setArrowLength(Polygon p, double k) {
 		p.getPoints().set(1,k);
 		p.getPoints().set(3,k);
 		p.getPoints().set(9,k);

Diff for: MAVGCL/src/com/comino/flight/ui/widgets/gps/details/GPSDetailsWidget.fxml

@@ -8,5 +8,5 @@
 
 <fx:root type="javafx.scene.layout.Pane"
          xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1">
-		<GridPane fx:id="gps_grid" layoutX="14.0" layoutY="14.0" prefWidth="200.0" />
+		<GridPane fx:id="gps_grid" layoutX="14.0" layoutY="14.0" prefWidth="220.0" />
 </fx:root>

Diff for: MAVGCL/src/com/comino/flight/ui/widgets/gps/details/GPSDetailsWidget.java

@@ -68,6 +68,7 @@ public class GPSDetailsWidget extends WidgetPane  {
 			"BASELAT",
 			"BASELON",
 			"BASENO",
+			"SLAMDIS",
 	};
 
 	@FXML
@@ -128,7 +129,7 @@ public KeyFigure(GridPane grid, String k, int row) {
 				grid.add(new Label(),0,row);
 			} else {
 				DashLabel l1 = new DashLabel(kf.desc1);
-				l1.setPrefWidth(100); l1.setPrefHeight(19);
+				l1.setPrefWidth(140); l1.setPrefHeight(19);
 				grid.add(l1, 0, row);
 				value = new Label("-"); value.setPrefWidth(100); value.setAlignment(Pos.CENTER_RIGHT);
 				grid.add(value, 1, row);