From 0465b15c05cbe6cd78ed8c7a24f3ab0a8e84bb05 Mon Sep 17 00:00:00 2001
From: "Serg V. Zhdanovskih" <serg.zhdanovskih@yandex.ru>
Date: Sun, 31 Jul 2016 16:48:27 +0500
Subject: [PATCH] Preparation for new release, minor changes

---
 deploy/gk2_linux_package.sh                   |   2 +-
 deploy/gk2_win_setup.nsi                      |   2 +-
 locales/help_enu/gkhHistory.html              |   4 +-
 locales/help_rus/gkhHistory.html              |   4 +-
 projects/GEDKeeper2/GKProgram.cs              |   2 +-
 .../GEDKeeper2/GKUI/Charts/AncestorsCircle.cs | 477 ++----------------
 .../GEDKeeper2/GKUI/Charts/CircleChart.cs     | 398 ++++++++++++++-
 .../GKUI/Charts/DescendantsCircle.cs          | 382 +-------------
 projects/GEDKeeper2/Makefile                  |   2 +
 projects/GKCalculatorPlugin/Makefile          |   2 -
 projects/GKCommon/GEDCOM/GEDCOMCustomEvent.cs |   4 +-
 projects/GKCommon/Makefile                    |   2 +
 projects/GKTests/GedcomTests.cs               | 120 ++++-
 13 files changed, 576 insertions(+), 825 deletions(-)
diff --git a/deploy/gk2_linux_package.sh b/deploy/gk2_linux_package.sh
index 80a3aef4a..615398245 100644
--- a/deploy/gk2_linux_package.sh
+++ b/deploy/gk2_linux_package.sh
@@ -3,7 +3,7 @@ APP="GEDKeeper2"
 EXT="ged"
 COMMENT="Personal genealogical database editor"
 # APP_PATH=/usr/bin/
-APP_VER="2.6.0"
+APP_VER="2.7.0"
 DEV_PATH="/home/norseman/share/gkdev/GEDKeeper"
 PACK_PATH="gedkeeper-$APP_VER"
 LIB_PATH="$PACK_PATH/usr/lib/gedkeeper"
diff --git a/deploy/gk2_win_setup.nsi b/deploy/gk2_win_setup.nsi
index f33313944..666aeee59 100644
--- a/deploy/gk2_win_setup.nsi
+++ b/deploy/gk2_win_setup.nsi
@@ -5,7 +5,7 @@
 !include "MUI2.nsh"
 
 Name "GEDKeeper2"
-OutFile "GEDKeeper2-v2.6.0-win-setup.exe"
+OutFile "GEDKeeper2-v2.7.0-win-setup.exe"
 InstallDir $PROGRAMFILES\GEDKeeper2
 
 CRCCheck on
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
index 16b7ac5b7..b4edb7ee4 100644
--- a/locales/help_enu/gkhHistory.html
+++ b/locales/help_enu/gkhHistory.html
@@ -9,9 +9,9 @@
 <body>
 <h1>Change log</h1>
 
-<p><b>31.07.2016 [v2.6.1]</b></p>
+<p><b>31.07.2016 [v2.7.0]</b></p>
 <ul>
-<li>(+) Added a diagram of the circle of descendants (very simple version).
+<li>(+) Added a diagram of the circle of descendants.
 <li>(*) Improved options of the circle of ancestors.
 <li>(+) Added generation of ascending pedigrees (ancestors).
 <li>(*) Fixed minor bugs.
diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
index fbd004150..e0347a17d 100644
--- a/locales/help_rus/gkhHistory.html
+++ b/locales/help_rus/gkhHistory.html
@@ -8,9 +8,9 @@
 
 <h1>История версий</h1>
 
-<p><b>31.07.2016 [v2.6.1]</b></p>
+<p><b>31.07.2016 [v2.7.0]</b></p>
 <ul>
-<li>(+) Добавлена диаграмма круга потомков (очень простой вариант).
+<li>(+) Добавлена диаграмма круга потомков.
 <li>(*) Доработаны настройки круга предков.
 <li>(+) Добавлена генерация восходящих росписей (предков).
 <li>(*) Исправлены мелкие ошибки.
diff --git a/projects/GEDKeeper2/GKProgram.cs b/projects/GEDKeeper2/GKProgram.cs
index 5b56f7a53..3a24fbb39 100644
--- a/projects/GEDKeeper2/GKProgram.cs
+++ b/projects/GEDKeeper2/GKProgram.cs
@@ -38,7 +38,7 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyTitle("GEDKeeper2")]
-[assembly: AssemblyVersion("2.6.1.0")]
+[assembly: AssemblyVersion("2.7.0.0")]
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
diff --git a/projects/GEDKeeper2/GKUI/Charts/AncestorsCircle.cs b/projects/GEDKeeper2/GKUI/Charts/AncestorsCircle.cs
index 3cb61b38b..c395bba54 100644
--- a/projects/GEDKeeper2/GKUI/Charts/AncestorsCircle.cs
+++ b/projects/GEDKeeper2/GKUI/Charts/AncestorsCircle.cs
@@ -19,80 +19,35 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Windows.Forms;
 
-using GKCommon;
 using GKCommon.GEDCOM;
 using GKCore.Interfaces;
