Added mode for displaying parents' ages in tree diagrams (fix #600)

Serg-Norseman · Oct 24, 2024 · b2c201f · b2c201f
1 parent 852d81b
commit b2c201f
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 4 deletions.
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Added mode for displaying parents' ages in tree diagrams.
             <li>Added an option to simplify the form of woman single surnames in extended mode (output without brackets if there are no other surnames).
             <li>Added protection against problems with folders in Windows if the file name has a space before the extension.
             <li>Added statistics type on parents' ages at child's birth.

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Добавлен режим отображения возрастов родителей в диаграммах деревьев.
             <li>Добавлена опция упрощения формы единственных фамилий женщин в расширенном режиме (вывод без скобок, если других фамилий нет).
             <li>Добавлена защита от проблем с папками в Windows, если в имени файла перед расширением есть пробел.
             <li>Добавлен тип статистики по возрастам родителей при рождении ребенка.

diff --git a/projects/GKCore/GKCore/Charts/TreeChartModel.cs b/projects/GKCore/GKCore/Charts/TreeChartModel.cs
@@ -130,6 +130,7 @@ public class TreeChartModel : ChartModel
         private float fPicScale;
         private IImage[] fSignsPic;
         private IBrush fSolidBlack;
+        private IBrush fSolidF, fSolidM;
         private int fSpouseDistance;
         private ITimer fTimer;
         private GDMTree fTree;
@@ -420,6 +421,8 @@ public void Assign(TreeChartModel sourceModel)
             fScale = sourceModel.fScale;
             fSignsPic = sourceModel.fSignsPic;
             fSolidBlack = sourceModel.fSolidBlack;
+            fSolidF = sourceModel.fSolidF;
+            fSolidM = sourceModel.fSolidM;
             fSpouseDistance = sourceModel.fSpouseDistance;
             fTree = sourceModel.fTree;
         }
@@ -526,6 +529,8 @@ private void VisitAncestors(TreeChartPerson personNode, bool dupFlag)
                             personNode.Mother = VisitParent(personNode, iMother, personNode.Generation - 1, isDup, divorced, adopted, commonLaw);
                         }
 
+                        personNode.SetParents();
+
                         if (personNode.Father != null && personNode.Mother != null && fOptions.Kinship) {
                             fGraph.AddRelation(personNode.Father.Node, personNode.Mother.Node, RelationKind.rkSpouse, RelationKind.rkSpouse, (!commonLaw ? RelationExt.None : RelationExt.CommonLaw));
                         }
@@ -821,6 +826,7 @@ private TreeChartPerson VisitPerson(TreeChartPerson parent, GDMIndividualRecord
                             child.Father = ft;
                             child.Mother = mt;
                             child.SetFlag(descFlag);
+                            child.SetParents();
 
                             GDMChildToFamilyLink childLink = childRec.FindChildToFamilyLink(family);
                             var adopted = (childLink != null && (childLink.PedigreeLinkageType == GDMPedigreeLinkageType.plAdopted));
@@ -1633,6 +1639,8 @@ public void InitGraphics()
             fLineDottedDecorativePen = fRenderer.CreatePen(clrDecor, 1f, new float[] {4.0F, 2.0F});
             fLineDottedSelectedPen = fRenderer.CreatePen(clrLine, 2.4f, new float[] { 4.0F, 2.0F });
             fSolidBlack = fRenderer.CreateBrush(fClrBlack);
+            fSolidF = fRenderer.CreateBrush(ChartRenderer.GetColor(BSDColors.Red));
+            fSolidM = fRenderer.CreateBrush(ChartRenderer.GetColor(BSDColors.Blue));
 
             var clrGreen = ChartRenderer.GetColor(BSDColors.ForestGreen);
             fLineTMSYPen = fRenderer.CreatePen(clrGreen, 2.4f, new float[] { 4.0F, 2.0F });
@@ -1649,6 +1657,8 @@ private void DoneGraphics()
             if (fLineDottedDecorativePen != null) fLineDottedDecorativePen.Dispose();
             if (fLineDottedSelectedPen != null) fLineDottedSelectedPen.Dispose();
             if (fSolidBlack != null) fSolidBlack.Dispose();
+            if (fSolidF != null) fSolidF.Dispose();
+            if (fSolidM != null) fSolidM.Dispose();
         }
 
         public ExtRect GetExpanderRect(ExtRect personRect)
