[chronojump] CairoPaintBarsPreJumpSimple with correct title and other improvements
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] CairoPaintBarsPreJumpSimple with correct title and other improvements
- Date: Thu, 26 Aug 2021 11:38:54 +0000 (UTC)
commit 99468686b2761ecc3d1103ba40c95d00c4079e2b
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Aug 26 13:38:27 2021 +0200
CairoPaintBarsPreJumpSimple with correct title and other improvements
src/gui/app1/jump.cs | 9 ++++++++-
src/gui/app1/run.cs | 2 +-
src/gui/eventExecute.cs | 23 +++++++++++++----------
3 files changed, 22 insertions(+), 12 deletions(-)
---
diff --git a/src/gui/app1/jump.cs b/src/gui/app1/jump.cs
index d042ef019..06db523db 100644
--- a/src/gui/app1/jump.cs
+++ b/src/gui/app1/jump.cs
@@ -338,8 +338,15 @@ public partial class ChronoJumpWindow
//if(eventGraph.personMAXAtSQLAllSessions > 0 || eventGraph.jumpsAtSQL.Count > 0)
// PrepareJumpSimpleGraph(eventGraph, false); //don't animate
+
+ string personStr = "";
+ if(! radio_contacts_graph_allPersons.Active)
+ personStr = currentPerson.Name;
+
cairoPaintBarsPre = new CairoPaintBarsPreJumpSimple (
- event_execute_drawingarea_cairo, preferences.fontType.ToString(),
current_mode, "title jumps");
+ event_execute_drawingarea_cairo, preferences.fontType.ToString(),
current_mode,
+ typeTemp, personStr, preferences.digitsNumber);
+
cairoPaintBarsPre.StoreEventGraphJumps (eventGraph);
PrepareJumpSimpleGraph(cairoPaintBarsPre.eventGraphJumpsStored, false);
}
diff --git a/src/gui/app1/run.cs b/src/gui/app1/run.cs
index b44167e45..047551a7e 100644
--- a/src/gui/app1/run.cs
+++ b/src/gui/app1/run.cs
@@ -213,7 +213,7 @@ public partial class ChronoJumpWindow
cairoPaintBarsPre = new CairoPaintBarsPreRunSimple (
event_execute_drawingarea_cairo, preferences.fontType.ToString(),
current_mode,
- typeTemp, personStr);
+ typeTemp, personStr, preferences.digitsNumber);
cairoPaintBarsPre.StoreEventGraphRuns (eventGraph);
PrepareRunSimpleGraph(cairoPaintBarsPre.eventGraphRunsStored, false);
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index d6d47e644..3e2e0d7b6 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -3163,13 +3163,15 @@ public abstract class CairoPaintBarsPre
protected string fontStr;
protected Constants.Modes mode;
protected string title;
+ protected int pDN; //preferences.digitsNumber
- protected void initialize(DrawingArea darea, string fontStr, Constants.Modes mode, string title)
+ protected void initialize(DrawingArea darea, string fontStr, Constants.Modes mode, string title, int
pDN)
{
this.darea = darea;
this.fontStr = fontStr;
this.mode = mode;
this.title = title;
+ this.pDN = pDN;
}
public bool ModeMatches (Constants.Modes mode)
@@ -3460,9 +3462,9 @@ public abstract class CairoPaintBarsPre
public class CairoPaintBarsPreJumpSimple : CairoPaintBarsPre
{
- public CairoPaintBarsPreJumpSimple (DrawingArea darea, string fontStr, Constants.Modes mode, string
title)
+ public CairoPaintBarsPreJumpSimple (DrawingArea darea, string fontStr, Constants.Modes mode, string
testName, string personName, int pDN)
{
- initialize (darea, fontStr, mode, title);
+ initialize (darea, fontStr, mode, generateTitle(testName, personName), pDN);
}
public override void StoreEventGraphJumps (PrepareEventGraphJumpSimple eventGraph)
@@ -3549,9 +3551,9 @@ public class CairoPaintBarsPreJumpSimple : CairoPaintBarsPre
public class CairoPaintBarsPreRunSimple : CairoPaintBarsPre
{
- public CairoPaintBarsPreRunSimple (DrawingArea darea, string fontStr, Constants.Modes mode, string
testName, string personName)
+ public CairoPaintBarsPreRunSimple (DrawingArea darea, string fontStr, Constants.Modes mode, string
testName, string personName, int pDN)
{
- initialize (darea, fontStr, mode, generateTitle(testName, personName));
+ initialize (darea, fontStr, mode, generateTitle(testName, personName), pDN);
}
public override void StoreEventGraphRuns (PrepareEventGraphRunSimple eventGraph)
@@ -3591,13 +3593,15 @@ public class CairoPaintBarsPreRunSimple : CairoPaintBarsPre
eventGraphRunsStored.runsAtSQL[i].Description = ""; //to avoid showing
description
}
- string longestWord = findLongestWordCairo (events, eventGraphRunsStored.type == "", "(" +
Catalog.GetString("Simulated") + ")"); // condition for "all runs"
+ string longestWord = findLongestWordCairo (events,
+ eventGraphRunsStored.type == "", "(" + Catalog.GetString("Simulated") + ")");
// condition for "all runs"
int fontHeightForBottomNames = cbjt.GetFontForBottomNames (events, longestWord);
- int maxRowsForText = calculateMaxRowsForTextCairo (events, longestWord.Length,
eventGraphRunsStored.type == "", RunsShowTime); //also adds +1 if simulated
+ int maxRowsForText = calculateMaxRowsForTextCairo (events, longestWord.Length,
+ eventGraphRunsStored.type == "", RunsShowTime); //also adds +1 if simulated
int bottomMargin = cbjt.GetBottomMarginForText (maxRowsForText, fontHeightForBottomNames);
- LogB.Information(string.Format("fontHeightForBottomNames: {0}, bottomMargin: {1}",
fontHeightForBottomNames, bottomMargin));
+ //LogB.Information(string.Format("fontHeightForBottomNames: {0}, bottomMargin: {1}",
fontHeightForBottomNames, bottomMargin));
List<PointF> point_l = new List<PointF>();
List<string> names_l = new List<string>();
@@ -3615,8 +3619,7 @@ public class CairoPaintBarsPreRunSimple : CairoPaintBarsPre
string timeString = "";
if(RunsShowTime)
- //timeString = string.Format("{0} s", Util.TrimDecimals(run.Time,
preferences.digitsNumber));
- timeString = string.Format("{0} s", Util.TrimDecimals(run.Time, 3));
+ timeString = string.Format("{0} s", Util.TrimDecimals(run.Time, pDN));
names_l.Add(createTextBelowBar(
timeString,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]