/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to viz/treemodel.py

  • Committer: Gary van der Merwe
  • Date: 2007-09-24 09:47:47 UTC
  • mto: This revision was merged to the branch mainline in revision 289.
  • Revision ID: garyvdm@gmail.com-20070924094747-8szxksowwl3981l9
Fix a bug with the selection of a column for a broken line.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/treemodel.py
10
10
import gtk
11
11
import gobject
12
12
import pango
13
 
import re
14
 
from xml.sax.saxutils import escape
15
 
from bzrlib.revision import NULL_REVISION
16
13
 
17
 
from time import (strftime, localtime)
 
14
from bzrlib.osutils import format_date
18
15
 
19
16
REVID = 0
20
17
NODE = 1
21
18
LINES = 2
22
19
LAST_LINES = 3
23
20
REVNO = 4
24
 
SUMMARY = 5
25
 
MESSAGE = 6
26
 
COMMITTER = 7
27
 
TIMESTAMP = 8
28
 
REVISION = 9
29
 
PARENTS = 10
30
 
CHILDREN = 11
31
 
TAGS = 12
 
21
MESSAGE = 5
 
22
COMMITER = 6
 
23
TIMESTAMP = 7
 
24
REVISION = 8
 
25
PARENTS = 9
 
26
CHILDREN = 10
32
27
 
33
28
class TreeModel(gtk.GenericTreeModel):
34
29
 
36
31
    def __init__ (self, branch, line_graph_data):
37
32
        gtk.GenericTreeModel.__init__(self)
38
33
        self.revisions = {}
39
 
        self.branch = branch
40
 
        self.repository = branch.repository
 
34
        self.branch = branch
41
35
        self.line_graph_data = line_graph_data
42
 
 
43
 
        if self.branch.supports_tags():
44
 
            self.tags = self.branch.tags.get_reverse_tag_dict()
45
 
        else:
46
 
            self.tags = {}
47
 
 
48
 
    def add_tag(self, tag, revid):
49
 
        self.branch.tags.set_tag(tag, revid)
50
 
        try:
51
 
            self.tags[revid].append(tag)
52
 
        except KeyError:
53
 
            self.tags[revid] = [tag]
54
 
 
 
36
    
55
37
    def on_get_flags(self):
56
38
        return gtk.TREE_MODEL_LIST_ONLY
57
39
    
58
40
    def on_get_n_columns(self):
59
 
        return 13
 
41
        return 11
60
42
    
61
43
    def on_get_column_type(self, index):
62
44
        if index == REVID: return gobject.TYPE_STRING
64
46
        if index == LINES: return gobject.TYPE_PYOBJECT
65
47
        if index == LAST_LINES: return gobject.TYPE_PYOBJECT
66
48
        if index == REVNO: return gobject.TYPE_STRING
67
 
        if index == SUMMARY: return gobject.TYPE_STRING
68
49
        if index == MESSAGE: return gobject.TYPE_STRING
69
 
        if index == COMMITTER: return gobject.TYPE_STRING
 
50
        if index == COMMITER: return gobject.TYPE_STRING
70
51
        if index == TIMESTAMP: return gobject.TYPE_STRING
71
52
        if index == REVISION: return gobject.TYPE_PYOBJECT
72
53
        if index == PARENTS: return gobject.TYPE_PYOBJECT
73
54
        if index == CHILDREN: return gobject.TYPE_PYOBJECT
74
 
        if index == TAGS: return gobject.TYPE_PYOBJECT
75
55
        
76
56
    def on_get_iter(self, path):
77
57
        return path[0]
80
60
        return rowref
81
61
    
82
62
    def on_get_value(self, rowref, column):
83
 
        if len(self.line_graph_data) > 0:
84
 
            (revid, node, lines, parents,
85
 
             children, revno_sequence) = self.line_graph_data[rowref]
86
 
        else:
87
 
            (revid, node, lines, parents,
88
 
             children, revno_sequence) = (None, (0, 0), (), (),
89
 
                                          (), ())
 
63
        (revid, node, lines, parents,
 
64
         children, revno_sequence) = self.line_graph_data[rowref]
90
65
        if column == REVID: return revid
91
66
        if column == NODE: return node
92
67
        if column == LINES: return lines
98
73
            return []
99
74
        if column == REVNO: return ".".join(["%d" % (revno)
100
75
                                      for revno in revno_sequence])
101
 
 
102
 
        if column == TAGS: return self.tags.get(revid, [])
103
 
 
104
 
        if not revid or revid == NULL_REVISION:
105
 
            return None
 
76
        
106
77
        if revid not in self.revisions:
107
 
            revision = self.repository.get_revisions([revid])[0]
 
78
            revision = self.branch.repository.get_revisions([revid])[0]
108
79
            self.revisions[revid] = revision
109
80
        else:
110
81
            revision = self.revisions[revid]
111
82
        
112
83
        if column == REVISION: return revision
113
 
        if column == SUMMARY: return escape(revision.get_summary())
114
 
        if column == MESSAGE: return escape(revision.message)
115
 
        if column == COMMITTER: return re.sub('<.*@.*>', '', 
116
 
                                             revision.committer).strip(' ')
117
 
        if column == TIMESTAMP: 
118
 
            return strftime("%Y-%m-%d %H:%M", localtime(revision.timestamp))
119
 
 
 
84
        if column == MESSAGE: return revision.message.split("\n")[0]
 
85
        if column == COMMITER: return revision.committer
 
86
        if column == TIMESTAMP: return format_date(revision.timestamp,
 
87
                                                   revision.timezone)
 
88
    
120
89
    def on_iter_next(self, rowref):
121
90
        if rowref < len(self.line_graph_data) - 1:
122
91
            return rowref+1