@@ -1936,6 +1946,18 @@ private bool IsDottedLines(TreeChartPerson person)
             return (person != null && person.HasFlag(PersonFlag.pfAdopted) && fOptions.DottedLinesOfAdoptedChildren);
         }
 
+        private void DrawParentAges(TreeChartPerson person, int pY, int crY)
+        {
+            if (!fOptions.ParentAges || (string.IsNullOrEmpty(person.FatherAge) && string.IsNullOrEmpty(person.MotherAge)))
+                return;
+
+            var tH = (int)fRenderer.GetTextSize("0", fDrawFont).Height;
+            int aY = (!fOptions.InvertedTree) ? crY + (pY - crY - tH) / 2 : pY + (crY - pY - tH) / 2;
+
+            DrawText(person.FatherAge, person.PtX - 4, aY, 3, fSolidM);
+            DrawText(person.MotherAge, person.PtX + 4, aY, 2, fSolidF);
+        }
+
         private void DrawAncestors(TreeChartPerson person, ChartDrawMode drawMode, bool isTracked)
         {
             if (person.IsCollapsed || (person.Father == null && person.Mother == null)) {
@@ -1955,18 +1977,21 @@ private void DrawAncestors(TreeChartPerson person, ChartDrawMode drawMode, bool
             Draw(person.Father, TreeChartKind.ckAncestors, drawMode);
             Draw(person.Mother, TreeChartKind.ckAncestors, drawMode);
 
-            int crY, parY;
+            int crY, parY, pY;
             if (!fOptions.InvertedTree) {
+                pY = person.PtY;
                 crY = person.PtY - fLevelDistance / 2;
                 parY = (person.Father != null) ? person.Father.PtY + person.Father.Height : person.Mother.PtY + person.Mother.Height;
             } else {
+                pY = person.PtY + person.Height;
                 crY = person.PtY + person.Height + fLevelDistance / 2;
                 parY = (person.Father != null) ? person.Father.PtY : person.Mother.PtY;
             }
 
             bool dotted = IsDottedLines(person);
 
-            DrawLine(person.PtX, crY, person.PtX, person.PtY, dotted, isTrackedAncestors, isMatchedFather || isMatchedMother); // v
+            DrawLine(person.PtX, crY, person.PtX, pY, dotted, isTrackedAncestors, isMatchedFather || isMatchedMother); // v
+            DrawParentAges(person, pY, crY);
 
             string marrDate = null;
 
@@ -1995,6 +2020,11 @@ private void DrawAncestors(TreeChartPerson person, ChartDrawMode drawMode, bool
         }
 
         private void DrawText(string text, float x, float y, int quad, bool offset = true)
+        {
+            DrawText(text, x, y, quad, fSolidBlack, offset);
+        }
+
+        private void DrawText(string text, float x, float y, int quad, IBrush brush, bool offset = true)
         {
             if (string.IsNullOrEmpty(text))
                 return;
@@ -2021,7 +2051,7 @@ private void DrawText(string text, float x, float y, int quad, bool offset = tru
                     break;
             }
 
-            fRenderer.DrawString(text, fDrawFont, fSolidBlack, x, y);
+            fRenderer.DrawString(text, fDrawFont, brush, x, y);
         }
 
         private void DrawDescendants(TreeChartPerson person, ChartDrawMode drawMode, bool isTracked)
@@ -2138,6 +2168,7 @@ private void DrawDescendants(TreeChartPerson person, ChartDrawMode drawMode, boo
                     }
 
                     DrawLine(child.PtX, chY, child.PtX, crY, dotted, isTrackedChild, isMatchedChild); // v
+                    DrawParentAges(child, chY, crY);
                 }
 
                 // vertical line from the horizontal junction of spouses to the horizontal junction of children

diff --git a/projects/GKCore/GKCore/Charts/TreeChartPerson.cs b/projects/GKCore/GKCore/Charts/TreeChartPerson.cs
@@ -23,6 +23,7 @@
 using BSLib;
 using BSLib.DataViz.SmartGraph;
 using GDModel;
+using GDModel.Providers.GEDCOM;
 using GKCore.Design.Graphics;
 using GKCore.Import;
 using GKCore.Options;
@@ -92,6 +93,8 @@ public class TreeChartPerson
         public float CertaintyAssessment;
         public TreeChartPerson Father;
         public TreeChartPerson Mother;
+        public string FatherAge;
+        public string MotherAge;
         public int Generation;
         public string Kinship;
         public string[] Lines;
@@ -413,6 +416,39 @@ public void BuildBy(GDMIndividualRecord iRec)
             }
         }
 
