Geps 039 genealogical symbols

Symbols for GraphView, QuiltView and TimelinePedigreeView

Author: SNoiraud

GraphView/graphview.py

@@ -73,6 +73,7 @@
 from gramps.gui.views.bookmarks import PersonBookmarks
 from gramps.gui.widgets import progressdialog as progressdlg
 from gramps.gui.widgets.menuitem import add_menuitem
+from gramps.gen.utils.symbols import Symbols
 
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 try:
@@ -104,7 +105,6 @@
 
 WIKI_PAGE = 'https://gramps-project.org/wiki/index.php?title=Graph_View'
 
-
 #-------------------------------------------------------------------------
 #
 # GraphView
@@ -158,6 +158,11 @@ def __init__(self, pdata, dbstate, uistate, nav_group=0):
 
         self.additional_uis.append(self.additional_ui)
         self.define_print_actions()
+        self.uistate.connect('font-changed', self.font_changed)
+
+    def font_changed(self):
+        self.graph_widget.font_changed(self.get_active())
+        #self.goto_handle(None)
 
         # for disable animation options in config dialog
         self.ani_widgets = []
@@ -597,7 +602,6 @@ def printview(self, *obj):
                 ErrorDialog(msg2, str(msg), parent=dot)
         dot.destroy()
 
-
 #-------------------------------------------------------------------------
 #
 # GraphWidget
@@ -619,6 +623,7 @@ def __init__(self, view, dbstate, uistate):
         self.view = view
         self.dbstate = dbstate
         self.uistate = uistate
+        self.parser = None
         self.active_person_handle = None
 
         self.dot_data = None
@@ -733,6 +738,12 @@ def __init__(self, view, dbstate, uistate):
         # Gtk style context for scrollwindow to operate with theme colors
         self.sw_style_context = scrolled_win.get_style_context()
 
+    def font_changed(self, active):
+        self.font = config.get('utf8.selected-font')
+        if self.parser:
+            self.parser.font_changed()
+            self.populate(active)
+
     def set_ancestors_generations(self, widget):
         """
         Set count of ancestors generations to show.
@@ -921,7 +932,7 @@ def fit_to_page(self, button):
         width_canvas = bounds.x2 - bounds.x1
 
         # get scroll window size
-        width = self.hadjustment.get_page_size()
+        width  = self.hadjustment.get_page_size()
         height = self.vadjustment.get_page_size()
 
         # prevent division by zero
@@ -1787,6 +1798,10 @@ def __init__(self, widget, view):
                                 "Arial":                 "Helvetica",}
 
         self.transform_scale = 1
+        self.font_changed()
+
+    def font_changed(self):
+        self.font = config.get('utf8.selected-font')
 
     def parse(self, ifile):
         """
@@ -2039,6 +2054,7 @@ def stop_text(self, tag):
         anchor = self.text_attrs.get('text-anchor')
         style = self.text_attrs.get('style')
 
+        # does the following always work with symbols?
         if style:
             p_style = self.parse_style(style)
             try:
@@ -2132,7 +2148,6 @@ def parse_style(self, style):
         style = style.rstrip(';')
         return dict([i.split(':') for i in style.split(';')])
 
-
 #------------------------------------------------------------------------
 #
 # DotSvgGenerator
@@ -2147,6 +2162,7 @@ def __init__(self, dbstate, view):
         Initialise the DotSvgGenerator class.
         """
         self.dbstate = dbstate
+        self.uistate = uistate
         self.database = dbstate.db
         self.view = view
 
@@ -2270,6 +2286,21 @@ def init_dot(self):
             self.write(' node [style=filled fontsize=%d fontcolor="%s"];\n'
                        % (fontsize, font_color))
         self.write('\n')
+        self.uistate.connect('font-changed', self.font_changed)
+        self.symbols = Symbols()
+        self.font_changed()
+
+    def font_changed(self):
+        self.font = config.get('utf8.selected-font')
+        dth_idx = self.uistate.death_symbol
+        if self.uistate.symbols:
+            self.bth = self.symbols.get_symbol_for_string(
+                self.symbols.SYMBOL_BIRTH)
+            self.dth = self.symbols.get_death_symbol_for_char(dth_idx)
+        else:
+            self.bth = self.symbols.get_symbol_fallback(
+                self.symbols.SYMBOL_BIRTH)
+            self.dth = self.symbols.get_death_symbol_fallback(dth_idx)
 
     def build_graph(self, active_person):
         """
@@ -2683,12 +2714,14 @@ def get_person_label(self, person):
         #       d. 1960-01-02 - DeathPlace
         if self.show_full_dates or self.show_places:
             if birth:
-                txt = _('b. %s') % birth  # short for "born" (could be "*")
+                txt = _('%s %s') % (self.bth, birth)
+                # line separator required only if we have both birth and death
                 label += txt
             if death:
                 if birth:
                     label += line_delimiter
