Chart scrolling fixes

Author: ecmnet

MAVGCL/src/main/java/com/comino/flight/model/service/AnalysisModelService.java

@@ -214,7 +214,7 @@ public AnalysisDataModel getLast(float f) {
 	}
 
 	public void setCurrent(int index) {
-		if(modelList.size() > index-1) {
+		if(modelList.size() > index) {
 			if(index < 0)
 				return;
 			current.set(modelList.get(index));

MAVGCL/src/main/java/com/comino/flight/ui/widgets/charts/line/LineChartWidget.java

@@ -557,11 +557,20 @@ private void initialize() {
 
 
 		scroll.addListener((v, ov, nv) -> {
-			current_x0_pt =  dataService.calculateX0IndexByFactor(nv.floatValue());		
-			updateRequest();
 
-			if(!dataService.isCollecting() && !dataService.isReplaying() && !state.getConnectedProperty().get()) {
-				dataService.setCurrent(dataService.calculateX1IndexByFactor(nv.floatValue())-1);
+			int x1 =  dataService.calculateIndexByFactor(nv.floatValue())+1;	
+			if(x1 < (timeFrame.get() * 1000 / dataService.getCollectorInterval_ms())) {
+				current_x1_pt = x1;
+				current_x0_pt = 0;
+				updateGraph(true,x1);
+			}	 
+			else {
+				current_x0_pt = dataService.calculateX0Index(x1);
+				updateGraph(true,0);
+			}
+
+			if(!dataService.isCollecting() && !dataService.isReplaying() && !state.getConnectedProperty().get() ) {
+				dataService.setCurrent(x1);
 			}
 		});
 

MAVGCL/src/main/java/com/comino/flight/ui/widgets/charts/xy/XYChartWidget.java

@@ -596,8 +596,20 @@ public void handle(MouseEvent click) {
 		corr_zero.setSelected(prefs.getBoolean(MAVPreferences.XYCHART_OFFSET, false));
 
 		scroll.addListener((v, ov, nv) -> {
-			current_x0_pt =  dataService.calculateX0IndexByFactor(nv.floatValue());
-			updateRequest();
+			int x1 =  dataService.calculateIndexByFactor(nv.floatValue())+1;	
+			if(x1 < (timeFrame.get() * 1000 / dataService.getCollectorInterval_ms())) {
+				current_x1_pt = x1;
+				current_x0_pt = 0;
+				updateGraph(true,x1);
+			}	 
+			else {
+				current_x0_pt = dataService.calculateX0Index(x1);
+				updateGraph(true,0);
+			}
+
+			if(!dataService.isCollecting() && !dataService.isReplaying() && !state.getConnectedProperty().get() ) {
+				dataService.setCurrent(x1);
+			}
 		});
 
 		replay.addListener((v, ov, nv) -> {