+        public void SetParents()
+        {
+            if (!fModel.Options.ParentAges || fRec == null) return;
+
+            FatherAge = string.Empty;
+            MotherAge = string.Empty;
+
+            GDMCustomEvent evt = fRec.FindEvent(GEDCOMTagName.BIRT);
+            if (evt == null) return;
+            int childYear = evt.GetChronologicalYear();
+            if (childYear == 0) return;
+
+            if (Father != null && Father.Rec != null) {
+                evt = Father.Rec.FindEvent(GEDCOMTagName.BIRT);
+                if (evt != null) {
+                    int parentYear = evt.GetChronologicalYear();
+                    if (parentYear != 0) {
+                        FatherAge = (childYear - parentYear).ToString();
+                    }
+                }
+            }
+
+            if (Mother != null && Mother.Rec != null) {
+                evt = Mother.Rec.FindEvent(GEDCOMTagName.BIRT);
+                if (evt != null) {
+                    int parentYear = evt.GetChronologicalYear();
+                    if (parentYear != 0) {
+                        MotherAge = (childYear - parentYear).ToString();
+                    }
+                }
+            }
+        }
+
         internal static int InitInfoSize(TreeChartOptions options)
         {
             int lines = 0;

diff --git a/projects/GKCore/GKCore/Controllers/TreeChartWinController.cs b/projects/GKCore/GKCore/Controllers/TreeChartWinController.cs
@@ -386,6 +386,7 @@ public override void SetLocale()
             GetControl<IMenuItem>("miTrackSelectedLines").Text = LangMan.LS(LSID.TrackSelectedLines);
             GetControl<IMenuItem>("miTrackMatchedSources").Text = LangMan.LS(LSID.TrackMatchedSources);
             GetControl<IMenuItem>("miHideDescSpouses").Text = LangMan.LS(LSID.HideDescSpouses);
+            GetControl<IMenuItem>("miParentAges").Text = LangMan.LS(LSID.ParentsAge);
 
             SetToolTip("tbModes", LangMan.LS(LSID.ModesTip));
             SetToolTip("tbImageSave", LangMan.LS(LSID.ImageSaveTip));

diff --git a/projects/GKCore/GKCore/Options/TreeChartOptions.cs b/projects/GKCore/GKCore/Options/TreeChartOptions.cs
@@ -79,6 +79,7 @@ public sealed class TreeChartOptions : IOptions
         public bool TrackSelectedLines;
         public bool TrackMatchedSources;
         public bool FullNameOnOneLine;
+        public bool ParentAges;
 
         public IColor MaleColor;
         public IColor FemaleColor;
@@ -177,6 +178,7 @@ public void ResetDefaults()
             UseExtraControls = true;
             UseInlineImagesInSvg = true;
             ExtendedTree = false;
+            ParentAges = false;
         }
 
         public void Assign(IOptions source)
@@ -240,6 +242,7 @@ public void Assign(IOptions source)
             UseExtraControls = srcOptions.UseExtraControls;
             UseInlineImagesInSvg = srcOptions.UseInlineImagesInSvg;
             ExtendedTree = srcOptions.ExtendedTree;
+            ParentAges = srcOptions.ParentAges;
         }
 
         public void LoadFromFile(IniFile iniFile)
@@ -310,6 +313,8 @@ public void LoadFromFile(IniFile iniFile)
             TrackSelectedLines = iniFile.ReadBool("Chart", "TrackSelectedLines", true);
             TrackMatchedSources = iniFile.ReadBool("Chart", "TrackMatchedSources", false);
             FullNameOnOneLine = iniFile.ReadBool("Chart", "FullNameOnOneLine", false);
