[chronojump] Fixed bug on cairo graphs since last commits
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed bug on cairo graphs since last commits
- Date: Fri, 9 Oct 2020 15:17:17 +0000 (UTC)
commit 46d9a0b9e259e70e932eb38967ead9a716634a1a
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Oct 9 17:15:42 2020 +0200
Fixed bug on cairo graphs since last commits
src/gui/app1/jumpsDjOptimalFall.cs | 4 ++--
src/gui/app1/jumpsEvolution.cs | 4 ++--
src/gui/app1/jumpsRjFatigue.cs | 4 ++--
src/gui/app1/jumpsWeightFVProfile.cs | 4 ++--
src/gui/cairo/jumpsDjOptimalFall.cs | 2 +-
src/gui/cairo/jumpsEvolution.cs | 2 +-
src/gui/cairo/jumpsRjFatigue.cs | 2 +-
src/gui/cairo/jumpsWeightFVProfile.cs | 2 +-
src/gui/cairo/xy.cs | 3 ++-
9 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/src/gui/app1/jumpsDjOptimalFall.cs b/src/gui/app1/jumpsDjOptimalFall.cs
index f400ed43..7d5c3328 100644
--- a/src/gui/app1/jumpsDjOptimalFall.cs
+++ b/src/gui/app1/jumpsDjOptimalFall.cs
@@ -98,7 +98,7 @@ public partial class ChronoJumpWindow
jumpsDjOptimalFall.GetMaxValue(),
drawingarea_jumps_dj_optimal_fall,
currentPerson.Name, jumpType, currentSession.DateShort);
- jumpsDjOptimalFallGraph.Do();
+ jumpsDjOptimalFallGraph.Do(preferences.fontType.ToString());
button_jumps_dj_optimal_fall_save_image.Sensitive = true;
}
@@ -125,7 +125,7 @@ public partial class ChronoJumpWindow
LogB.Information("Button press done!");
//redo the graph to delete previous rectangles of previous mouse clicks
- jumpsDjOptimalFallGraph.Do();
+ jumpsDjOptimalFallGraph.Do(preferences.fontType.ToString());
LogB.Information(string.Format("Mouse X: {0}; Mouse Y: {1}", args.Event.X, args.Event.Y));
jumpsDjOptimalFallGraph.CalculateAndWriteRealXY(args.Event.X, args.Event.Y);
}
diff --git a/src/gui/app1/jumpsEvolution.cs b/src/gui/app1/jumpsEvolution.cs
index d1efd2b4..fa2d66e0 100644
--- a/src/gui/app1/jumpsEvolution.cs
+++ b/src/gui/app1/jumpsEvolution.cs
@@ -105,7 +105,7 @@ public partial class ChronoJumpWindow
jumpsEvolution.Intercept,
drawingarea_jumps_evolution,
currentPerson.Name, jumpType, currentSession.DateShort);
- jumpsEvolutionGraph.Do();
+ jumpsEvolutionGraph.Do(preferences.fontType.ToString());
button_jumps_evolution_save_image.Sensitive = true;
}
@@ -129,7 +129,7 @@ public partial class ChronoJumpWindow
LogB.Information("Button press done!");
//redo the graph to delete previous rectangles of previous mouse clicks
- jumpsEvolutionGraph.Do();
+ jumpsEvolutionGraph.Do(preferences.fontType.ToString());
LogB.Information(string.Format("Mouse X: {0}; Mouse Y: {1}", args.Event.X, args.Event.Y));
jumpsEvolutionGraph.CalculateAndWriteRealXY(args.Event.X, args.Event.Y);
}
diff --git a/src/gui/app1/jumpsRjFatigue.cs b/src/gui/app1/jumpsRjFatigue.cs
index 7e8c8a8f..2780df01 100644
--- a/src/gui/app1/jumpsRjFatigue.cs
+++ b/src/gui/app1/jumpsRjFatigue.cs
@@ -191,7 +191,7 @@ public partial class ChronoJumpWindow
jumpDateStr,
radio_jumps_rj_fatigue_heights.Active,
divideIn);
- jumpsRjFatigueGraph.Do();
+ jumpsRjFatigueGraph.Do(preferences.fontType.ToString());
button_jumps_rj_fatigue_save_image.Sensitive = true;
}
@@ -218,7 +218,7 @@ public partial class ChronoJumpWindow
LogB.Information("Button press done!");
//redo the graph to delete previous rectangles of previous mouse clicks
- jumpsRjFatigueGraph.Do();
+ jumpsRjFatigueGraph.Do(preferences.fontType.ToString());
LogB.Information(string.Format("Mouse X: {0}; Mouse Y: {1}", args.Event.X, args.Event.Y));
jumpsRjFatigueGraph.CalculateAndWriteRealXY(args.Event.X, args.Event.Y);
}
diff --git a/src/gui/app1/jumpsWeightFVProfile.cs b/src/gui/app1/jumpsWeightFVProfile.cs
index d04b55c3..77a2b9cc 100644
--- a/src/gui/app1/jumpsWeightFVProfile.cs
+++ b/src/gui/app1/jumpsWeightFVProfile.cs
@@ -133,7 +133,7 @@ public partial class ChronoJumpWindow
currentSession.DateShort,
radio_jumps_weight_fv_profile_show_full_graph.Active,
errorAtStart);
- jumpsWeightFVProfileGraph.Do();
+ jumpsWeightFVProfileGraph.Do(preferences.fontType.ToString());
button_jumps_weight_fv_profile_save_image.Sensitive = true;
}
@@ -186,7 +186,7 @@ public partial class ChronoJumpWindow
LogB.Information("Button press done!");
//redo the graph to delete previous rectangles of previous mouse clicks
- jumpsWeightFVProfileGraph.Do();
+ jumpsWeightFVProfileGraph.Do(preferences.fontType.ToString());
LogB.Information(string.Format("Mouse X: {0}; Mouse Y: {1}", args.Event.X, args.Event.Y));
//LogB.Information(string.Format("Real X: {0}; Real Y: {1}",
// jumpsWeightFVProfileGraph.CalculateAndWriteRealXY(args.Event.X,
args.Event.Y)));
diff --git a/src/gui/cairo/jumpsDjOptimalFall.cs b/src/gui/cairo/jumpsDjOptimalFall.cs
index bd3fe11a..f3dfda47 100644
--- a/src/gui/cairo/jumpsDjOptimalFall.cs
+++ b/src/gui/cairo/jumpsDjOptimalFall.cs
@@ -72,7 +72,7 @@ public class JumpsDjOptimalFallGraph : CairoXY
area.AddEvents((int) Gdk.EventMask.ButtonPressMask);
}
- public override void Do()
+ public override void Do(string font)
{
LogB.Information("at JumpsDjOptimalFallGraph.Do");
initGraph(font);
diff --git a/src/gui/cairo/jumpsEvolution.cs b/src/gui/cairo/jumpsEvolution.cs
index 6131b703..c8c78672 100644
--- a/src/gui/cairo/jumpsEvolution.cs
+++ b/src/gui/cairo/jumpsEvolution.cs
@@ -61,7 +61,7 @@ public class JumpsEvolutionGraph : CairoXY
yUnits = "cm";
}
- public override void Do()
+ public override void Do (string font)
{
LogB.Information("at JumpsEvolutionGraph.Do");
initGraph(font);
diff --git a/src/gui/cairo/jumpsRjFatigue.cs b/src/gui/cairo/jumpsRjFatigue.cs
index 5079eb82..4471dab1 100644
--- a/src/gui/cairo/jumpsRjFatigue.cs
+++ b/src/gui/cairo/jumpsRjFatigue.cs
@@ -69,7 +69,7 @@ public class JumpsRjFatigueGraph : CairoXY
}
}
- public override void Do()
+ public override void Do(string font)
{
LogB.Information("at JumpsRjFatigueGraph.Do");
initGraph(font);
diff --git a/src/gui/cairo/jumpsWeightFVProfile.cs b/src/gui/cairo/jumpsWeightFVProfile.cs
index 5169cfa4..878ebac3 100644
--- a/src/gui/cairo/jumpsWeightFVProfile.cs
+++ b/src/gui/cairo/jumpsWeightFVProfile.cs
@@ -123,7 +123,7 @@ public class JumpsWeightFVProfileGraph : CairoXY
printText(area.Allocation.Width /2, area.Allocation.Height /2, 24, textHeight, message, g,
alignTypes.CENTER);
}
- public override void Do()
+ public override void Do(string font)
{
LogB.Information("at JumpsWeightFVProfileGraph.Do");
initGraph(font);
diff --git a/src/gui/cairo/xy.cs b/src/gui/cairo/xy.cs
index 111e0d4f..036832e4 100644
--- a/src/gui/cairo/xy.cs
+++ b/src/gui/cairo/xy.cs
@@ -101,11 +101,12 @@ public abstract class CairoXY
protected string jumpTypeStr = Catalog.GetString("Jump type:");
protected string font;
- public abstract void Do();
+ public abstract void Do(string font);
protected void initGraph(string font)
{
this.font = font;
+ LogB.Information("Font: " + font);
totalMargins = outerMargins + innerMargins;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]