Changeset 1652

Timestamp:

12/05/06 18:17:05 (2 years ago)

Author:

eblot

Message:

RevtreePlugin:

• Add 'timeline' view (along with a user option to select the graph style)
  
• Fix up several issues w/ enhancers when selected branches have been filtered out
  
  

Files:

• revtreeplugin/0.10/revtree/enhancer.py (modified) (1 diff)
• revtreeplugin/0.10/revtree/logenhancer.py (modified) (2 diffs)
• revtreeplugin/0.10/revtree/svgview.py (modified) (8 diffs)
• revtreeplugin/0.10/revtree/templates/revtree.cs (modified) (2 diffs)
• revtreeplugin/0.10/revtree/web_ui.py (modified) (8 diffs)

revtreeplugin/0.10/revtree/enhancer.py

@@ -61 +61 @@
-        for (srcchg, dstchg) in self._creations:
-            svgsrcbr = self._svgrevtree.svgbranch(branchname=srcchg.branchname)
+            if svgsrcbr is None:
+                continue
-            svgsrcchg = svgsrcbr.svgchangeset(srcchg)
-            svgdstbr = self._svgrevtree.svgbranch(branchname=dstchg.branchname)
+            if svgdstbr is None:
+                continue
-            svgdstchg = svgdstbr.svgchangeset(dstchg)
-            op = SvgOperation(self._svgrevtree, svgsrcchg, svgdstchg, '#5faf5f')

revtreeplugin/0.10/revtree/logenhancer.py

@@ -54 +54 @@
-        for branch in self._repos.branches().values():
-            svgbranch = self._svgrevtree.svgbranch(branch=branch)
+            if not svgbranch:
+                continue
-            for chgset in branch.changesets():
-                msg = chgset.changeset.message.lower()
@@ -94 +96 @@
-        for (srcchg, dstchg) in self._creations:
-            svgsrcbr = self._svgrevtree.svgbranch(branchname=srcchg.branchname)
+            svgdstbr = self._svgrevtree.svgbranch(branchname=dstchg.branchname)
+            if not svgsrcbr or not svgdstbr:
+                continue
-            svgsrcchg = svgsrcbr.svgchangeset(srcchg)
-            svgdstbr = self._svgrevtree.svgbranch(branchname=dstchg.branchname)
-            svgdstchg = svgdstbr.svgchangeset(dstchg)
-            op = SvgOperation(self._svgrevtree, svgsrcchg, svgdstchg, '#5faf5f')

revtreeplugin/0.10/revtree/svgview.py

@@ -39 +39 @@
-    length = text and len(text) or 0
-    return (1+length)*(UNIT/2.5)
+
+def plink(url):
+    """Create a javascript link to replace the parent window content"""
+    return "javascript:window.parent.location.href='%s'" % url
-
-            
@@ -247 +251 @@
-                              str(self._revision), FONT_SIZE, FONT_NAME)
-        self._text.attributes['style'] = 'fill:%s' % self._textcolor.rgb()
-
-
+plink(
+)
-                              elements=[self._widget, self._text])
-        if self._revision:
@@ -298 +302 @@
-                              self._position[1]+self._h/2+UNIT/6,
-                              self._title, FONT_SIZE, FONT_NAME)
-
-
+plink(
+)
-                              elements=[self._widget, self._text])
-        
@@ -308 +312 @@
-class SvgBranch(object):
-    
-mod
+styl
-        self._parent = parent
-        self._branch = branch
@@ -319 +323 @@
-        self._source = branch.source()
-        try:
-mod
+styl
-        except AttributeError:
-mode: %s" % mod
+style: %s" % styl
-        pw = None
-        transitions = []
@@ -737 +741 @@
-        self._enhancers = []
-        # Trunk branches
-
+
+
-        # Dictionnary of branch widgets (branches as keys)
-        self._svgbranches = {}
@@ -800 +805 @@
-        
-    def create(self, revisions=None, branches=None, authors=None, 
-mod
+styl
-        if revisions is not None:
-            self.revrange = revisions
@@ -818 +823 @@
-                if not [a for a in authors for x in b.authors() if a == x]:
-                    continue
-mod
+styl
-            self._svgbranches[b] = svgbranch
-            revisions.extend([c.rev for c in b.changesets()])

revtreeplugin/0.10/revtree/templates/revtree.cs

@@ -9 +9 @@
-
-<script type="text/javascript">
-"limrev"
-"limperiod"
+'limrev'
+'limperiod'
-  var updateActionFields = function() {
-    enableControl('period', limperiod.checked);
@@ -77 +77 @@
-
-   <li>
+    <fieldset id="treestyle">
+     <legend>Style</legend>
+      <div class="field">
+       <input type="radio" id="compact" name="treestyle" value="compact" <?cs 
+         if:revtree.treestyle == "compact" ?> checked="checked"<?cs /if ?>/>
+        <label for="compact">Compact</label>
+        <input type="radio" id="timeline" name="treestyle" value="timeline" <?cs 
+          if:revtree.treestyle == "timeline" ?> checked="checked"<?cs /if ?>/>
+         <label for="compact">Timeline</label>
+      </div>
+   </li>
+
+   <li>
-    <fieldset id="options">
-     <legend>Options</legend>

revtreeplugin/0.10/revtree/web_ui.py

@@ -31 +31 @@
-    """User revtree properties"""
-    
-
+, style
-        """Initialize the instance with default values"""
-        self.env = env
@@ -47 +47 @@
-        self['period'] = 14
-        self['limits'] = 'limperiod'
+        self['treestyle'] = style
-        self['branch'] = self.anybranch
-        self['author'] = authname or self.anyauthor
@@ -54 +55 @@
-        """Returns the sequence of supported fields"""
-        return [ 'revmin', 'revmax', 'period', 'branch', 'author',
-
+, 'treestyle'
-        
-    def load(self, session):
@@ -127 +128 @@
-        return int(self['hideterm']) == 1
-        
+    def get_style(self):
+        return self['treestyle']
+        
-    def __getitem__(self, name):
-        """getter (dictionary)"""
@@ -172 +176 @@
-        revstore = RevtreeStore(self.env, req.authname, \
-                                (self.oldest, self.youngest),
-
+
+
-        revstore.load(req.session)
-        revstore.populate(req.args)
@@ -197 +202 @@
-            enhancer = Enhancer(repos, svgrevtree)
-            svgrevtree.add_enhancer(enhancer)
-            # FIXME
-            mode = 'compact'
-            #self.env.log.debug("REVISIONS %s" % [revstore.revrange])
-            #self.env.log.debug("BRANCH %s" % revstore.get_branches())
@@ -205 +208 @@
-            svgrevtree.create(revstore.revrange, revstore.get_branches(), 
-                              revstore.get_authors(), 
-
+
+
-            svgrevtree.build()
-            svgrevtree.render()
@@ -310 +314 @@
-        else:
-            self.timebase = None
+        self.style = self.config.get('revtree', 'style', 'compact')
+        if self.style not in [ 'compact', 'timeline']:
+            raise TracError, "Unsupported style: %s" % self.style
-
-    def _get_periods(self):