+
+            ParentAges = iniFile.ReadBool("Chart", "ParentAges", false);
         }
 
         public void SaveToFile(IniFile iniFile)
@@ -380,6 +385,8 @@ public void SaveToFile(IniFile iniFile)
             iniFile.WriteBool("Chart", "TrackSelectedLines", TrackSelectedLines);
             iniFile.WriteBool("Chart", "TrackMatchedSources", TrackMatchedSources);
             iniFile.WriteBool("Chart", "FullNameOnOneLine", FullNameOnOneLine);
+
+            iniFile.WriteBool("Chart", "ParentAges", ParentAges);
         }
     }
 }
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/TreeChartWin.Designer.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/TreeChartWin.Designer.cs
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/TreeChartWin.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/TreeChartWin.cs
@@ -111,6 +111,8 @@ public TreeChartWin(IBaseWindow baseWin)
 
             miTrackMatchedSources.Checked = fTreeBox.Options.TrackMatchedSources;
 
+            miParentAges.Checked = fTreeBox.Options.ParentAges;
+
             miTraceSelected.Checked = fTreeBox.Options.TraceSelected;
             fTreeBox.TraceSelected = fTreeBox.Options.TraceSelected;
 
@@ -422,6 +424,17 @@ private void miTrackMatchedSources_Click(object sender, EventArgs e)
             fTreeBox.Invalidate();
         }
 
+        private void miParentAges_Click(object sender, EventArgs e)
+        {
+            miParentAges.Checked = !miParentAges.Checked;
+            fTreeBox.Options.ParentAges = miParentAges.Checked;
+            if (fTreeBox.Options.ParentAges) {
+                GenChart();
+            } else {
+                fTreeBox.Invalidate();
+            }
+        }
+
         private void miFillColor_Click(object sender, EventArgs e)
         {
             using (var colorDialog1 = new ColorDialog()) {

diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/TreeChartWin.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/TreeChartWin.cs
@@ -87,6 +87,7 @@ public partial class TreeChartWin : PrintableForm, ITreeChartWin
         private GKDropDownToolItem tbBorders;
         private ContextMenu MenuBorders;
         private CheckMenuItem miHideDescSpouses;
+        private CheckMenuItem miParentAges;
 
 #pragma warning restore CS0169, CS0649, IDE0044, IDE0051
         #endregion
@@ -151,6 +152,8 @@ public TreeChartWin(IBaseWindow baseWin)
 
             miTrackMatchedSources.Checked = fTreeBox.Options.TrackMatchedSources;
 
+            miParentAges.Checked = fTreeBox.Options.ParentAges;
+
             miTraceSelected.Checked = fTreeBox.Options.TraceSelected;
             fTreeBox.TraceSelected = fTreeBox.Options.TraceSelected;
 
@@ -208,6 +211,9 @@ private void InitializeComponent()
             miTrackMatchedSources = new CheckMenuItem();
             miTrackMatchedSources.Click += miTrackMatchedSources_Click;
 
+            miParentAges = new CheckMenuItem();
+            miParentAges.Click += miParentAges_Click;
+
             miFillColor = new ButtonMenuItem();
             miFillColor.Click += miFillColor_Click;
 
@@ -227,6 +233,7 @@ private void InitializeComponent()
                                          miXRefVisible,
                                          miTrackSelectedLines,
                                          miTrackMatchedSources,
+                                         miParentAges,
                                          new SeparatorMenuItem(),
                                          miFillColor,
                                          miFillImage,
@@ -582,6 +589,16 @@ private void miTrackMatchedSources_Click(object sender, EventArgs e)
             fTreeBox.Invalidate();
         }
 
+        private void miParentAges_Click(object sender, EventArgs e)
+        {
+            fTreeBox.Options.ParentAges = miParentAges.Checked;
+            if (fTreeBox.Options.ParentAges) {
+                GenChart();
+            } else {
+                fTreeBox.Invalidate();
+            }
+        }
+
         private void miFillColor_Click(object sender, EventArgs e)
         {
             using (var colorDialog1 = new ColorDialog()) {