Added the feature to add multiple people in the photo viewing window (f…

…ix #517)
Serg-Norseman · Dec 14, 2023 · 4c53d2f · 4c53d2f
1 parent e90b7ac
commit 4c53d2f
Show file tree

Hide file tree

Showing 16 changed files with 143 additions and 30 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.29.0 &amp; v3.5.0]</b><ul>
+            <li>Added the feature to add multiple people in the photo viewing window.
             <li>Restored the possibility of empty value of residence facts.
             <li>Added localization to Japanese [Takashi Namba (難波鷹史)].
             <li>Fixed encoding detection when reading CSV files [Alex Zaytsev].

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>??.??.2024 [v2.29.0 &amp; v3.5.0]</b><ul>
+            <li>Добавлена возможность присоединять ряд персон в окне просмотра фотографий.
             <li>Восстановлена возможность пустого значения фактов местожительства.
             <li>Добавлена локализация на японский язык [Takashi Namba (難波鷹史)].
             <li>Исправлено определение кодировки при чтении CSV-файлов [Alexander Zaytsev].

diff --git a/projects/GKCore/GKCore.props b/projects/GKCore/GKCore.props
@@ -93,6 +93,7 @@
         <EmbeddedResource Include="Resources\btn_info.gif" />
         <EmbeddedResource Include="Resources\tg_bookmark.png" />
         <EmbeddedResource Include="Resources\btn_circle.png" />
+        <EmbeddedResource Include="Resources\btn_portrait.png" />
     </ItemGroup>
 
 

diff --git a/projects/GKCore/GKCore/Controllers/BaseController.cs b/projects/GKCore/GKCore/Controllers/BaseController.cs
@@ -19,6 +19,7 @@
  */
 
 using System.Threading.Tasks;
+using BSLib;
 using GDModel;
 using GDModel.Providers.GEDCOM;
 using GKCore.Charts;
@@ -1044,6 +1045,30 @@ public static async Task<bool> DeleteFamilyWife(IBaseWindow baseWin, ChangeTrack
             return result;
         }
 