-                txt = _('d. %s') % death  # short for "died" (could be "+")
+                #txt = _('d. %s') % death  # short for "died" (could be "+")
+                txt = _('%s %s') % (self.dth, death)
                 label += txt
         # 2) simple and on one line:
         #       (1890 - 1960)
@@ -2896,7 +2929,6 @@ def write(self, text):
         if self.dot:
             self.dot.write(text)
 
-
 #-------------------------------------------------------------------------
 #
 # CanvasAnimation

QuiltView/QuiltView.py

@@ -78,6 +78,8 @@
 from gramps.gen.utils.libformatting import FormattingHelper
 from gramps.gen.db import DbTxn
 from gramps.gui.display import display_url
+from gramps.gen.utils.symbols import Symbols
+from gramps.gen.utils.alive import probably_alive
 
 BORDER = 10
 HEIGHT = 18
@@ -110,15 +112,18 @@ def draw(self, canvas, cr):
         pass
 
 class PersonNode(Node):
-    def __init__(self, handle, layer, name, sex, ident, fg_color, bg_color):
+    def __init__(self, handle, layer, name, sex, ident,
+                 fg_color, bg_color, dead):
         Node.__init__(self, handle, layer)
         self.name = name
         self.sex = sex
         self.ident = ident
         self.fg_color = fg_color
         self.bg_color = bg_color
+        self.dead = dead
         self.parents = []
         self.children = []
+        self.symbols = Symbols()
 
     def add_main_family(self, family):
         self.parents.append(family)
@@ -127,12 +132,16 @@ def add_family(self, family):
         self.children.append(family)
 
     def draw(self, canvas, cr):
-        if self.sex == Person.MALE:
-            label = '\u2642 ' + self.name
-        elif self.sex == Person.FEMALE:
-            label = '\u2640 ' + self.name
+        if self.sex is not None:
+            sex_char = self.symbols.get_symbol_for_string(self.sex)
         else:
-            label = '\u2650 ' + self.name
+            sex_char = ''
+        if config.get('utf8.in-use'):
+            if self.sex is not None:
+                sex_char = self.symbols.get_symbol_for_string(self.sex)
+            else:
+                sex_char = ''
+        label = sex_char + ' ' + self.dead + ' ' + self.name
 
         layout = canvas.create_pango_layout(label)
         if is_quartz():
@@ -219,6 +228,8 @@ def __init__(self, pdata, dbstate, uistate, nav_group=0):
         self.dbstate = dbstate
         self.uistate = uistate
         self.dbstate.connect('database-changed', self.change_db)
+        self.uistate.connect('font-changed', self.rebuild)
+        self.uistate.connect('nameformat-changed', self.rebuild)
 
         self.additional_uis.append(self.additional_ui)
 
@@ -230,7 +241,7 @@ def __init__(self, pdata, dbstate, uistate, nav_group=0):
         self.layers = None
         self.people = []
         self.paths = []
-        self.format_helper = FormattingHelper(self.dbstate)
+        self.format_helper = FormattingHelper(self.dbstate, self.uistate)
         scheme = config.get('colors.scheme')
         self.home_person_color = config.get('colors.home-person')[scheme]
         self.timeout = None
@@ -239,6 +250,7 @@ def __init__(self, pdata, dbstate, uistate, nav_group=0):
         self.total = 0
         self.progress = None
         self.load = 0 # avoid to load the database twice
