Improvements in fanchartwidget, fixed to use as gramplet, preparation for a config dialog
svn: r20287
This commit is contained in:
Benny Malengier
parent
232e76520e
commit
8dc900e046
@ -1,7 +1,9 @@
|
||||
#
|
||||
# Gramps - a GTK+/GNOME based genealogy program
|
||||
#
|
||||
# Copyright (C) 2000-2006 Donald N. Allingham
|
||||
# Copyright (C) 2001-2007 Donald N. Allingham, Martin Hawlisch
|
||||
# Copyright (C) 2009 Douglas S. Blank
|
||||
# Copyright (C) 2012 Benny Malengier
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@ -50,6 +52,7 @@ from gen.display.name import displayer as name_displayer
|
||||
import gen.lib
|
||||
import gui.utils
|
||||
from gui.ddtargets import DdTargets
|
||||
from gen.utils.alive import probably_alive
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
@ -85,12 +88,13 @@ class FanChartWidget(Gtk.DrawingArea):
|
||||
NORMAL = 1
|
||||
EXPANDED = 2
|
||||
|
||||
def __init__(self, generations, context_popup_callback=None):
|
||||
def __init__(self, generations, dbstate, context_popup_callback=None):
|
||||
"""
|
||||
Fan Chart Widget. Handles visualization of data in self.data.
|
||||
See main() of FanChartGramplet for example of model format.
|
||||
"""
|
||||
GObject.GObject.__init__(self)
|
||||
self.dbstate = dbstate
|
||||
self.translating = False
|
||||
self.last_x, self.last_y = None, None
|
||||
self.connect("button_release_event", self.on_mouse_up)
|
||||
@ -126,6 +130,7 @@ class FanChartWidget(Gtk.DrawingArea):
|
||||
self.center_xy = [0, 0] # distance from center (x, y)
|
||||
self.set_generations(self.generations)
|
||||
self.center = 50 # pixel radius of center
|
||||
self.gen_color = True
|
||||
self.layout = self.create_pango_layout('cairo')
|
||||
self.layout.set_font_description(Pango.FontDescription("sans 8"))
|
||||
self.set_size_request(120,120)
|
||||
@ -213,7 +218,7 @@ class FanChartWidget(Gtk.DrawingArea):
|
||||
if state in [self.NORMAL, self.EXPANDED]:
|
||||
self.draw_person(cr, gender_code(male),
|
||||
text, start, stop,
|
||||
generation, state, parents, child)
|
||||
generation, state, parents, child, person)
|
||||
cr.set_source_rgb(1, 1, 1) # white
|
||||
cr.move_to(0,0)
|
||||
cr.arc(0, 0, self.center, 0, 2 * math.pi)
|
||||
@ -242,20 +247,29 @@ class FanChartWidget(Gtk.DrawingArea):
|
||||
PangoCairo.show_layout(cr, self.layout)
|
||||
|
||||
def draw_person(self, cr, gender, name, start, stop, generation,
|
||||
state, parents, child):
|
||||
state, parents, child, person):
|
||||
"""
|
||||
Display the piece of pie for a given person. start and stop
|
||||
are in degrees.
|
||||
are in degrees. Gender is indication of father position or mother
|
||||
position in the chart
|
||||
"""
|
||||
alloc = self.get_allocation()
|
||||
x, y, w, h = alloc.x, alloc.y, alloc.width, alloc.height
|
||||
start_rad = start * math.pi/180
|
||||
stop_rad = stop * math.pi/180
|
||||
if self.gen_color:
|
||||
r,g,b = self.GENCOLOR[generation % len(self.GENCOLOR)]
|
||||
if gender == gen.lib.Person.MALE:
|
||||
r *= .9
|
||||
g *= .9
|
||||
b *= .9
|
||||
else:
|
||||
try:
|
||||
alive = probably_alive(person, self.dbstate.db)
|
||||
except RuntimeError:
|
||||
alive = False
|
||||
backgr, border = gui.utils.color_graph_box(alive, person.gender)
|
||||
r, g, b = gui.utils.hex_to_rgb(backgr)
|
||||
radius = generation * self.pixels_per_generation + self.center
|
||||
# If max generation, and they have parents:
|
||||
if generation == self.generations - 1 and parents:
|
||||
|
||||
@ -535,7 +535,7 @@ class GuiGramplet(object):
|
||||
labels = Gtk.VBox(True)
|
||||
options = Gtk.VBox(True)
|
||||
hbox.pack_start(labels, False, True, 0)
|
||||
hbox.pack_start(options, True)
|
||||
hbox.pack_start(options, True, True, 0)
|
||||
topbox.pack_start(hbox, False, False, 0)
|
||||
for item in self.pui.option_order:
|
||||
label = Gtk.Label(label=item + ":")
|
||||
@ -543,7 +543,7 @@ class GuiGramplet(object):
|
||||
labels.pack_start(label, True, True, 0)
|
||||
options.pack_start(self.pui.option_dict[item][0], True, True, 0) # widget
|
||||
save_button = Gtk.Button(stock=Gtk.STOCK_SAVE)
|
||||
topbox.pack_end(save_button, False, False)
|
||||
topbox.pack_end(save_button, False, False, 0)
|
||||
save_button.connect('clicked', self.pui.save_update_options)
|
||||
frame.add(topbox)
|
||||
frame.show_all()
|
||||
|
||||
@ -68,7 +68,7 @@ class FanChartGramplet(Gramplet):
|
||||
self.set_tooltip(_("Click to expand/contract person\nRight-click for options\nClick and drag in open area to rotate"))
|
||||
self.generations = 6
|
||||
self.format_helper = FormattingHelper(self.dbstate)
|
||||
self.gui.fan = FanChartWidget(self.generations,
|
||||
self.gui.fan = FanChartWidget(self.generations, self.dbstate,
|
||||
context_popup_callback=self.on_popup)
|
||||
self.gui.fan.format_helper = self.format_helper
|
||||
# Replace the standard textview with the fan chart widget:
|
||||
|
||||
@ -75,7 +75,7 @@ class FanChartView(NavigationView):
|
||||
return 'Person'
|
||||
|
||||
def build_widget(self):
|
||||
self.fan = FanChartWidget(self.generations,
|
||||
self.fan = FanChartWidget(self.generations, self.dbstate,
|
||||
context_popup_callback=self.on_popup)
|
||||
self.fan.format_helper = self.format_helper
|
||||
self.scrolledwindow = Gtk.ScrolledWindow(None, None)
|
||||
@ -141,8 +141,8 @@ class FanChartView(NavigationView):
|
||||
Returns True if a person has parents.
|
||||
"""
|
||||
if person:
|
||||
m = self.get_parent(person, "female")
|
||||
f = self.get_parent(person, "male")
|
||||
m = self.get_parent(person, False)
|
||||
f = self.get_parent(person, True)
|
||||
return not m is f is None
|
||||
return False
|
||||
|
||||
@ -157,9 +157,9 @@ class FanChartView(NavigationView):
|
||||
return True
|
||||
return False
|
||||
|
||||
def get_parent(self, person, gender):
|
||||
def get_parent(self, person, father):
|
||||
"""
|
||||
Get the father if gender == "male", or get mother otherwise.
|
||||
Get the father of the family if father == True, otherwise mother
|
||||
"""
|
||||
if person:
|
||||
parent_handle_list = person.get_parent_family_handle_list()
|
||||
@ -167,7 +167,7 @@ class FanChartView(NavigationView):
|
||||
family_id = parent_handle_list[0]
|
||||
family = self.dbstate.db.get_family_from_handle(family_id)
|
||||
if family:
|
||||
if gender == "male":
|
||||
if father:
|
||||
person_handle = gen.lib.Family.get_father_handle(family)
|
||||
else:
|
||||
person_handle = gen.lib.Family.get_mother_handle(family)
|
||||
@ -194,7 +194,7 @@ class FanChartView(NavigationView):
|
||||
# name, person, parents, children
|
||||
for (n,p,q,c) in self.fan.data[current - 1]:
|
||||
# Get father's details:
|
||||
person = self.get_parent(p, "male")
|
||||
person = self.get_parent(p, True)
|
||||
if person:
|
||||
name = name_displayer.display(person)
|
||||
else:
|
||||
@ -209,7 +209,7 @@ class FanChartView(NavigationView):
|
||||
self.fan.angle[current][parent][3] = self.fan.COLLAPSED
|
||||
parent += 1
|
||||
# Get mother's details:
|
||||
person = self.get_parent(p, "female")
|
||||
person = self.get_parent(p, False)
|
||||
if person:
|
||||
name = name_displayer.display(person)
|
||||
else:
|
||||
@ -235,12 +235,16 @@ class FanChartView(NavigationView):
|
||||
person = self.dbstate.db.get_person_from_handle(person_handle)
|
||||
if person:
|
||||
try:
|
||||
EditPerson(self.dbstate, self.uistate, [], person)
|
||||
EditPerson(self.dbstate, self.uistate, [], person,
|
||||
callback=self.edit_callback)
|
||||
except WindowActiveError:
|
||||
pass
|
||||
return True
|
||||
return False
|
||||
|
||||
def edit_callback(self, *args):
|
||||
self.update()
|
||||
|
||||
def copy_person_to_clipboard_cb(self, obj, person_handle):
|
||||
"""Renders the person data into some lines of text and puts that into the clipboard"""
|
||||
person = self.dbstate.db.get_person_from_handle(person_handle)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user