[chronojump] raceAnalyzer capture tab graphs have better X axis position, values



commit bc7740acd7cffd019e6b859a61d1341ae99ae821
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu May 6 22:13:55 2021 +0200

    raceAnalyzer capture tab graphs have better X axis position, values

 src/gui/cairo/raceAnalyzer.cs | 11 +++++++++++
 src/gui/cairo/xy.cs           | 14 ++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/src/gui/cairo/raceAnalyzer.cs b/src/gui/cairo/raceAnalyzer.cs
index d67fa063..2c68a3ff 100644
--- a/src/gui/cairo/raceAnalyzer.cs
+++ b/src/gui/cairo/raceAnalyzer.cs
@@ -114,6 +114,17 @@ public class CairoGraphRaceAnalyzer : CairoXY
                //doing = false;
        }
 
+       protected override void printXAxisText()
+       {
+               printText(graphWidth - outerMargins, graphHeight -Convert.ToInt32(.25 * outerMargins), 0, 
textHeight, getXAxisLabel(), g, alignTypes.CENTER);
+       }
+       protected override void paintVerticalGridLine(int xtemp, string text)
+       {
+               g.MoveTo(xtemp, graphHeight - outerMargins);
+               g.LineTo(xtemp, outerMargins);
+               printText(xtemp, graphHeight -Convert.ToInt32(.75 * outerMargins), 0, textHeight, text, g, 
alignTypes.CENTER); //TODO: this only for raceAnalyzer
+       }
+
        protected override void writeTitle()
        {
        }
diff --git a/src/gui/cairo/xy.cs b/src/gui/cairo/xy.cs
index 98e7e73e..a2a86665 100644
--- a/src/gui/cairo/xy.cs
+++ b/src/gui/cairo/xy.cs
@@ -355,13 +355,18 @@ public abstract class CairoXY : CairoGeneric
                g.LineTo(graphWidth - outerMargins, graphHeight - outerMargins);
                g.Stroke ();
                printText(2, Convert.ToInt32(outerMargins/2), 0, textHeight, getYAxisLabel(), g, 
alignTypes.LEFT);
-               printText(graphWidth - Convert.ToInt32(outerMargins/2), graphHeight - outerMargins, 0, 
textHeight, getXAxisLabel(), g, alignTypes.LEFT);
-
+               printXAxisText();
                g.Stroke ();
                g.LineWidth = 2;
        }
 
-       private string getXAxisLabel()
+       //this combined with paintVerticalGridLine is different on RaceAnalyzer
+       protected virtual void printXAxisText()
+       {
+               printText(graphWidth - Convert.ToInt32(outerMargins/2), graphHeight - outerMargins, 0, 
textHeight, getXAxisLabel(), g, alignTypes.LEFT);
+       }
+
+       protected string getXAxisLabel()
        {
                return getAxisLabel(xVariable, xUnits);
        }
@@ -728,7 +733,8 @@ public abstract class CairoXY : CairoGeneric
                g.LineTo(graphWidth - outerMargins, ytemp);
                printText(Convert.ToInt32(outerMargins/2), ytemp, 0, textHeight, text, g, alignTypes.CENTER);
        }
-       protected void paintVerticalGridLine(int xtemp, string text)
+       //this combined with printXAxisText is different on RaceAnalyzer
+       protected virtual void paintVerticalGridLine(int xtemp, string text)
        {
                g.MoveTo(xtemp, graphHeight - outerMargins);
                g.LineTo(xtemp, outerMargins);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]