Change scale values to show most recent rather than average

Author: parg

uis/src/com/biglybt/ui/swt/components/graphics/MultiPlotGraphic.java

@@ -940,29 +940,36 @@ public void handleEvent(Event e) {
 
 							if ( show_label ){
 
-								int	average_val = computeAverage( chartIdx, currentPosition - 6 );
+								int position = currentPosition-1;
+								
+								if ( position < 0 ){
 
-								int average_mod = average_val;
+									position += maxEntries;
+								}
+								
+								int	last_val = all_values[chartIdx][ position ];
 
-								if ( average_mod > max ){
+								int last_mod = last_val;
 
-									average_mod = max;
+								if ( last_mod > max ){
+
+									last_mod = max;
 								}
 
-								int height = bounds.height - scale.getScaledValue( average_mod) - 2;
+								int height = bounds.height - scale.getScaledValue( last_mod) - 2;
 
 								gcImage.setAlpha( 255 );
 
 								gcImage.setForeground( source.getLineColor());
 
-								gcImage.drawText(formater.format( average_val ), bounds.width - 65, height - 12, SWT.DRAW_TRANSPARENT);
+								gcImage.drawText(formater.format( last_mod ), bounds.width - 65, height - 12, SWT.DRAW_TRANSPARENT);
 
 								Color bg = gcImage.getBackground();
 
 								if (( style & ValueSource.STYLE_DOWN ) != 0 ){
 
 									int	x = bounds.width - 72;
-									int y = height - 12;
+									int y = height-3;
 
 									gcImage.setBackground( source.getLineColor());
 
@@ -973,7 +980,7 @@ public void handleEvent(Event e) {
 								}else  if (( style & ValueSource.STYLE_UP ) != 0 ){
 
 									int	x = bounds.width - 72;
-									int y = height - 12;
+									int y = height - 3;
 
 									gcImage.setBackground( source.getLineColor());
 
@@ -984,7 +991,7 @@ public void handleEvent(Event e) {
 								}else  if (( style & ValueSource.STYLE_BLOB ) != 0 ){
 
 									int	x = bounds.width - 72;
-									int y = height - 12;
+									int y = height - 3;
 
 									gcImage.setBackground( source.getLineColor());
 
@@ -1012,23 +1019,6 @@ public void handleEvent(Event e) {
 		}
 	}
 
-	private int
-	computeAverage(
-		int	line_index,
-		int position )
-	{
-		long sum = 0;
-		for(int i = -5 ; i < 6 ; i++) {
-			int pos = position + i;
-			pos %= maxEntries;
-			if (pos < 0)
-				pos += maxEntries;
-			sum += all_values[line_index][pos];
-		}
-		return(int)(sum / 11);
-
-	}
-
 	@Override
 	public void
 	parameterChanged(

uis/src/com/biglybt/ui/swt/components/graphics/PingGraphic.java

@@ -290,6 +290,7 @@ protected void drawChart(boolean sizeChanged) {
 
       scale.setMax(max);
 
+      int lastAverage = -1;
       for(int x = 0 ; x < bounds.width - 71 ; x++) {
         int position = currentPosition - x -1;
         if(position < 0)
@@ -302,8 +303,8 @@ protected void drawChart(boolean sizeChanged) {
 	        int oldTargetValue 	= oldTargetValues[z];
 
 	        if ( x > 1 ){
-		        	int h1 = bounds.height - scale.getScaledValue(targetValue) - 2;
-		        	int h2 = bounds.height - scale.getScaledValue(oldTargetValue) - 2;
+		        int h1 = bounds.height - scale.getScaledValue(targetValue) - 2;
+		        int h2 = bounds.height - scale.getScaledValue(oldTargetValue) - 2;
 		        gcImage.setForeground( externalAverage?colors[z]: (z <= 2 ? colors[z+1] : colors[3]));
 	            gcImage.drawLine(xDraw,h1,xDraw+1, h2);
 	        }
@@ -318,14 +319,17 @@ protected void drawChart(boolean sizeChanged) {
           gcImage.setForeground(colors[COLOR_AVERAGE]);
           gcImage.setLineWidth(2);
           gcImage.drawLine(xDraw,h1,xDraw+1, h2);
+          if ( lastAverage == -1 ){
+         	  lastAverage = oldAverage;
+          }
         }
         oldAverage = average;
       }
 
-      if(nbValues > 0) {
-        int height = bounds.height - scale.getScaledValue(computeAverage(currentPosition-6)) - 2;
+      if(lastAverage >= 0) {
+        int height = bounds.height - scale.getScaledValue(lastAverage) - 2;
         gcImage.setForeground(colors[COLOR_AVERAGE]);
-        gcImage.drawText(formater.format(computeAverage(currentPosition-6)),bounds.width - 65,height - 12,true);
+        gcImage.drawText(formater.format(lastAverage),bounds.width - 65,height - 12,true);
       }
 
       gcImage.dispose();

uis/src/com/biglybt/ui/swt/components/graphics/SpeedGraphic.java

@@ -383,6 +383,8 @@ protected void drawChart(boolean sizeChanged) {
 
 			int last_xpos = -1;
 
+		    int lastAverage = -1;
+
 			for (int x = 0; x < bounds.width - 71; x++){
 
 				int position = currentPosition - x - 1;
@@ -492,15 +494,17 @@ protected void drawChart(boolean sizeChanged) {
 					int h2 = bounds.height - scale.getScaledValue(oldAverage) - 2;
 					gcImage.setForeground(colors[COLOR_AVERAGE]);
 					gcImage.drawLine(xDraw, h1, xDraw + 1, h2);
+					if ( lastAverage == -1 ){
+						lastAverage = oldAverage;
+					}
 				}
 				oldAverage = average;
 			}
 
-			if (nbValues > 0)
-			{
-				int height = bounds.height - scale.getScaledValue(computeAverage(currentPosition - 6)) - 2;
+			if (lastAverage >= 0){
+				int height = bounds.height - scale.getScaledValue(lastAverage) - 2;
 				gcImage.setForeground(colors[COLOR_AVERAGE]);
-				gcImage.drawText(formater.format(computeAverage(currentPosition - 6)), bounds.width - 65, height - 12, true);
+				gcImage.drawText(formater.format(lastAverage), bounds.width - 65, height - 12, true);
 			}
 
 		} catch (Exception e)