Added display of person bookmarks in tree diagrams (fix #508)

Serg-Norseman · Oct 22, 2023 · 3adc480 · 3adc480
1 parent 252b2fb
commit 3adc480
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 2 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>28.10.2023 [v2.28.0 &amp; v3.4.0]</b><ul>
+            <li>Added display of person bookmarks in tree diagrams.
             <li>Added localization into Dutch [Leo Krap].
             <li>Added separate options for selecting the numbering of ascending and descending pedigrees.
             <li>Added indistinct matching feature to record filtering.

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

diff --git a/projects/GKCore/GKCore.csproj b/projects/GKCore/GKCore.csproj
@@ -609,6 +609,7 @@
     <EmbeddedResource Include="Resources\btn_volume_mute.png" />
     <EmbeddedResource Include="Resources\pnl_video.png" />
     <EmbeddedResource Include="Resources\btn_info.gif" />
+    <EmbeddedResource Include="Resources\tg_bookmark.png" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/projects/GKCore/GKCore.nstd.csproj b/projects/GKCore/GKCore.nstd.csproj
@@ -152,5 +152,6 @@
         <EmbeddedResource Include="Resources\btn_volume_mute.png" />
         <EmbeddedResource Include="Resources\pnl_video.png" />
         <EmbeddedResource Include="Resources\btn_info.gif" />
+        <EmbeddedResource Include="Resources\tg_bookmark.png" />
     </ItemGroup>
 </Project>
diff --git a/projects/GKCore/GKCore/Charts/TreeChartModel.cs b/projects/GKCore/GKCore/Charts/TreeChartModel.cs
@@ -88,6 +88,7 @@ public class TreeChartModel : ChartModel
 #else
         private TreeChartDesk fDesk;
 #endif
+        private IImage fBookmarkPic;
         private IImage fExpPic;
         private IImage fInfoPic;
         private IImage fPersExpPic;
@@ -316,6 +317,7 @@ private void InitSigns(ChartRenderer renderer)
                 fExpPic = PrepareImage(renderer, "btn_expand.gif", true);
                 fPersExpPic = PrepareImage(renderer, "btn_expand2.gif", true);
                 fInfoPic = PrepareImage(renderer, "btn_info.gif", true);
+                fBookmarkPic = PrepareImage(renderer, "tg_bookmark.png", false);
             } catch (Exception ex) {
                 Logger.WriteError("TreeChartModel.InitSigns()", ex);
             }
@@ -339,6 +341,7 @@ public void Assign(TreeChartModel sourceModel)
             fDottedLinePen = sourceModel.fDottedLinePen;
             fDottedDecorativeLinePen = sourceModel.fDottedDecorativeLinePen;
             fDrawFont = sourceModel.fDrawFont;
+            fBookmarkPic = sourceModel.fBookmarkPic;
             fExpPic = sourceModel.fExpPic;
             fPersExpPic = sourceModel.fPersExpPic;
             fInfoPic = sourceModel.fInfoPic;
@@ -1806,10 +1809,15 @@ private void DrawPerson(TreeChartPerson person, ChartDrawMode drawMode)
                         fRenderer.DrawImage(fPersExpPic, expRt.Left, expRt.Top, string.Empty);
                     }
 
+                    ExtRect infoRt = GetInfoRect(brt);
+
                     if (person.Selected) {
-                        ExtRect infoRt = GetInfoRect(brt);
                         fRenderer.DrawImage(fInfoPic, infoRt.Left, infoRt.Top, string.Empty);
                     }
+
+                    if (person.HasFlag(PersonFlag.pfBookmark)) {
+                        fRenderer.DrawImage(fBookmarkPic, infoRt.Left - 16, infoRt.Top, string.Empty);
+                    }
                 }
             } catch (Exception ex) {
                 Logger.WriteError("TreeChartModel.DrawPerson()", ex);

diff --git a/projects/GKCore/GKCore/Charts/TreeChartPerson.cs b/projects/GKCore/GKCore/Charts/TreeChartPerson.cs
@@ -52,7 +52,7 @@ public enum PersonFlag
         pfHasInvAnc, pfHasInvDesc, // invisible flags
         pfSpecialMark, // debug flag for special goals
         pfOutsideKin, pfCanExpand, pfAdopted,
-        pfRootSpouse
+        pfRootSpouse, pfBookmark
     }
 
     /// <summary>
@@ -375,6 +375,8 @@ public void BuildBy(GDMIndividualRecord iRec)
                         }
                     }
 
+                    SetFlag(PersonFlag.pfBookmark, iRec.Bookmark);
+
                     CertaintyAssessment = GKUtils.GetCertaintyAssessment(iRec);
                 } else {
                     fSurname = "";

diff --git a/projects/GKCore/Resources/tg_bookmark.png b/projects/GKCore/Resources/tg_bookmark.png