+        self.symbols = Symbols()
 
     def get_stock(self):
         """
@@ -275,6 +287,7 @@ def build_widget(self):
                                Gdk.EventMask.POINTER_MOTION_MASK |
                                Gdk.EventMask.SCROLL_MASK |
                                Gdk.EventMask.KEY_PRESS_MASK)
+        self.on_draw_ok = -1
 
         self.scrolledwindow.add(self.canvas)
 
@@ -549,11 +562,14 @@ def _entry_key_event(self, combobox):
                     count += 1
                     found = name[0]
                     self.name_store.append(name)
+            self.show_message(count)
+
+    def show_message(self, count=0):
             self.message.set_label(
                 _("You have %(filter)d filtered people, "
                   "%(count)d people shown on the tree "
                   "and %(total)d people in your database."
-                  % {'filter': count if search != "" else 0,
+                  % {'filter': count,
                      'count': len(self.plist),
                      'total': self.total}))
 
@@ -568,6 +584,7 @@ def _erase_name_selection(self, arg=None):
         """
         We erase the name in the entrybox
         """
+        self.name_combo.get_child().set_text(" ") # force entry change
         self.name_combo.get_child().set_text("")
 
     def add_bookmark(self, handle):
@@ -608,7 +625,6 @@ def center_on_node(self, obj, handle):
                 self.set_path_lines(self.people[handle])
 
     def goto_handle(self, handle=None):
-        self._erase_name_selection()
         self._clear_list_store()
         if self.load < 3: # avoid to load the database twice
             self.load = 3
@@ -647,6 +663,11 @@ def read_data(self, handle):
         self.progress.set_pass(message, self.total)
         todo = [(handle, 0)]
         count = 0
+        death_idx = self.uistate.death_symbol
+        if self.uistate.symbols:
+            death_char = self.symbols.get_death_symbol_for_char(death_idx)
+        else:
+            death_char = self.symbols.get_death_symbol_fallback(death_idx)
         while todo:
             handle, layer = todo.pop()
             count += 1 # persons + families
@@ -672,8 +693,10 @@ def read_data(self, handle):
                 death_event = get_death_or_fallback(self.dbstate.db, person)
                 if death_event:
                     fill, color = color_graph_box(False, sex)
+                    dead = death_char
                 else:
                     fill, color = color_graph_box(True, sex)
+                    dead = ' '
                 color = Gdk.color_parse(color)
                 fg_color = (float(color.red / 65535.0),
                             float(color.green / 65535.0),
@@ -689,8 +712,8 @@ def read_data(self, handle):
                                 float(color.green / 65535.0),
                                 float(color.blue / 65535.0))
 
-                people[handle] = PersonNode(handle, layer, name,
-                                            sex, ident, fg_color, bg_color)
+                people[handle] = PersonNode(handle, layer, name, sex, ident,
+                                            fg_color, bg_color, dead)
 
                 for fhandle in person.get_family_handle_list():
                     people[handle].add_main_family(fhandle)
@@ -746,15 +769,31 @@ def rebuild(self):
         if self.load < 3: # avoid to load the database twice
             return
         self.total = self.dbstate.db.get_number_of_people()
+        self._erase_name_selection()
         active = self.get_active()
         if active != "":
+            self.on_draw_ok = -1
             self.people, self.families, self.layers = self.read_data(active)
-            self.name_combo.get_child().set_text(" ") # force entry change
-            self.name_combo.get_child().set_text("")
             self.canvas.queue_draw()
             self.canvas.grab_focus()
-            self.center_on_node(None, active)
-            self.set_path_lines(active)
+            # We need to wait on_draw is called to draw path lines.
+            self.on_draw_ok = 0
+            GLib.timeout_add(int(200), self.after_on_draw_on_rebuild)
+
+    def after_on_draw_on_rebuild(self):
+        """
+        Loop to see if we can draw the path lines
+        """
+        if self.on_draw_ok == 0:
+            return True # continue to wait
+        #We can now set path lines. Nodes are totaly initialized.
+        active = self.get_active()
+        if active != "":
+            node = self.people[active]
+            self.center_on_node(None, node)
+            self.set_path_lines(node)
+        self.show_message()
+        return False
 
     def on_draw(self, canvas, cr):
         """
@@ -887,6 +926,8 @@ def on_draw(self, canvas, cr):
                                      (y + BORDER) * self.scale)
 
         #print ('draw time', clock()- c)
+        if self.on_draw_ok == 0:
+            self.on_draw_ok = 1 # We can now draw path lines
 
     def home(self, *obj):
         defperson = self.dbstate.db.get_default_person()
@@ -1716,6 +1757,8 @@ def set_path_lines(self, obj):
         """
         obj : either a person or a family
         """
+        if obj.x is None:
+            return
         self.paths = []
         _col = self._config.get
         color_path = _col('interface.quiltview-color-path')
@@ -1753,6 +1796,8 @@ def calculate_segment_length(self, obj):
         These coordinates include the name,
         the segment for the parents and the segment for the children
         """
+        if obj.x is None:
+            return
         if isinstance(obj, PersonNode):
             x1 = obj.x
             x2 = obj.x + obj.width

TimelinePedigreeView/TimelinePedigreeView.py

@@ -64,6 +64,7 @@
 from gramps.gui.utils import is_right_click
 from gramps.gen.constfunc import is_quartz
 from gramps.gen.const import GRAMPS_LOCALE as glocale
+from gramps.gen.utils.symbols import Symbols
 try:
     trans = glocale.get_addon_translator(__file__)
 except ValueError:
@@ -341,6 +342,7 @@ def __init__(self, pdata, dbstate, uistate, nav_group=0):
                                       nav_group)
 
         self.dbstate = dbstate
+        self.uistate = uistate
         self.dbstate.connect('database-changed', self.change_db)
 
         self.additional_uis.append(self.additional_ui)
@@ -389,7 +391,7 @@ def __init__(self, pdata, dbstate, uistate, nav_group=0):
         # Default - not show, for mo fast display hight tree
         self.show_unknown_peoples = self.cman.get('interface.show-unknown-people')
 
-        self.format_helper = FormattingHelper(self.dbstate)
+        self.format_helper = FormattingHelper(self.dbstate, self.uistate)
 
         # Depth of tree.
         self._depth = 1
@@ -404,6 +406,11 @@ def __init__(self, pdata, dbstate, uistate, nav_group=0):
         self.gtklayout_lines = []
         self.gtklayout_boxes = []
         self._birth_cache = {}
+        self.uistate.connect('font-changed', self.font_changed)
+
+    def font_changed(self):
+        self.format_helper.reload_symbols()
+        self.person_rebuild()
 
     def on_delete(self):
         """Save the configuration settings on shutdown."""