-using GKCore.Options;
 
 namespace GKUI.Charts
 {
     public class AncestorsCircle : CircleChart
     {
-        private class PersonSegment : BaseObject
+        private class PersonSegment : CircleSegment
         {
-            public readonly int Gen;
-            public readonly GraphicsPath Path;
-
-            public GEDCOMIndividualRecord IRec;
-            public int Rad;
-            public float V;
             public int GroupIndex;
             public PersonSegment FatherSegment;
             public PersonSegment MotherSegment;
-            public float StartAngle;
-            public float WedgeAngle;
 
-            public PersonSegment(int generation)
+            public PersonSegment(int generation) : base(generation)
             {
-                this.Gen = generation;
-                this.Path = new GraphicsPath();
-                this.IRec = null;
                 this.GroupIndex = -1;
                 this.FatherSegment = null;
                 this.MotherSegment = null;
             }
-
-            protected override void Dispose(bool disposing)
-            {
-                if (disposing)
-                {
-                    if (this.Path != null) this.Path.Dispose();
-                }
-                base.Dispose(disposing);
-            }
         }
 
-        private const float PI = 3.1415926535897931f;
-        private const int CENTER_RAD = 90;
-        private const int DEFAULT_GEN_WIDTH = 60;
 
-        private readonly System.ComponentModel.IContainer components;
-        private readonly SolidBrush[] fCircleBrushes;
-        private readonly SolidBrush[] fDarkBrushes;
-        private readonly AncestorsCircleOptions fOptions;
-        private readonly List<PersonSegment> fSegments;
-        private readonly ToolTip fToolTip;
-
-        private int fCenterX;
-        private int fCenterY;
-        private int fGenWidth;
         private int fGroupCount;
         private bool fGroupsMode;
-        private string fHint;
-        private int fIndividualsCount;
-        private int fMaxGenerations;
-        private int fOffsetX = 0;
-        private int fOffsetY = 0;
-        private GEDCOMIndividualRecord fRootPerson;
-        private PersonSegment fSelected;
-        //private GEDCOMTree fTree;
 
-        private bool ArcText = true;
 
         public bool GroupsMode
         {
@@ -111,165 +66,12 @@ public bool GroupsMode
             }
         }
 
-        public AncestorsCircleOptions Options
-        {
-            get { return this.fOptions; }
-        }
-
-        public int IndividualsCount
-        {
-            get { return this.fIndividualsCount; }
-        }
-
-        public GEDCOMIndividualRecord RootPerson
-        {
-            get {
-                return this.fRootPerson;
-            }
-            set {
-                this.fRootPerson = value;
-
-                this.NavAdd(value);
-                this.Changed();
-
-                this.DoRootChanged(value);
-            }
-        }
-
-        public int GenWidth
-        {
-            get {
-                return this.fGenWidth;
-            }
-            set {
-                if (value < 20 || value > 100) return;
-                
-                this.fGenWidth = value;
-                this.Changed();
-            }
-        }
-
-        public AncestorsCircle(IBaseWindow baseWin) : base()
-        {
-            this.components = new System.ComponentModel.Container();
-
-            //this.fTree = tree;
-            this.fOptions = new AncestorsCircleOptions();
-            this.fCircleBrushes = new SolidBrush[AncestorsCircleOptions.MAX_BRUSHES];
-            this.fDarkBrushes = new SolidBrush[AncestorsCircleOptions.MAX_BRUSHES];
-
-            this.DoubleBuffered = true;
-            this.BackColor = this.fOptions.BrushColor[9];
-            this.fSegments = new List<PersonSegment>();
-            this.fSelected = null;
-            this.fGenWidth = DEFAULT_GEN_WIDTH;
-            this.fMaxGenerations = 8;
-
-            this.fToolTip = new ToolTip(components);
-            this.fToolTip.AutoPopDelay = 5000;
-            this.fToolTip.InitialDelay = 250;
-            this.fToolTip.ReshowDelay = 50;
-            this.fToolTip.ShowAlways = true;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing) {
-                if (components != null) components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        protected override void SetNavObject(object obj)
-        {
-            this.RootPerson = obj as GEDCOMIndividualRecord;
-        }
-
-        #region Content
-        
-        private void CreateBrushes()
-        {
-            for (int i = 0; i < this.fOptions.BrushColor.Length; i++)
-            {
-                Color col = this.fOptions.BrushColor[i];
-
-                this.fCircleBrushes[i] = new SolidBrush(col);
-                this.fDarkBrushes[i] = new SolidBrush(GfxHelper.Darker(col, 0.2f));
-            }
-        }
-
-        private void TraverseGroups(PersonSegment segment, int groupIndex)
-        {
-            if (segment == null) return;
-
-            segment.GroupIndex = groupIndex;
-            if (segment.FatherSegment != null) this.TraverseGroups(segment.FatherSegment, groupIndex);
-            if (segment.MotherSegment != null) this.TraverseGroups(segment.MotherSegment, groupIndex);
-        }
 
-        private PersonSegment SetSegmentParams(int index, GEDCOMIndividualRecord rec, int rad, float v, int groupIndex)
+        public AncestorsCircle(IBaseWindow baseWin) : base(baseWin)
         {
-            try
-            {
-                PersonSegment segment = this.fSegments[index];
-
-                segment.IRec = rec;
-                segment.Rad = rad;
-                segment.V = v;
-                segment.GroupIndex = groupIndex;
-
-                return segment;
-            }
-            catch
-            {
-                return null;
-            }
         }
 
-        private PersonSegment FindSegmentByRec(GEDCOMIndividualRecord iRec)
-        {
-            PersonSegment result = null;
-
-            int num = this.fSegments.Count;
-            for (int i = 0; i < num; i++) {
-                PersonSegment segment = this.fSegments[i];
-
-                if (segment.IRec == iRec) {
-                    result = segment;
-                    break;
-                }
-            }
-
-            return result;
-        }
-
-        private PersonSegment FindSegment(int mX, int mY)
-        {
-            PersonSegment result = null;
-
-            int num = this.fSegments.Count;
-            for (int i = 0; i < num; i++) {
-                PersonSegment segment = this.fSegments[i];
-
-                if (segment.Path.IsVisible(mX, mY)) {
-                    result = segment;
-                    break;
-                }
-            }
-
-            return result;
-        }
-
-        public override void Changed()
-        {
-            this.CreateBrushes();
-
-            this.BuildPathTree();
-
-            this.Invalidate();
-        }
-
-        private void BuildPathTree()
+        protected override void BuildPathTree()
         {
             this.fSegments.Clear();
 
@@ -334,7 +136,8 @@ private void BuildPathTree()
             this.fIndividualsCount = 0;
             if (this.fRootPerson != null) {
                 this.fIndividualsCount++;
-                PersonSegment rootSegment = this.SetSegmentParams(0, this.fRootPerson, 0, 0, -1);
+                PersonSegment rootSegment = this.SetSegmentParams(0, this.fRootPerson, 0, -1);
+                rootSegment.WedgeAngle = 360.0f;
 
                 GEDCOMIndividualRecord father, mother;
                 this.fRootPerson.GetParents(out father, out mother);
@@ -349,6 +152,19 @@ private void BuildPathTree()
             }
         }
 
+        private PersonSegment SetSegmentParams(int index, GEDCOMIndividualRecord rec, int rad, int groupIndex)
+        {
+            if (index < 0 || index >= this.fSegments.Count) {
+                return null;
+            } else {
+                PersonSegment segment = (PersonSegment)this.fSegments[index];
+                segment.IRec = rec;
+                segment.Rad = rad;
+                segment.GroupIndex = groupIndex;
+                return segment;
+            }
+        }
+
         private PersonSegment TraverseAncestors(GEDCOMIndividualRecord iRec, float v, int gen, int rad, float ro, int prevSteps, int groupIndex)
         {
             try
@@ -356,7 +172,7 @@ private PersonSegment TraverseAncestors(GEDCOMIndividualRecord iRec, float v, in
                 this.fIndividualsCount++;
 
                 if (this.fGroupsMode && groupIndex == -1) {
-                    PersonSegment otherSegment = this.FindSegmentByRec(iRec);
+                    PersonSegment otherSegment = (PersonSegment)this.FindSegmentByRec(iRec);
                     if (otherSegment != null) {
                         this.fGroupCount++;
                         groupIndex = this.fGroupCount;
@@ -368,7 +184,7 @@ private PersonSegment TraverseAncestors(GEDCOMIndividualRecord iRec, float v, in
                 float ang = (360.0f / genSize);
 
                 int idx = prevSteps + (int)(v / ang);
-                PersonSegment segment = this.SetSegmentParams(idx, iRec, rad, v, groupIndex);
+                PersonSegment segment = this.SetSegmentParams(idx, iRec, rad, groupIndex);
 
                 if (gen < this.fMaxGenerations)
                 {
@@ -396,9 +212,14 @@ private PersonSegment TraverseAncestors(GEDCOMIndividualRecord iRec, float v, in
             }
         }
 
-        #endregion
+        private void TraverseGroups(PersonSegment segment, int groupIndex)
+        {
+            if (segment == null) return;
 
-        #region Drawing
+            segment.GroupIndex = groupIndex;
+            if (segment.FatherSegment != null) this.TraverseGroups(segment.FatherSegment, groupIndex);
+            if (segment.MotherSegment != null) this.TraverseGroups(segment.MotherSegment, groupIndex);
+        }
 
         protected override void InternalDraw(Graphics gfx)
         {
@@ -408,7 +229,7 @@ protected override void InternalDraw(Graphics gfx)
 
             int num = this.fSegments.Count;
             for (int i = 0; i < num; i++) {
-                PersonSegment segment = this.fSegments[i];
+                PersonSegment segment = (PersonSegment)this.fSegments[i];
 
                 bool draw = (!this.Options.HideEmptySegments || segment.IRec != null);
 
@@ -430,174 +251,10 @@ protected override void InternalDraw(Graphics gfx)
             }
 
             for (int i = 0; i < num; i++) {
-                this.DrawAncestorName(gfx, this.fSegments[i]);
+                this.DrawPersonName(gfx, this.fSegments[i]);
             }
         }
 
-        private void DrawAncestorName(Graphics gfx, PersonSegment segment)
-        {
-            int rad = segment.Rad;
-            int gen = segment.Gen;
-            float v = segment.V;
-            GEDCOMIndividualRecord iRec = segment.IRec;
-
-            string surn, givn;
-            if (iRec == null) {
-                if (gen == 0) {
-                    givn = "Choose";
-                    surn = "subject";
-                } else {
-                    return;
-                }
-            } else {
-                string dummy;
-                iRec.GetNameParts(out surn, out givn, out dummy);
-            }
-
-            rad -= 20;
-            switch (gen)
-            {
-                case 0:
-                    {
-                        gfx.ResetTransform();
-                        gfx.TranslateTransform(this.fCenterX, this.fCenterY);
-
-                        SizeF sizeF = gfx.MeasureString(surn, this.Font);
-                        gfx.DrawString(surn, this.Font, this.fCircleBrushes[8], -sizeF.Width / 2f, -sizeF.Height / 2f - sizeF.Height / 2f);
-                        sizeF = gfx.MeasureString(givn, this.Font);
-                        gfx.DrawString(givn, this.Font, this.fCircleBrushes[8], -sizeF.Width / 2f, 0f);
-                        break;
-                    }
-
-                case 1:
-                    if (ArcText) {
-                        SizeF sizeF = gfx.MeasureString(surn, this.Font);
-                        DrawArcText(gfx, surn, this.fCenterX, this.fCenterY, rad + sizeF.Height / 2f,
-                                    segment.StartAngle, segment.WedgeAngle, true, true, Font, this.fCircleBrushes[8]);
-
-                        sizeF = gfx.MeasureString(givn, this.Font);
-                        DrawArcText(gfx, givn, this.fCenterX, this.fCenterY, rad - sizeF.Height / 2f,
-                                    segment.StartAngle, segment.WedgeAngle, true, true, Font, this.fCircleBrushes[8]);
-                    } else {
-                        float dx = (float)Math.Sin(PI * v / 180.0) * rad;
-                        float dy = (float)Math.Cos(PI * v / 180.0) * rad;
-
-                        gfx.ResetTransform();
-                        gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
-                        gfx.RotateTransform(v);
-
-                        SizeF sizeF = gfx.MeasureString(surn, this.Font);
-                        gfx.DrawString(surn, this.Font, this.fCircleBrushes[8], -sizeF.Width / 2f, -sizeF.Height / 2f);
-                        sizeF = gfx.MeasureString(givn, this.Font);
-                        gfx.DrawString(givn, this.Font, this.fCircleBrushes[8], -sizeF.Width / 2f, -sizeF.Height / 2f + sizeF.Height);
-                    }
-                    break;
-
-                case 2:
-                case 3:
-                case 4:
-                    if (ArcText) {
-                        if (gen == 2) {
-                            SizeF sizeF = gfx.MeasureString(surn, this.Font);
-                            DrawArcText(gfx, surn, this.fCenterX, this.fCenterY, rad + sizeF.Height / 2f,
-                                        segment.StartAngle, segment.WedgeAngle, true, true, Font, this.fCircleBrushes[8]);
-
-                            sizeF = gfx.MeasureString(givn, this.Font);
-                            DrawArcText(gfx, givn, this.fCenterX, this.fCenterY, rad - sizeF.Height / 2f,
-                                        segment.StartAngle, segment.WedgeAngle, true, true, Font, this.fCircleBrushes[8]);
-                        } else {
-                            DrawArcText(gfx, givn, this.fCenterX, this.fCenterY, rad,
-                                        segment.StartAngle, segment.WedgeAngle, true, true, Font, this.fCircleBrushes[8]);
-                        }
-                    } else {
-                        float dx = (float)Math.Sin(PI * v / 180.0) * rad;
-                        float dy = (float)Math.Cos(PI * v / 180.0) * rad;
-                        gfx.ResetTransform();
-                        gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
-                        gfx.RotateTransform(v);
-
-                        SizeF sizeF2 = gfx.MeasureString(surn, this.Font);
-                        gfx.DrawString(surn, this.Font, this.fCircleBrushes[8], -sizeF2.Width / 2f, -sizeF2.Height / 2f);
-                        sizeF2 = gfx.MeasureString(givn, this.Font);
-                        dx = (float)Math.Sin(PI * v / 180.0) * (rad - sizeF2.Height);
-                        dy = (float)Math.Cos(PI * v / 180.0) * (rad - sizeF2.Height);
-                        gfx.ResetTransform();
-                        gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
-                        gfx.RotateTransform(v);
-                        gfx.DrawString(givn, this.Font, this.fCircleBrushes[8], -sizeF2.Width / 2f, -sizeF2.Height / 2f);
-                    }
-                    break;
-
-                case 5:
-                    {
-                        float dx = (float)Math.Sin(PI * v / 180.0) * rad;
-                        float dy = (float)Math.Cos(PI * v / 180.0) * rad;
-                        gfx.ResetTransform();
-                        gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
-                        gfx.RotateTransform(v);
-
-                        this.DrawString(gfx, givn);
-                        break;
-                    }
-                case 6:
-                case 7:
-                case 8:
-                    {
-                        float dx = (float)Math.Sin(PI * v / 180.0) * rad;
-                        float dy = (float)Math.Cos(PI * v / 180.0) * rad;
-                        gfx.ResetTransform();
-                        gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
-                        gfx.RotateTransform(v - 90.0f);
-
-                        this.DrawString(gfx, givn);
-                        break;
-                    }
-            }
-        }
-
-        private void DrawString(Graphics gfx, string str)
-        {
-            SizeF size = gfx.MeasureString(str, this.Font);
-            gfx.DrawString(str, this.Font, this.fCircleBrushes[8], -size.Width / 2f, -size.Height / 2f);
-        }
-
-        private static void DrawArcText(Graphics graphics, string text, float centerX, float centerY, float radius,
-                                        float startAngle, float wedgeAngle,
-                                        bool inside, bool clockwise, Font font, Brush brush)
-        {
-            var size = graphics.MeasureString(text, font);
-            radius = radius + size.Height / 2.0f;
-
-            float textAngle = (float)GfxHelper.RadiansToDegrees((size.Width * 1.75f) / radius);
-            float deltaAngle = (wedgeAngle - textAngle) / 2.0f;
-
-            startAngle -= 90.0f + deltaAngle;
-
-            for (var i = 0; i < text.Length; ++i)
-            {
-                graphics.ResetTransform();
-
-                float offset = (textAngle * ((i + 0.0f) / text.Length));
-                offset = clockwise ? -offset : offset;
-                float angle = startAngle + offset;
-
-                double radAngle = angle * (Math.PI / 180.0d);
-                float x = (float)(centerX + Math.Sin(radAngle) * radius);
-                float y = (float)(centerY + Math.Cos(radAngle) * radius);
-                graphics.TranslateTransform(x, y);
-
-                double charRotation = inside ? -angle + 180 : -angle;
-                graphics.RotateTransform((float)(charRotation));
-
-                string chr = new String(text[i], 1);
-                graphics.DrawString(chr, font, brush, 0, 0);
-            }
-        }
-
-        #endregion
-
-        #region Protected methods
-
         protected override void OnDoubleClick(EventArgs e)
         {
             base.OnDoubleClick(e);
@@ -619,30 +276,26 @@ protected override void OnKeyDown(KeyEventArgs e)
                     break;
 
                 case Keys.Left:
-                    {
-                        if (this.fRootPerson != null) {
-                            GEDCOMIndividualRecord father, mother;
-                            this.fRootPerson.GetParents(out father, out mother);
-
-                            if (father != null) {
-                                this.RootPerson = father;
-                            }
+                    if (this.fRootPerson != null) {
+                        GEDCOMIndividualRecord father, mother;
+                        this.fRootPerson.GetParents(out father, out mother);
+
+                        if (father != null) {
+                            this.RootPerson = father;
                         }
-                        break;
                     }
+                    break;
 
                 case Keys.Right:
-                    {
-                        if (this.fRootPerson != null) {
-                            GEDCOMIndividualRecord father, mother;
-                            this.fRootPerson.GetParents(out father, out mother);
-
-                            if (mother != null) {
-                                this.RootPerson = mother;
-                            }
+                    if (this.fRootPerson != null) {
+                        GEDCOMIndividualRecord father, mother;
+                        this.fRootPerson.GetParents(out father, out mother);
+
+                        if (mother != null) {
+                            this.RootPerson = mother;
                         }
-                        break;
                     }
+                    break;
 
                 case Keys.Back:
                     this.NavPrev();
@@ -652,48 +305,6 @@ protected override void OnKeyDown(KeyEventArgs e)
                     e.Handled = true;
                     break;
             }
-
-            if (!e.Handled) this.Changed();
-        }
-
-        protected override void OnMouseUp(MouseEventArgs e)
-        {
-            base.OnMouseMove(e);
-
-            PersonSegment selected = this.FindSegment(e.X, e.Y);
-
-            if (selected != null && selected.IRec != null) {
-                this.RootPerson = selected.IRec;
-            }
-        }
-
-        protected override void OnMouseMove(MouseEventArgs e)
-        {
-            base.OnMouseMove(e);
-
-            PersonSegment selected = this.FindSegment(e.X, e.Y);
-
-            string hint = "";
-            if (!Equals(this.fSelected, selected)) {
-                this.fSelected = selected;
-                
-                if (selected != null && selected.IRec != null) {
-                    string name = selected.IRec.GetNameString(true, false);
-                    hint = /*selected.Gen.ToString() + ", " + */name;
-                }
-
-                this.Invalidate();
-            }
-
-            if (!Equals(this.fHint, hint)) {
-                this.fHint = hint;
-
-                if (!string.IsNullOrEmpty(hint)) {
-                    fToolTip.Show(hint, this, e.X, e.Y, 3000);
-                }
-            }
         }
-
-        #endregion
     }
 }
diff --git a/projects/GEDKeeper2/GKUI/Charts/CircleChart.cs b/projects/GEDKeeper2/GKUI/Charts/CircleChart.cs
index 387eb0422..2917502d2 100644
--- a/projects/GEDKeeper2/GKUI/Charts/CircleChart.cs
+++ b/projects/GEDKeeper2/GKUI/Charts/CircleChart.cs
@@ -19,10 +19,17 @@
  */
 
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.Windows.Forms;
 
+using GKCommon;
 using GKCommon.GEDCOM;
+using GKCore.Interfaces;
+using GKCore.Options;
+using GKCore.Types;
 
 namespace GKUI.Charts
 {
@@ -33,27 +40,174 @@ namespace GKUI.Charts
     /// </summary>
     public abstract class CircleChart : CustomChart
     {
+        protected class CircleSegment : BaseObject
+        {
+            public int Gen;
+            public GEDCOMIndividualRecord IRec;
+            public GraphicsPath Path;
+            public int Rad;
+            public float StartAngle;
+            public float WedgeAngle;
+
+            public CircleSegment(int generation)
+            {
+                this.Gen = generation;
+                this.IRec = null;
+                this.Path = new GraphicsPath();
+            }
+
+            protected override void Dispose(bool disposing)
+            {
+                if (disposing)
+                {
+                    if (this.Path != null) this.Path.Dispose();
+                }
+                base.Dispose(disposing);
+            }
+        }
+
         protected static readonly object EventRootChanged;
 
+        protected const float PI = 3.1415926535897931f;
+        protected const int CENTER_RAD = 90;
+        protected const int DEFAULT_GEN_WIDTH = 60;
+
+        protected readonly SolidBrush[] fCircleBrushes;
+        protected readonly SolidBrush[] fDarkBrushes;
+        protected readonly AncestorsCircleOptions fOptions;
+        protected readonly List<CircleSegment> fSegments;
+
+        private readonly IContainer fComponents;
+        private readonly ToolTip fToolTip;
+
+        protected int fCenterX;
+        protected int fCenterY;
+        protected int fGenWidth;
+        private string fHint;
+        protected int fIndividualsCount;
+        protected int fMaxGenerations;
+        protected int fOffsetX = 0;
+        protected int fOffsetY = 0;
+        protected GEDCOMIndividualRecord fRootPerson;
+        protected CircleSegment fSelected;
+        protected ShieldState fShieldState;
+
+        private bool ArcText = false;
+
+
+        public int GenWidth
+        {
+            get {
+                return this.fGenWidth;
+            }
+            set {
+                if (value < 20 || value > 100) return;
+
+                this.fGenWidth = value;
+                this.Changed();
+            }
+        }
+
+        public int IndividualsCount
+        {
+            get { return this.fIndividualsCount; }
+        }
+
+        public AncestorsCircleOptions Options
+        {
+            get { return this.fOptions; }
+        }
+
         public event ARootChangedEventHandler RootChanged
         {
             add { base.Events.AddHandler(CircleChart.EventRootChanged, value); }
             remove { base.Events.RemoveHandler(CircleChart.EventRootChanged, value); }
         }
 
+        public GEDCOMIndividualRecord RootPerson
+        {
+            get {
+                return this.fRootPerson;
+            }
+            set {
+                this.fRootPerson = value;
+
+                this.NavAdd(value);
+                this.Changed();
+
+                this.DoRootChanged(value);
+            }
+        }
+
+
         static CircleChart()
         {
             CircleChart.EventRootChanged = new object();
         }
 
-        public CircleChart()
+        public CircleChart(IBaseWindow baseWin)
         {
+            this.DoubleBuffered = true;
+
+            this.fComponents = new System.ComponentModel.Container();
+
+            this.fToolTip = new ToolTip(fComponents);
+            this.fToolTip.AutoPopDelay = 5000;
+            this.fToolTip.InitialDelay = 250;
+            this.fToolTip.ReshowDelay = 50;
+            this.fToolTip.ShowAlways = true;
+
+            this.fCircleBrushes = new SolidBrush[AncestorsCircleOptions.MAX_BRUSHES];
+            this.fDarkBrushes = new SolidBrush[AncestorsCircleOptions.MAX_BRUSHES];
+            this.fGenWidth = DEFAULT_GEN_WIDTH;
+            this.fMaxGenerations = 8;
+            this.fOptions = new AncestorsCircleOptions();
+            this.fSegments = new List<CircleSegment>();
+            this.fSelected = null;
+            this.fShieldState = baseWin.ShieldState;
+
+            this.BackColor = this.fOptions.BrushColor[9];
         }
 
-        public abstract void Changed();
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing) {
+                if (fComponents != null) fComponents.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        protected override void SetNavObject(object obj)
+        {
+            this.RootPerson = obj as GEDCOMIndividualRecord;
+        }
+
+        #region Abstract methods
+
+        protected abstract void BuildPathTree();
 
         protected abstract void InternalDraw(Graphics gfx);
 
+        #endregion
+
+        private void CreateBrushes()
+        {
+            for (int i = 0; i < this.fOptions.BrushColor.Length; i++)
+            {
+                Color col = this.fOptions.BrushColor[i];
+
+                this.fCircleBrushes[i] = new SolidBrush(col);
+                this.fDarkBrushes[i] = new SolidBrush(GfxHelper.Darker(col, 0.2f));
+            }
+        }
+
+        public void Changed()
+        {
+            this.CreateBrushes();
+            this.BuildPathTree();
+            this.Invalidate();
+        }
+
         protected void DoRootChanged(GEDCOMIndividualRecord person)
         {
             ARootChangedEventHandler eventHandler = (ARootChangedEventHandler)base.Events[AncestorsCircle.EventRootChanged];
@@ -62,6 +216,206 @@ protected void DoRootChanged(GEDCOMIndividualRecord person)
             eventHandler(this, person);
         }
 
+        protected CircleSegment FindSegmentByRec(GEDCOMIndividualRecord iRec)
+        {
+            CircleSegment result = null;
+
+            int num = this.fSegments.Count;
+            for (int i = 0; i < num; i++) {
+                CircleSegment segment = this.fSegments[i];
+
+                if (segment.IRec == iRec) {
+                    result = segment;
+                    break;
+                }
+            }
+
+            return result;
+        }
+
+        protected CircleSegment FindSegment(int mX, int mY)
+        {
+            CircleSegment result = null;
+
+            int num = this.fSegments.Count;
+            for (int i = 0; i < num; i++) {
+                CircleSegment segment = this.fSegments[i];
+
+                if (segment.Path.IsVisible(mX, mY)) {
+                    result = segment;
+                    break;
+                }
+            }
+
+            return result;
+        }
+
+        protected void DrawPersonName(Graphics gfx, CircleSegment segment)
+        {
+            int gen = segment.Gen;
+            GEDCOMIndividualRecord iRec = segment.IRec;
+
+            string surn, givn;
+            if (iRec == null) {
+                if (gen == 0) {
+                    givn = "Choose";
+                    surn = "subject";
+                } else {
+                    return;
+                }
+            } else {
+                string dummy;
+                iRec.GetNameParts(out surn, out givn, out dummy);
+            }
+
+            int rad = segment.Rad - 20;
+            float angle = segment.StartAngle + 90.0f + segment.WedgeAngle / 2;
+            float wedgeAngle = segment.WedgeAngle;
+
+            bool isNarrow = IsNarrowSegment(gfx, givn, rad, wedgeAngle, this.Font);
+
+            if (gen == 0) {
+
+                gfx.ResetTransform();
+                gfx.TranslateTransform(this.fCenterX, this.fCenterY);
+
+                SizeF sizeF = gfx.MeasureString(surn, this.Font);
+                gfx.DrawString(surn, this.Font, this.fCircleBrushes[8], -sizeF.Width / 2f, -sizeF.Height / 2f - sizeF.Height / 2f);
+                sizeF = gfx.MeasureString(givn, this.Font);
+                gfx.DrawString(givn, this.Font, this.fCircleBrushes[8], -sizeF.Width / 2f, 0f);
+
+            } else {
+
+                if (isNarrow) {
+
+                    float dx = (float)Math.Sin(PI * angle / 180.0) * rad;
+                    float dy = (float)Math.Cos(PI * angle / 180.0) * rad;
+                    gfx.ResetTransform();
+                    gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
+                    gfx.RotateTransform(angle - 90.0f);
+
+                    SizeF size = gfx.MeasureString(givn, this.Font);
+                    gfx.DrawString(givn, this.Font, this.fCircleBrushes[8], -size.Width / 2f, -size.Height / 2f);
+
+                } else {
+
+                    if (wedgeAngle < 20) {
+
+                        float dx = (float)Math.Sin(PI * angle / 180.0) * rad;
+                        float dy = (float)Math.Cos(PI * angle / 180.0) * rad;
+                        gfx.ResetTransform();
+                        gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
+                        gfx.RotateTransform(angle);
+
+                        SizeF size = gfx.MeasureString(givn, this.Font);
+                        gfx.DrawString(givn, this.Font, this.fCircleBrushes[8], -size.Width / 2f, -size.Height / 2f);
+
+                    } else if (wedgeAngle < 180) {
+
+                        if (ArcText) {
+                            if (gen == 2) {
+                                SizeF sizeF = gfx.MeasureString(surn, this.Font);
+                                DrawArcText(gfx, surn, this.fCenterX, this.fCenterY, rad + sizeF.Height / 2f,
+                                            segment.StartAngle, segment.WedgeAngle, true, true, Font, this.fCircleBrushes[8]);
+
+                                sizeF = gfx.MeasureString(givn, this.Font);
+                                DrawArcText(gfx, givn, this.fCenterX, this.fCenterY, rad - sizeF.Height / 2f,
+                                            segment.StartAngle, segment.WedgeAngle, true, true, Font, this.fCircleBrushes[8]);
+                            } else {
+                                DrawArcText(gfx, givn, this.fCenterX, this.fCenterY, rad,
+                                            segment.StartAngle, segment.WedgeAngle, true, true, Font, this.fCircleBrushes[8]);
+                            }
+                        } else {
+                            float dx = (float)Math.Sin(PI * angle / 180.0) * rad;
+                            float dy = (float)Math.Cos(PI * angle / 180.0) * rad;
+                            gfx.ResetTransform();
+                            gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
+                            gfx.RotateTransform(angle);
+                            SizeF sizeF2 = gfx.MeasureString(surn, this.Font);
+                            gfx.DrawString(surn, this.Font, this.fCircleBrushes[8], -sizeF2.Width / 2f, -sizeF2.Height / 2f);
+
+                            sizeF2 = gfx.MeasureString(givn, this.Font);
+                            dx = (float)Math.Sin(PI * angle / 180.0) * (rad - sizeF2.Height);
+                            dy = (float)Math.Cos(PI * angle / 180.0) * (rad - sizeF2.Height);
+                            gfx.ResetTransform();
+                            gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
+                            gfx.RotateTransform(angle);
+                            gfx.DrawString(givn, this.Font, this.fCircleBrushes[8], -sizeF2.Width / 2f, -sizeF2.Height / 2f);
+                        }
+
+                    } else if (wedgeAngle < 200) {
+
+                        if (ArcText) {
+                            SizeF sizeF = gfx.MeasureString(surn, this.Font);
+                            DrawArcText(gfx, surn, this.fCenterX, this.fCenterY, rad + sizeF.Height / 2f,
+                                        segment.StartAngle, segment.WedgeAngle, true, true, Font, this.fCircleBrushes[8]);
+
+                            sizeF = gfx.MeasureString(givn, this.Font);
+                            DrawArcText(gfx, givn, this.fCenterX, this.fCenterY, rad - sizeF.Height / 2f,
+                                        segment.StartAngle, segment.WedgeAngle, true, true, Font, this.fCircleBrushes[8]);
+                        } else {
+                            float dx = (float)Math.Sin(PI * angle / 180.0) * rad;
+                            float dy = (float)Math.Cos(PI * angle / 180.0) * rad;
+                            gfx.ResetTransform();
+                            gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
+                            gfx.RotateTransform(angle);
+
+                            SizeF sizeF = gfx.MeasureString(surn, this.Font);
+                            gfx.DrawString(surn, this.Font, this.fCircleBrushes[8], -sizeF.Width / 2f, -sizeF.Height / 2f);
+                            sizeF = gfx.MeasureString(givn, this.Font);
+                            gfx.DrawString(givn, this.Font, this.fCircleBrushes[8], -sizeF.Width / 2f, -sizeF.Height / 2f + sizeF.Height);
+                        }
+
+                    }
+                }
+            }
+        }
+
+        private static bool IsNarrowSegment(Graphics gfx, string text, float radius, float wedgeAngle, Font font)
+        {
+            var size = gfx.MeasureString(text, font);
+            radius = radius + size.Height / 2.0f;
+
+            float wedgeL = radius * (float)GfxHelper.DegreesToRadians(wedgeAngle);
+
+            return (wedgeL / size.Width <= 0.9f);
+        }
+
+        private static void DrawArcText(Graphics gfx, string text, float centerX, float centerY, float radius,
+                                        float startAngle, float wedgeAngle,
+                                        bool inside, bool clockwise, Font font, Brush brush)
+        {
+            var size = gfx.MeasureString(text, font);
+            radius = radius + size.Height / 2.0f;
+
+            float textAngle = (float)GfxHelper.RadiansToDegrees((size.Width * 1.75f) / radius);
+            float deltaAngle = (wedgeAngle - textAngle) / 2.0f;
+
+            startAngle -= 90.0f + deltaAngle;
+
+            for (var i = 0; i < text.Length; ++i)
+            {
+                gfx.ResetTransform();
+
+                float offset = (textAngle * ((i + 0.0f) / text.Length));
+                offset = clockwise ? -offset : offset;
+                float angle = startAngle + offset;
+
+                double radAngle = angle * (Math.PI / 180.0d);
+                float x = (float)(centerX + Math.Sin(radAngle) * radius);
+                float y = (float)(centerY + Math.Cos(radAngle) * radius);
+                gfx.TranslateTransform(x, y);
+
+                double charRotation = inside ? -angle + 180 : -angle;
+                gfx.RotateTransform((float)(charRotation));
+
+                string chr = new String(text[i], 1);
+                gfx.DrawString(chr, font, brush, 0, 0);
+            }
+        }
+
+        #region Protected inherited methods
+
         protected override bool IsInputKey(Keys keyData)
         {
             switch (keyData) {
@@ -86,5 +440,45 @@ protected override void OnResize(EventArgs e)
             base.OnResize(e);
             this.Changed();
         }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            CircleSegment selected = this.FindSegment(e.X, e.Y);
+
+            if (selected != null && selected.IRec != null) {
+                this.RootPerson = selected.IRec;
+            }
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            CircleSegment selected = this.FindSegment(e.X, e.Y);
+
+            string hint = "";
+            if (!Equals(this.fSelected, selected)) {
+                this.fSelected = selected;
+
+                if (selected != null && selected.IRec != null) {
+                    string name = selected.IRec.GetNameString(true, false);
+                    hint = /*selected.Gen.ToString() + ", " + */name;
+                }
+
+                this.Invalidate();
+            }
+
+            if (!Equals(this.fHint, hint)) {
+                this.fHint = hint;
+
+                if (!string.IsNullOrEmpty(hint)) {
+                    fToolTip.Show(hint, this, e.X, e.Y, 3000);
+                }
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/projects/GEDKeeper2/GKUI/Charts/DescendantsCircle.cs b/projects/GEDKeeper2/GKUI/Charts/DescendantsCircle.cs
index 8770ed578..47f1ec5a9 100644
--- a/projects/GEDKeeper2/GKUI/Charts/DescendantsCircle.cs
+++ b/projects/GEDKeeper2/GKUI/Charts/DescendantsCircle.cs
@@ -24,225 +24,32 @@
 using System.Drawing.Drawing2D;
 using System.Windows.Forms;
 
-using GKCommon;
 using GKCommon.GEDCOM;
 using GKCore;
 using GKCore.Interfaces;
-using GKCore.Options;
-using GKCore.Types;
 
 namespace GKUI.Charts
 {
     public class DescendantsCircle : CircleChart
     {
-        private class PersonSegment : BaseObject
+        private class PersonSegment : CircleSegment
         {
-            public readonly int Gen;
-            public readonly GraphicsPath Path;
-
-            public GEDCOMIndividualRecord IRec;
-            public int Rad;
-            public float V;
             public List<PersonSegment> ChildSegments;
             public int TotalSubSegments;
-            //public float StartAngle;
-            //public float WedgeAngle;
 
-            public PersonSegment(int generation)
+            public PersonSegment(int generation) : base(generation)
             {
-                this.Gen = generation;
-                this.Path = new GraphicsPath();
-                this.IRec = null;
                 this.ChildSegments = new List<DescendantsCircle.PersonSegment>();
                 this.TotalSubSegments = 0;
             }
-
-            protected override void Dispose(bool disposing)
-            {
-                if (disposing)
-                {
-                    if (this.Path != null) this.Path.Dispose();
-                }
-                base.Dispose(disposing);
-            }
-        }
-
-        private const float PI = 3.1415926535897931f;
-        private const int CENTER_RAD = 90;
-        private const int DEFAULT_GEN_WIDTH = 60;
-
-        private readonly System.ComponentModel.IContainer components;
-        private readonly SolidBrush[] fCircleBrushes;
-        private readonly SolidBrush[] fDarkBrushes;
-        private readonly AncestorsCircleOptions fOptions;
-        private readonly List<PersonSegment> fSegments;
-        private readonly ToolTip fToolTip;
-
-        private int fCenterX;
-        private int fCenterY;
-        private int fGenWidth;
-        private string fHint;
-        private int fIndividualsCount;
-        private int fMaxGenerations;
-        private int fOffsetX = 0;
-        private int fOffsetY = 0;
-        private GEDCOMIndividualRecord fRootPerson;
-        private PersonSegment fSelected;
-        private ShieldState fShieldState;
-        //private GEDCOMTree fTree;
-
-
-        public AncestorsCircleOptions Options
-        {
-            get { return this.fOptions; }
-        }
-
-        public int IndividualsCount
-        {
-            get { return this.fIndividualsCount; }
-        }
-
-        public GEDCOMIndividualRecord RootPerson
-        {
-            get {
-                return this.fRootPerson;
-            }
-            set {
-                this.fRootPerson = value;
-
-                this.NavAdd(value);
-                this.Changed();
-
-                this.DoRootChanged(value);
-            }
         }
 
-        public int GenWidth
-        {
-            get {
-                return this.fGenWidth;
-            }
-            set {
-                if (value < 20 || value > 100) return;
-                
-                this.fGenWidth = value;
-                this.Changed();
-            }
-        }
-        
-        public DescendantsCircle(IBaseWindow baseWin) : base()
-        {
-            this.components = new System.ComponentModel.Container();
 
-            this.fShieldState = baseWin.ShieldState;
-            
-            //this.fTree = tree;
-            this.fOptions = new AncestorsCircleOptions();
-            this.fCircleBrushes = new SolidBrush[AncestorsCircleOptions.MAX_BRUSHES];
-            this.fDarkBrushes = new SolidBrush[AncestorsCircleOptions.MAX_BRUSHES];
-
-            this.DoubleBuffered = true;
-            this.BackColor = this.fOptions.BrushColor[9];
-            this.fSegments = new List<PersonSegment>();
-            this.fSelected = null;
-            this.fGenWidth = DEFAULT_GEN_WIDTH;
-            this.fMaxGenerations = 8;
-
-            this.fToolTip = new ToolTip(components);
-            this.fToolTip.AutoPopDelay = 5000;
-            this.fToolTip.InitialDelay = 250;
-            this.fToolTip.ReshowDelay = 50;
-            this.fToolTip.ShowAlways = true;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing) {
-                if (components != null) components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        protected override void SetNavObject(object obj)
+        public DescendantsCircle(IBaseWindow baseWin) : base(baseWin)
         {
-            this.RootPerson = obj as GEDCOMIndividualRecord;
         }
 
-        #region Content
-        
-        private void CreateBrushes()
-        {
-            for (int i = 0; i < this.fOptions.BrushColor.Length; i++)
-            {
-                Color col = this.fOptions.BrushColor[i];
-
-                this.fCircleBrushes[i] = new SolidBrush(col);
-                this.fDarkBrushes[i] = new SolidBrush(GfxHelper.Darker(col, 0.2f));
-            }
-        }
-
-        private PersonSegment SetSegmentParams(int index, GEDCOMIndividualRecord rec, int rad, float v, int groupIndex)
-        {
-            try
-            {
-                PersonSegment segment = this.fSegments[index];
-
-                segment.IRec = rec;
-                segment.Rad = rad;
-                segment.V = v;
-
-                return segment;
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        private PersonSegment FindSegmentByRec(GEDCOMIndividualRecord iRec)
-        {
-            PersonSegment result = null;
-
-            int num = this.fSegments.Count;
-            for (int i = 0; i < num; i++) {
-                PersonSegment segment = this.fSegments[i];
-
-                if (segment.IRec == iRec) {
-                    result = segment;
-                    break;
-                }
-            }
-
-            return result;
-        }
-
-        private PersonSegment FindSegment(int mX, int mY)
-        {
-            PersonSegment result = null;
-
-            int num = this.fSegments.Count;
-            for (int i = 0; i < num; i++) {
-                PersonSegment segment = this.fSegments[i];
-
-                if (segment.Path.IsVisible(mX, mY)) {
-                    result = segment;
-                    break;
-                }
-            }
-
-            return result;
-        }
-
-        public override void Changed()
-        {
-            this.CreateBrushes();
-
-            this.BuildPathTree();
-
-            this.Invalidate();
-        }
-
-        private void BuildPathTree()
+        protected override void BuildPathTree()
         {
             this.fSegments.Clear();
 
@@ -274,6 +81,8 @@ private void CalcDescendants(PersonSegment segment, int inRad, float startAngle,
 
             int extRad;
             if (segment.Gen == 0) {
+                segment.WedgeAngle = 360.0f;
+
                 path.StartFigure();
                 path.AddEllipse(ctX - inRad, ctY - inRad, inRad * 2, inRad * 2);
                 path.CloseFigure();
@@ -302,6 +111,10 @@ private void CalcDescendants(PersonSegment segment, int inRad, float startAngle,
                 int nx2 = ctX + (int)(extRad * Math.Cos(angval2));
                 int ny2 = ctY + (int)(extRad * Math.Sin(angval2));
 
+                segment.StartAngle = startAngle;
+                segment.WedgeAngle = wedgeAngle;
+                segment.Rad = inRad + 50;
+
                 path.StartFigure();
                 path.AddLine(px2, py2, px1, py1);
                 path.AddArc(ctX - inRad, ctY - inRad, ir2, ir2, ang1, wedgeAngle);
@@ -322,7 +135,7 @@ private void CalcDescendants(PersonSegment segment, int inRad, float startAngle,
             }
         }
 
-        private PersonSegment TraverseDescendants(GEDCOMIndividualRecord iRec, int gen/*, float v, int rad, float ro, int prevSteps*/)
+        private PersonSegment TraverseDescendants(GEDCOMIndividualRecord iRec, int gen)
         {
             if (iRec == null) return null;
             
@@ -359,30 +172,6 @@ private PersonSegment TraverseDescendants(GEDCOMIndividualRecord iRec, int gen/*
                     }
                 }
 
-                /*
-                int genSize = (int)Math.Pow(2.0, gen);
-                float ang = (360.0f / genSize);
-
-                int idx = prevSteps + (int)(v / ang);
-                PersonSegment segment = this.SetSegmentParams(idx, iRec, rad, v, groupIndex);
-
-                if (gen < 8) {
-                    GEDCOMIndividualRecord father, mother;
-                    iRec.GetParents(out father, out mother);
-
-                    int ps = prevSteps + genSize;
-
-                    if (father != null) {
-                        v -= (Math.Abs(ang - ro) / 2.0f);
-                        segment.FatherSegment = this.TraverseAncestors(father, v, gen + 1, rad + this.fGenWidth, ro / 2.0f, ps, groupIndex);
-                    }
-
-                    if (mother != null) {
-                        v += (ang / 2.0f);
-                        segment.MotherSegment = this.TraverseAncestors(mother, v, gen + 1, rad + this.fGenWidth, ro / 2.0f, ps, groupIndex);
-                    }
-                }*/
-
                 return resultSegment;
             }
             catch
@@ -391,10 +180,6 @@ private PersonSegment TraverseDescendants(GEDCOMIndividualRecord iRec, int gen/*
             }
         }
 
-        #endregion
-
-        #region Drawing
-
         protected override void InternalDraw(Graphics gfx)
         {
             gfx.SmoothingMode = SmoothingMode.AntiAlias;
@@ -403,7 +188,7 @@ protected override void InternalDraw(Graphics gfx)
 
             int num = this.fSegments.Count;
             for (int i = 0; i < num; i++) {
-                PersonSegment segment = this.fSegments[i];
+                PersonSegment segment = (PersonSegment)this.fSegments[i];
 
                 if (segment.IRec != null) {
                     int brIndex;
@@ -418,108 +203,9 @@ protected override void InternalDraw(Graphics gfx)
                 }
             }
 
-            /*this.DrawAncestorName(gfx, 0, 0, 0, this.fRootPerson);
-
             for (int i = 0; i < num; i++) {
-                PersonSegment segment = this.fSegments[i];
-                this.DrawAncestorName(gfx, segment.Rad, segment.Gen, segment.V, segment.IRec);
-            }*/
-        }
-
-        /*private void DrawAncestorName(Graphics gfx, int rad, int gen, float v, GEDCOMIndividualRecord iRec)
-        {
-            string s2, s1;
-            if (iRec == null) {
-                if (gen == 0) {
-                    s1 = "Choose";
-                    s2 = "subject";
-                } else {
-                    return;
-                }
-            } else {
-                string dummy;
-                iRec.GetNameParts(out s2, out s1, out dummy);
-            }
-
-            rad -= 20;
-            switch (gen)
-            {
-                case 0:
-                    {
-                        gfx.ResetTransform();
-                        gfx.TranslateTransform(this.fCenterX, this.fCenterY);
-
-                        SizeF sizeF = gfx.MeasureString(s1, this.Font);
-                        gfx.DrawString(s1, this.Font, this.fCircleBrushes[8], -sizeF.Width / 2f, -sizeF.Height / 2f - sizeF.Height / 2f);
-                        sizeF = gfx.MeasureString(s2, this.Font);
-                        gfx.DrawString(s2, this.Font, this.fCircleBrushes[8], -sizeF.Width / 2f, 0f);
-                        break;
-                    }
-                case 1:
-                    {
-                        float dx = (float)Math.Sin(PI * v / 180.0) * rad;
-                        float dy = (float)Math.Cos(PI * v / 180.0) * rad;
-                        gfx.ResetTransform();
-                        gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
-                        gfx.RotateTransform(v);
-
-                        SizeF sizeF = gfx.MeasureString(s1, this.Font);
-                        gfx.DrawString(s1, this.Font, this.fCircleBrushes[8], -sizeF.Width / 2f, -sizeF.Height / 2f);
-                        sizeF = gfx.MeasureString(s2, this.Font);
-                        gfx.DrawString(s2, this.Font, this.fCircleBrushes[8], -sizeF.Width / 2f, -sizeF.Height / 2f + sizeF.Height);
-                        break;
-                    }
-                case 2:
-                case 3:
-                case 4:
-                case 5:
-                    {
-                        float dx = (float)Math.Sin(PI * v / 180.0) * rad;
-                        float dy = (float)Math.Cos(PI * v / 180.0) * rad;
-                        gfx.ResetTransform();
-                        gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
-                        gfx.RotateTransform(v);
-
-                        SizeF sizeF2 = gfx.MeasureString(s1, this.Font);
-                        gfx.DrawString(s1, this.Font, this.fCircleBrushes[8], -sizeF2.Width / 2f, -sizeF2.Height / 2f);
-                        sizeF2 = gfx.MeasureString(s2, this.Font);
-                        dx = (float)Math.Sin(PI * v / 180.0) * (rad - sizeF2.Height);
-                        dy = (float)Math.Cos(PI * v / 180.0) * (rad - sizeF2.Height);
-                        gfx.ResetTransform();
-                        gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
-                        gfx.RotateTransform(v);
-                        gfx.DrawString(s2, this.Font, this.fCircleBrushes[8], -sizeF2.Width / 2f, -sizeF2.Height / 2f);
-                        break;
-                    }
-                case 6:
-                case 7:
-                case 8:
-                    {
-                        float dx = (float)Math.Sin(PI * v / 180.0) * rad;
-                        float dy = (float)Math.Cos(PI * v / 180.0) * rad;
-                        gfx.ResetTransform();
-                        gfx.TranslateTransform(this.fCenterX + dx, this.fCenterY - dy);
-                        gfx.RotateTransform(v - 90.0f);
-
-                        this.DrawString(gfx, s1);
-                        break;
-                    }
+                this.DrawPersonName(gfx, this.fSegments[i]);
             }
-        }*/
-
-        private void DrawString(Graphics gfx, string str)
-        {
-            SizeF size = gfx.MeasureString(str, this.Font);
-            gfx.DrawString(str, this.Font, this.fCircleBrushes[8], -size.Width / 2f, -size.Height / 2f);
-        }
-
-        #endregion
-
-        #region Protected methods
-
-        protected override void OnDoubleClick(EventArgs e)
-        {
-            base.OnDoubleClick(e);
         }
 
         protected override void OnKeyDown(KeyEventArgs e)
@@ -544,48 +230,6 @@ protected override void OnKeyDown(KeyEventArgs e)
                     e.Handled = true;
                     break;
             }
-
-            if (!e.Handled) this.Changed();
         }
-
-        protected override void OnMouseUp(MouseEventArgs e)
-        {
-            base.OnMouseMove(e);
-
-            PersonSegment selected = this.FindSegment(e.X, e.Y);
-
-            if (selected != null && selected.IRec != null) {
-                this.RootPerson = selected.IRec;
-            }
-        }
-
-        protected override void OnMouseMove(MouseEventArgs e)
-        {
-            base.OnMouseMove(e);
-
-            PersonSegment selected = this.FindSegment(e.X, e.Y);
-
-            string hint = "";
-            if (!Equals(this.fSelected, selected)) {
-                this.fSelected = selected;
-                
-                if (selected != null && selected.IRec != null) {
-                    string name = selected.IRec.GetNameString(true, false);
-                    hint = /*selected.Gen.ToString() + ", " + */name;
-                }
-
-                this.Invalidate();
-            }
-
-            if (!Equals(this.fHint, hint)) {
-                this.fHint = hint;
-
-                if (!string.IsNullOrEmpty(hint)) {
-                    fToolTip.Show(hint, this, e.X, e.Y, 3000);
-                }
-            }
-        }
-
-        #endregion
     }
 }
diff --git a/projects/GEDKeeper2/Makefile b/projects/GEDKeeper2/Makefile
index 04a9f9728..1c09fe69b 100644
--- a/projects/GEDKeeper2/Makefile
+++ b/projects/GEDKeeper2/Makefile
@@ -110,6 +110,7 @@ sources := \
 ./GKUI/Charts/ACOptionsControl.Designer.cs \
 ./GKUI/Charts/AncestorsCircle.cs \
 ./GKUI/Charts/ChartFilter.cs \
+./GKUI/Charts/CircleChart.cs \
 ./GKUI/Charts/CustomChart.cs \
 ./GKUI/Charts/DescendantsCircle.cs \
 ./GKUI/Charts/ITreeControl.cs \
@@ -300,6 +301,7 @@ sources := \
 ./GKUI/Charts/ACOptionsControl.Designer.cs \
 ./GKUI/Charts/AncestorsCircle.cs \
 ./GKUI/Charts/ChartFilter.cs \
+./GKUI/Charts/CircleChart.cs \
 ./GKUI/Charts/CustomChart.cs \
 ./GKUI/Charts/DescendantsCircle.cs \
 ./GKUI/Charts/ITreeControl.cs \
diff --git a/projects/GKCalculatorPlugin/Makefile b/projects/GKCalculatorPlugin/Makefile
index 8376dbd4a..77c2e46e8 100644
--- a/projects/GKCalculatorPlugin/Makefile
+++ b/projects/GKCalculatorPlugin/Makefile
@@ -26,7 +26,6 @@ ifeq ($(windows), $(softwareplatform))
 sources := \
 ./CalcWidget.Designer.cs \
 ./CalcWidget.cs \
-./ExpCalculator.cs \
 ./GKCalculatorPlugin.cs
 
 else
@@ -35,7 +34,6 @@ else
 sources := \
 ./CalcWidget.Designer.cs \
 ./CalcWidget.cs \
-./ExpCalculator.cs \
 ./GKCalculatorPlugin.cs
 
 endif
diff --git a/projects/GKCommon/GEDCOM/GEDCOMCustomEvent.cs b/projects/GKCommon/GEDCOM/GEDCOMCustomEvent.cs
index 257bf1507..a27e12c95 100644
--- a/projects/GKCommon/GEDCOM/GEDCOMCustomEvent.cs
+++ b/projects/GKCommon/GEDCOM/GEDCOMCustomEvent.cs
@@ -97,9 +97,7 @@ public override float IsMatch(GEDCOMTag tag, MatchParams matchParams)
             GEDCOMDateValue dtVal = this.fDetail.Date;
             GEDCOMDateValue dtVal2 = ev.fDetail.Date;
 
-            if ((dtVal == null && dtVal2 == null)) {
-                dateMatch = 100.0f;
-            } else if (dtVal != null && dtVal2 != null) {
+            if (dtVal != null && dtVal2 != null) {
                 dateMatch = dtVal.IsMatch(dtVal2, matchParams);
             }
 
diff --git a/projects/GKCommon/Makefile b/projects/GKCommon/Makefile
index 6a7a445e4..7235065cc 100644
--- a/projects/GKCommon/Makefile
+++ b/projects/GKCommon/Makefile
@@ -129,6 +129,7 @@ sources := \
 ./GKCommon/Controls/WizardPages.cs \
 ./GKCommon/ConvHelper.cs \
 ./GKCommon/EnumSet.cs \
+./GKCommon/ExpCalculator.cs \
 ./GKCommon/ExtList.cs \
 ./GKCommon/ExtRect.cs \
 ./GKCommon/FileHelper.cs \
@@ -301,6 +302,7 @@ sources := \
 ./GKCommon/Controls/SlideList.cs \
 ./GKCommon/Controls/WizardPages.cs \
 ./GKCommon/ConvHelper.cs \
+./GKCommon/ExpCalculator.cs \
 ./GKCommon/EnumSet.cs \
 ./GKCommon/ExtList.cs \
 ./GKCommon/ExtRect.cs \
diff --git a/projects/GKTests/GedcomTests.cs b/projects/GKTests/GedcomTests.cs
index 74f7aed3d..24e51649d 100644
--- a/projects/GKTests/GedcomTests.cs
+++ b/projects/GKTests/GedcomTests.cs
@@ -786,19 +786,39 @@ public void GEDCOMDateExact_Tests()
                 
                 dtx1.SetGregorian(1, 1, 1980);
                 Assert.AreEqual(GEDCOMCalendar.dcGregorian, dtx1.DateCalendar);
-                
+
+                // julian
+
                 dtx1.SetJulian(1, "JAN", 1980, false);
                 Assert.AreEqual(GEDCOMCalendar.dcJulian, dtx1.DateCalendar);
-                
+
+                dtx1.SetJulian(1, 3, 1980);
+                Assert.AreEqual(GEDCOMCalendar.dcJulian, dtx1.DateCalendar);
+                Assert.AreEqual("@#DJULIAN@ 01 MAR 1980", dtx1.StringValue);
+
+                // hebrew
+
                 dtx1.SetHebrew(1, "TSH", 1980, false);
                 Assert.AreEqual(GEDCOMCalendar.dcHebrew, dtx1.DateCalendar);
-                
+
+                dtx1.SetHebrew(1, 2, 1980);
+                Assert.AreEqual(GEDCOMCalendar.dcHebrew, dtx1.DateCalendar);
+                Assert.AreEqual("@#DHEBREW@ 01 CSH 1980", dtx1.StringValue);
+
+                // french
+
                 dtx1.SetFrench(1, "VEND", 1980, false);
                 Assert.AreEqual(GEDCOMCalendar.dcFrench, dtx1.DateCalendar);
-                
+
+                dtx1.SetFrench(1, 2, 1980);
+                Assert.AreEqual(GEDCOMCalendar.dcFrench, dtx1.DateCalendar);
+                Assert.AreEqual("@#DFRENCH R@ 01 BRUM 1980", dtx1.StringValue);
+
+                // roman
+
                 dtx1.SetRoman(1, "JAN", 1980, false);
                 Assert.AreEqual(GEDCOMCalendar.dcRoman, dtx1.DateCalendar);
-                
+
                 dtx1.SetUnknown(1, "JAN", 1980, false);
                 Assert.AreEqual(GEDCOMCalendar.dcUnknown, dtx1.DateCalendar);
             }
@@ -807,13 +827,46 @@ public void GEDCOMDateExact_Tests()
         [Test]
         public void GEDCOMDateValue_Tests()
         {
+            // check empty dateval match
+            using (GEDCOMDateValue dtx1 = new GEDCOMDateValue(null, null, "DATE", ""))
+            {
+                Assert.IsNotNull(dtx1, "dtx1 != null");
+
+                using (GEDCOMDateValue dtx2 = new GEDCOMDateValue(null, null, "DATE", ""))
+                {
+                    Assert.IsNotNull(dtx2, "dtx1 != null");
+
+                    Assert.AreEqual(0.0f, dtx1.IsMatch(dtx2, new MatchParams()));
+                }
+            }
+
+            // check GetDateParts
+            using (GEDCOMDateValue dtx1 = new GEDCOMDateValue(null, null, "DATE", ""))
+            {
+                Assert.IsNotNull(dtx1, "dtx1 != null");
+
+                int year; ushort month, day; bool yearBC;
+                dtx1.GetDateParts(out year, out month, out day, out yearBC);
+                Assert.AreEqual(-1, year);
+                Assert.AreEqual(0, month);
+                Assert.AreEqual(0, day);
+                Assert.AreEqual(false, yearBC);
+
+                dtx1.ParseString("20 JAN 2013");
+                dtx1.GetDateParts(out year, out month, out day, out yearBC);
+                Assert.AreEqual(2013, year);
+                Assert.AreEqual(1, month);
+                Assert.AreEqual(20, day);
+                Assert.AreEqual(false, yearBC);
+            }
+
             using (GEDCOMDateValue dtx1 = new GEDCOMDateValue(null, null, "DATE", "20 JAN 2013"))
             {
                 Assert.IsNotNull(dtx1, "dtx1 != null");
 
                 DateTime dt = ParseDT("20.01.2013");
                 Assert.IsTrue(dtx1.Date.Equals(dt), "dtx1.DateTime.Equals(dt)");
-                
+
                 dtx1.ParseString("INT 20 JAN 2013 (today)");
                 Assert.IsTrue(dtx1.Date.Equals(dt), "dtx1.DateTime.Equals(dt)");
                 Assert.AreEqual((dtx1.Value as GEDCOMDateInterpreted).DatePhrase, "today");
@@ -1067,8 +1120,22 @@ public void GEDCOMCustomEvent_Tests()
                 // stream test
                 customEvent.SetName("BIRT");
                 customEvent.Detail.Date.ParseString("20 SEP 1970");
+                customEvent.Detail.Place.StringValue = "test place";
                 string buf = TagStreamTest(customEvent);
-                Assert.AreEqual(buf, "0 BIRT\r\n"+"1 DATE 20 SEP 1970\r\n");
+                Assert.AreEqual("0 BIRT\r\n"+
+                                "1 DATE 20 SEP 1970\r\n"+
+                                "1 PLAC test place\r\n", buf);
+
+                using (GEDCOMIndividualEvent copyEvent = GEDCOMIndividualEvent.Create(null, null, "", "") as GEDCOMIndividualEvent)
+                {
+                    Assert.IsNotNull(copyEvent);
+                    copyEvent.Assign(customEvent);
+
+                    string buf1 = TagStreamTest(copyEvent);
+                    Assert.AreEqual("0 BIRT\r\n"+
+                                    "1 DATE 20 SEP 1970\r\n"+
+                                    "1 PLAC test place\r\n", buf1);
+                }
 
                 customEvent.Pack();
 
@@ -1471,9 +1538,44 @@ public void GEDCOMPersonalName_Tests()
 
             pnPieces.CensusName = "CensusName";
             Assert.AreEqual("CensusName", pnPieces.CensusName);
-            
+
             persName.Pack();
-            
+
+            string buf = TagStreamTest(persName);
+            Assert.AreEqual("1 NAME Petr /Test/ Fedoroff\r\n"+
+                            "2 TYPE birth\r\n"+
+                            "2 NPFX Prefix\r\n"+
+                            "2 GIVN Given\r\n"+
+                            "2 NICK Nickname\r\n"+
+                            "2 SPFX SurnamePrefix\r\n"+
+                            "2 SURN Surname\r\n"+
+                            "2 NSFX Suffix\r\n"+
+                            "2 _PATN PatronymicName\r\n"+
+                            "2 _MARN MarriedName\r\n"+
+                            "2 _RELN ReligiousName\r\n"+
+                            "2 _CENN CensusName\r\n", buf);
+
+            using (GEDCOMPersonalName nameCopy = new GEDCOMPersonalName(iRec.Owner, iRec, "", "")) {
+                iRec.AddPersonalName(nameCopy);
+                nameCopy.Assign(persName);
+
+                string buf2 = TagStreamTest(nameCopy);
+                Assert.AreEqual("1 NAME Petr /Test/ Fedoroff\r\n"+
+                                "2 TYPE birth\r\n"+
+                                "2 NPFX Prefix\r\n"+
+                                "2 GIVN Given\r\n"+
+                                "2 NICK Nickname\r\n"+
+                                "2 SPFX SurnamePrefix\r\n"+
+                                "2 SURN Surname\r\n"+
+                                "2 NSFX Suffix\r\n"+
+                                "2 _PATN PatronymicName\r\n"+
+                                "2 _MARN MarriedName\r\n"+
+                                "2 _RELN ReligiousName\r\n"+
+                                "2 _CENN CensusName\r\n", buf2);
+
+                iRec.PersonalNames.Delete(nameCopy);
+            }
+
             persName.Clear();
             Assert.IsTrue(persName.IsEmpty());
         }