+        public static async Task<bool> SelectPhotoRegion(IView owner, IBaseWindow baseWin, GDMMultimediaRecord mediaRecord, ExtRect region)
+        {
+            var indiRec = await baseWin.Context.SelectPerson(owner, null, TargetMode.tmNone, GDMSex.svUnknown);
+            if (indiRec == null) return false;
+
+            GDMMultimediaLink mmLink = indiRec.GetPrimaryMultimediaLink();
+            if (mmLink == null) {
+                mmLink = indiRec.SetPrimaryMultimediaLink(mediaRecord);
+            } else {
+                mmLink = indiRec.AddMultimedia(mediaRecord);
+            }
+            SetMultimediaLinkRegion(mmLink, region, false);
+
+            return true;
+        }
+
+        public static void SetMultimediaLinkRegion(GDMMultimediaLink mmLink, ExtRect selectionRegion, bool isPrimary)
+        {
+            if (mmLink != null) {
+                mmLink.CutoutPosition.Value = selectionRegion;
+                mmLink.IsPrimaryCutout = isPrimary;
+            }
+        }
+
         public static async Task<bool> SelectPortraitRegion(IView owner, IBaseWindow baseWin, GDMMultimediaLink mmLink)
         {
             bool result;

diff --git a/projects/GKCore/GKCore/Controllers/PortraitSelectDlgController.cs b/projects/GKCore/GKCore/Controllers/PortraitSelectDlgController.cs
@@ -54,15 +54,7 @@ public PortraitSelectDlgController(IPortraitSelectDlg view) : base(view)
         public override bool Accept()
         {
             try {
-                ExtRect selectRegion = fView.ImageCtl.SelectionRegion;
-
-                if (!selectRegion.IsEmpty()) {
-                    fMultimediaLink.IsPrimaryCutout = true;
-                    fMultimediaLink.CutoutPosition.Value = selectRegion;
-                } else {
-                    fMultimediaLink.IsPrimaryCutout = false;
-                    fMultimediaLink.CutoutPosition.Value = ExtRect.CreateEmpty();
-                }
+                BaseController.SetMultimediaLinkRegion(fMultimediaLink, fView.ImageCtl.SelectionRegion, true);
 
                 var uid = fMultimediaLink.GetUID(fBase.Context.Tree);
                 PortraitsCache.Instance.RemoveObsolete(uid);
@@ -82,7 +74,7 @@ public override void UpdateView()
             IImage img = fBase.Context.LoadMediaImage(mmRec, -1, -1, ExtRect.Empty, false);
             if (img == null) return;
 
-            fView.ImageCtl.OpenImage(img);
+            fView.ImageCtl.OpenImage(mmRec, img);
 
             if (fMultimediaLink.IsPrimaryCutout) {
                 fView.ImageCtl.SelectionRegion = fMultimediaLink.CutoutPosition.Value;

diff --git a/projects/GKCore/GKCore/Design/Controls/IImageView.cs b/projects/GKCore/GKCore/Design/Controls/IImageView.cs
@@ -19,20 +19,20 @@
  */
 
 using BSLib;
+using GDModel;
 using GKCore.Design.Graphics;
-using GKCore.Design.Controls;
 
 namespace GKCore.Design.Controls
 {
     /// <summary>
-    /// 
+    /// This control is used only in MediaViewerWin and PortraitSelectDlg.
     /// </summary>
     public interface IImageView : IBaseControl
     {
         ExtRect SelectionRegion { get; set; }
         bool ShowNamedRegionTips { get; set; }
 
         void AddNamedRegion(string name, ExtRect region);
-        void OpenImage(IImage image);
+        void OpenImage(GDMMultimediaRecord mediaRecord, IImage image);
     }
 }
diff --git a/projects/GKCore/Resources/btn_portrait.png b/projects/GKCore/Resources/btn_portrait.png
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/MediaViewerWin.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/MediaViewerWin.cs
@@ -136,7 +136,7 @@ public void SetViewMedia(string mediaFile)
         public void SetViewImage(IImage img)
         {
             var imageCtl = new GKUI.Components.ImageView();
-            imageCtl.OpenImage(img);
+            imageCtl.OpenImage(fController.MultimediaRecord, img);
 
             fController.ProcessPortraits(imageCtl);
 

diff --git a/projects/GKv2/GKComponents/GKUI/Components/ImageBox.cs b/projects/GKv2/GKComponents/GKUI/Components/ImageBox.cs
@@ -66,6 +66,11 @@ public sealed class ImageBox : ScrollablePanel
         /// </summary>
         public event EventHandler ImageChanged;
 
+        /// <summary>
+        ///   Occurs when the SelectionRegion property is changed.
+        /// </summary>
+        public event EventHandler SelectionRegionChanged;
+
         /// <summary>
         ///   Occurs when the Zoom property is changed.
         /// </summary>
@@ -139,6 +144,7 @@ public RectangleF SelectionRegion
                 if (fSelectionRegion != value) {
                     fSelectionRegion = value;
                     Invalidate();
+                    OnSelectionRegionChanged(EventArgs.Empty);
                 }
             }
         }
@@ -681,6 +687,13 @@ private void OnImageChanged(EventArgs e)
                 handler(this, e);
         }
 
+        private void OnSelectionRegionChanged(EventArgs e)
+        {
+            EventHandler handler = SelectionRegionChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
         private void OnZoomChanged(EventArgs e)
         {
             EventHandler handler = ZoomChanged;

diff --git a/projects/GKv2/GKComponents/GKUI/Components/ImageView.cs b/projects/GKv2/GKComponents/GKUI/Components/ImageView.cs
@@ -23,9 +23,12 @@
 using System.Drawing;
 using System.Windows.Forms;
 using BSLib;
+using GDModel;
 using GKCore;
+using GKCore.Controllers;
 using GKCore.Design.Controls;
 using GKCore.Design.Graphics;
+using GKCore.Design.Views;
 using GKCore.Interfaces;
 using GKCore.Types;
 using GKUI.Platform.Handlers;
@@ -34,12 +37,15 @@ namespace GKUI.Components
 {
     public class ImageView : UserControl, ILocalizable, IImageView
     {
+        private GDMMultimediaRecord fMediaRecord;
+
         private ImageBox imageBox;
         private ToolStrip toolStrip;
         private ToolStripComboBox cbZoomLevels;
         private ToolStripButton btnSizeToFit;
         private ToolStripButton btnZoomIn;
         private ToolStripButton btnZoomOut;
+        private ToolStripButton btnPortrait;
 
 
         public List<NamedRegion> NamedRegions
@@ -123,6 +129,14 @@ private void InitializeComponent()
             btnZoomOut.Name = "btnZoomOut";
             btnZoomOut.Click += btnZoomOut_Click;
 
+            btnPortrait = new ToolStripButton();
+            btnPortrait.DisplayStyle = ToolStripItemDisplayStyle.Image;
+            btnPortrait.Image = UIHelper.LoadResourceImage("Resources.btn_portrait.png");
+            btnPortrait.ImageTransparentColor = Color.Magenta;
+            btnPortrait.Name = "btnPortrait";
+            btnPortrait.Click += btnPortrait_Click;
+            btnPortrait.Visible = false;
+
             cbZoomLevels = new ToolStripComboBox();
             cbZoomLevels.DropDownStyle = ComboBoxStyle.DropDownList;
             cbZoomLevels.Name = "zoomLevelsToolStripComboBox";
@@ -136,11 +150,14 @@ private void InitializeComponent()
                                          btnZoomOut,
                                          new ToolStripSeparator(),
                                          cbZoomLevels,
+                                         new ToolStripSeparator(),
+                                         btnPortrait,
                                          new ToolStripSeparator()});
 
             imageBox = new ImageBox();
-            imageBox.SelectionMode = ImageBoxSelectionMode.Zoom;
+            imageBox.SelectionMode = ImageBoxSelectionMode.Rectangle;
             imageBox.ZoomChanged += imageBox_ZoomChanged;
+            imageBox.SelectionRegionChanged += imageBox_SelectionRegionChanged;
             imageBox.Dock = DockStyle.Fill;
 
             Controls.Add(imageBox);
@@ -156,14 +173,15 @@ public void AddNamedRegion(string name, ExtRect region)
             imageBox.NamedRegions.Add(new NamedRegion(name, region));
         }
 
-        public void OpenImage(IImage image)
+        public void OpenImage(GDMMultimediaRecord mediaRecord, IImage image)
         {
             if (image != null) {
+                fMediaRecord = mediaRecord;
                 OpenImage(((ImageHandler)image).Handle);
             }
         }
 
-        public void OpenImage(Image image)
+        private void OpenImage(Image image)
         {
             if (image != null) {
                 imageBox.BeginUpdate();
@@ -209,6 +227,24 @@ private void btnZoomOut_Click(object sender, EventArgs e)
             imageBox.ZoomOut();
         }
 
+        private async void btnPortrait_Click(object sender, EventArgs e)
+        {
+            var mediaWin = ParentForm as IMediaViewerWin;
+            if (mediaWin == null) return;
+
+            var baseWin = mediaWin.OwnerWindow as IBaseWindow;
+            if (baseWin == null) return;
+
+            if (await BaseController.SelectPhotoRegion(mediaWin, baseWin, fMediaRecord, UIHelper.Rt2Rt(imageBox.SelectionRegion))) {
+                imageBox.SelectionRegion = RectangleF.Empty;
+            }
+        }
+
+        private void imageBox_SelectionRegionChanged(object sender, EventArgs e)
+        {
+            btnPortrait.Visible = (ParentForm is IMediaViewerWin && !imageBox.SelectionRegion.IsEmpty);
+        }
+
         private void imageBox_ZoomChanged(object sender, EventArgs e)
         {
             UpdateZoomLevels();

diff --git a/projects/GKv2/GKTestsUI2/GKComponents/ImageViewTests.cs b/projects/GKv2/GKTestsUI2/GKComponents/ImageViewTests.cs
@@ -26,6 +26,7 @@
 using BSLib;
 using GKCore.Design.Graphics;
 using GKTests;
+using GKUI.Platform.Handlers;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 
@@ -61,14 +62,10 @@ public void Dispose()
         public void TestMethod()
         {
             IImage image1 = null;
-            fImageView.OpenImage(image1); // return without exceptions
+            fImageView.OpenImage(null, image1); // return without exceptions
 
-            Image image2 = null;
-            fImageView.OpenImage(image2); // return without exceptions
-
-            Bitmap img = new Bitmap(TestUtils.LoadResourceStream("shaytan_plant.jpg"));
-
-            fImageView.OpenImage(img);
+            image1 = new ImageHandler(new Bitmap(TestUtils.LoadResourceStream("shaytan_plant.jpg")));
+            fImageView.OpenImage(null, image1);
 
             fForm.Show();
 

diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/MediaViewerWin.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/MediaViewerWin.cs
@@ -139,7 +139,7 @@ public void SetViewMedia(string mediaFile)
         public void SetViewImage(IImage img)
         {
             var imageCtl = new GKUI.Components.ImageView();
-            imageCtl.OpenImage(img);
+            imageCtl.OpenImage(fController.MultimediaRecord, img);
 
             fController.ProcessPortraits(imageCtl);
 

diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/SlideshowWin.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/SlideshowWin.cs
@@ -60,6 +60,8 @@ public SlideshowWin(IBaseWindow baseWin)
             // while using GKButtonToolItem
             tbStart.Image = UIHelper.LoadResourceImage("Resources.btn_start.gif");
 
+            fImageCtl.SelectionMode = ImageBoxSelectionMode.Zoom;
+
             fController = new SlideshowController(this);
             fController.Init(baseWin);
             fController.LoadList();

diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/SlideshowWin.xeto b/projects/GKv3/GEDKeeper3/GKUI/Forms/SlideshowWin.xeto
@@ -13,6 +13,6 @@
     </ToolBar>
   </Form.ToolBar>
 
-  <components:ImageBox x:Name="fImageCtl" SelectionMode="Zoom" Size="780, 560" />
+  <components:ImageBox x:Name="fImageCtl" Size="780, 560" />
 
 </Form>
diff --git a/projects/GKv3/GKComponents/GKUI/Components/ImageBox.cs b/projects/GKv3/GKComponents/GKUI/Components/ImageBox.cs
@@ -63,6 +63,11 @@ public sealed class ImageBox : ScrollablePanel
         /// </summary>
         public event EventHandler ImageChanged;
 
+        /// <summary>
+        ///   Occurs when the SelectionRegion property is changed.
+        /// </summary>
+        public event EventHandler SelectionRegionChanged;
+
         /// <summary>
         ///   Occurs when the Zoom property is changed.
         /// </summary>
@@ -136,6 +141,7 @@ public RectangleF SelectionRegion
                 if (fSelectionRegion != value) {
                     fSelectionRegion = value;
                     InvalidateContent();
+                    OnSelectionRegionChanged(EventArgs.Empty);
                 }
             }
         }
@@ -656,6 +662,13 @@ private void OnImageChanged(EventArgs e)
                 handler(this, e);
         }
 
+        private void OnSelectionRegionChanged(EventArgs e)
+        {
+            EventHandler handler = SelectionRegionChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
         private void OnZoomChanged(EventArgs e)
         {
             EventHandler handler = ZoomChanged;