Changeset 1696

Timestamp:

12/15/06 19:22:48 (2 years ago)

Author:

eblot

Message:

RevtreePlugin:

• Add LogEnhancer? as a (demo) plugin
  
• Fix up Javascript issues with augmented 'circle' changesets
  
• All revtree changesets are now defined as SVG groups
  
• Add mark_first and mark_last changesets methods
  
• Change the default color of termination changesets
  

Files:

• revtreeplugin/0.10/enhancers (added)
• revtreeplugin/0.10/enhancers/logenhancer (added)
• revtreeplugin/0.10/enhancers/logenhancer/__init__.py (added)
• revtreeplugin/0.10/enhancers/logenhancer/logenhancer.py (added)
• revtreeplugin/0.10/enhancers/setup.cfg (added)
• revtreeplugin/0.10/enhancers/setup.py (added)
• revtreeplugin/0.10/revtree/enhancer.py (modified) (2 diffs)
• revtreeplugin/0.10/revtree/htdocs/js/svgtip.js (modified) (3 diffs)
• revtreeplugin/0.10/revtree/svgview.py (modified) (5 diffs)
• revtreeplugin/0.10/setup.py (modified) (2 diffs)

revtreeplugin/0.10/revtree/enhancer.py

@@ -57 +57 @@
-            # changeset(from another branch)
-            if firstchgset and firstchgset.clone:
-color 
-invert_color
+
+mark_first
-                (rev, path) = branch.source()
-                srcchg = enhancer.repos.changeset(rev)
@@ -70 +70 @@
-                if lastchgset.last:
-                    # tweak the color of this changeset
-kill
+mark_last
-        return enhancer
-

revtreeplugin/0.10/revtree/htdocs/js/svgtip.js

@@ -5 +5 @@
- * JTip is built on top of the very light weight jquery library.
- *
-
+
+
- */
-
@@ -42 +43 @@
-  var params = parseQuery( queryString );
-  if(params['width'] === undefined){params['width'] = 250};
-
+     
-  $(object).bind('click',function(){window.location = params['link']});
-  //$(object).css('cursor','pointer');
@@ -99 +100 @@
-   var elem;
-        for ( var n = 0; n < cnodes.length; n++ ) {
-circle
+g
-         elem = cnodes[n]
-         break;
-      } 
-      if ( cnodes[n].tagName == "rect" ) {
-         box = cnodes[n];
-         break;
-      } 

revtreeplugin/0.10/revtree/svgview.py

@@ -54 +54 @@
-    
-    colormap = { 'black':       (0,0,0),
+                 'white':       (0xff,0xff,0xff),
-                 'darkred':     (0x7f,0,0),
-                 'darkgreen':   (0,0x7f,0),
@@ -195 +196 @@
-        self._strokecolor = self._parent.strokecolor()
-        self._textcolor = SvgColor('black')
+        self._classes = ['svgchangeset']
-        
-    def set_shape(self, shape):
+        """Define the shape of the svg changeset [circle,square,hexa].
+           If the first letter is uppercase, the shape is augmented with
+           fancy lines.
+        """
-        self._shape = shape.lower()
-        self._enhance = shape[0] != self._shape[0]
-        
-
+
+
+
-        (self._fillcolor, self._strokecolor) = \
-            (self._strokecolor, self._fillcolor)
-        self._textcolor.invert()
-
-
-
+
+
+
+
+
+
+
-
-    def build(self):
-        SvgBaseChangeset.build(self)
+        widgets = []
-        if self._shape == 'circle':
-self._widget = 
+widgets.append(
-                                      self._radius, 
-                                      self._fillcolor,
-                                      self._strokecolor,
-
+)
-            if self._enhance:
-                (x,y) = self._position
-                (d,hr) = (self._radius*SQRT3/2, self._radius/2)
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                              
-        elif self._shape == 'square':
-
-
+
+
+
-                                    self._position[1]-size,
-                                    2*size, 2*size, 
-                                    self._fillcolor,
-                                    self._strokecolor,
-
+
+
+
+
-        elif self._shape == 'hexa':
-            (x,y) = self._position
@@ -248 +262 @@
-            pd.line(x-r,y-hr)
-            pd.line(x,y-r)
-self._widget = 
-    
-    self._parent.strokewidth(
+widgets.append(
+
+self._parent.strokewidth()
-        else:
-            raise AssertionError, \
-                  "unsupported changeset shape (%d)" % self._revision
-                  
-
-
-
-
+
+
+
+
+
+
+
-        
-        link = "%s/revtree_log/?rev=%d&link=%s/changeset/%d" \
-            % (self._parent.urlbase(), self._revision, 
-               self._parent.urlbase(), self._revision)
-self._widget, self._text
+g
-        if self._revision:
-            self._link.attributes['id'] = 'rev%d' % self._revision
-            self._link.attributes['title'] = 'Changeset %d' % self._revision
-svgtip'
+ '.join(self._classes)
-                    
-    def visible(self):
@@ -596 +613 @@
-       (such as a switch/branch creation, a merge operation, ...)"""
-       
-
+, classes=[]
-        self._parent = parent
-        self._source = srcChg
-        self._dest = dstChg
-        self._color = SvgColor(color)
+        self._classes = classes
-
-    def build(self):
@@ -710 +728 @@
-        self._widget.attributes['marker-%s' % (head and 'start' or 'end') ] = \
-            self._parent.svgarrow(self._color, head)
+        if self._classes:
+            self._widget.attributes['class'] = ' '.join(self._classes)
-
-    def extent(self):

revtreeplugin/0.10/setup.py

@@ -15 +15 @@
-from setuptools import setup, find_packages
-
-
-3
+Trac
+4
-
-setup (
@@ -27 +27 @@
-    url='http://trac-hacks.org/wiki/RevtreePlugin',
-    keywords = "trac revision svg graphical tree browser",
-
+, '*.enhancers.*'
-    package_data={
-        'revtree': [