[Gzz-commits] navidoc doc/syntax.rst navidoc/mp/uml.py

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/06/12 05:06:35

Modified files:
        doc            : syntax.rst 
        navidoc/mp     : uml.py 

Log message:
        bigpackage update

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/doc/syntax.rst.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: navidoc/doc/syntax.rst
diff -u navidoc/doc/syntax.rst:1.6 navidoc/doc/syntax.rst:1.7
--- navidoc/doc/syntax.rst:1.6  Wed Jun 11 06:36:20 2003
+++ navidoc/doc/syntax.rst      Thu Jun 12 05:06:35 2003
@@ -2,6 +2,41 @@
 UML syntax
 ============
 
+.. UML:: testikaavio
+
+   bigpackage foobar
+       class foo "abstract"
+
+               fields
+                       barfield1
+                       barfield2
+                       barfieldn
+               methods
+                       barmethod1
+                       barmethod2
+                       barmethodn
+
+       package fof
+       
+       bigpackage jaajaa
+               package jeejee
+
+       class fooboo "abstract"
+
+               fields
+                       barfield1
+                       barfield2
+                       barfieldn
+               methods
+                       barmethod1
+                       barmethod2
+                       barmethodn
+
+   ---
+   horizontally(50, hor_c, foo, fooboo, fof);
+   horizontally(200, hor_d, fof, jeejee);
+
+
 Elements
 ========
 
@@ -154,7 +189,7 @@
 .. UML:: elements-dep
 
    class foo
-       dep bar "dependency"
+       dep "use" bar
    class bar
    ---
    horizontally(100, hor_c, foo, bar);
@@ -162,7 +197,7 @@
 Syntax::
 
    class foo
-       dep bar "dependency"
+       dep "use" bar 
    class bar
    ---
    horizontally(100, hor_c, foo, bar);
Index: navidoc/navidoc/mp/uml.py
diff -u navidoc/navidoc/mp/uml.py:1.18 navidoc/navidoc/mp/uml.py:1.19
--- navidoc/navidoc/mp/uml.py:1.18      Wed Jun 11 06:36:21 2003
+++ navidoc/navidoc/mp/uml.py   Thu Jun 12 05:06:35 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: uml.py,v 1.18 2003/06/11 10:36:21 humppake Exp $
+# $Id: uml.py,v 1.19 2003/06/12 09:06:35 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -339,21 +339,51 @@
            """
        return self.repl(s)
 
-class mpbigpackage(navidoc.mp.SimpleElement):
+class mpbigpackage(navidoc.mp.MetapostElement):
     key = 'bigpackage'
+    def __init__(self, var, toks, list):
+       dbg("mpbigpackaget: %s %s %s" % (var, toks, list))
+        self.elements = []
+       self.var = var or toks[0]
+       self.name = toks[0]
+       self.do_contents(list)
+
+        if self.link != None:
+            self.link.bbox = ('bboxmeasuredpic(%s)' % (self.var))
+    def handle_contained(self, element):
+        element = config.element_list.parse_element(element)
+        config.element_list.list.append(element)
+        if hasattr(element, 'var') and element.var:
+            self.elements.append(element.var)
     def setup_code(self):
        s = """
            picture %%.titl.pict;
            %%.titl.pict = classTitle("%name%");
-           addto %%.titl.pict doublepath (bbox %%.titl.pict) withpen 
currentpen;
-
+           addto %%.titl.pict doublepath 
(urcorner(%%.titl.pict)--lrcorner(%%.titl.pict)) withpen currentpen;
+           addto %%.titl.pict doublepath 
(ulcorner(%%.titl.pict)--llcorner(%%.titl.pict)) withpen currentpen;
+           addto %%.titl.pict doublepath 
(ulcorner(%%.titl.pict)--urcorner(%%.titl.pict)) withpen currentpen;
            unknownpicmeasurements(%%);
            picmeasurements(%%.titl);
            %%.titl.sw = %%.nw;
            """
        return self.repl(s)
     def draw_code(self):
-       s = """
+        s = ''
+        if self.elements:
+#            elements_sw_x = '(xpart llcorner(' + '.pict), xpart 
llcorner('.join(self.elements) + '.pict))'
+#            elements_sw_y = '(ypart llcorner(' + '.pict), ypart 
llcorner('.join(self.elements) + '.pict))'
+#            elements_ne_x = '(xpart urcorner(' + '.pict), xpart 
urcorner('.join(self.elements) + '.pict))'
+#            elements_ne_y = '(ypart urcorner(' + '.pict), ypart 
urcorenr('.join(self.elements) + '.pict))'
+            elements_sw_x = 'xpart ' + '.sw, xpart '.join(self.elements) + 
'.sw'
+            elements_sw_y = 'ypart ' + '.sw, ypart '.join(self.elements) + 
'.sw'
+            elements_ne_x = 'xpart ' + '.ne, xpart '.join(self.elements) + 
'.ne'
+            elements_ne_y = 'ypart ' + '.ne, ypart '.join(self.elements) + 
'.ne'
+            
+            s = """
+            %%.sw = (min("""+elements_sw_x+"""), min("""+elements_sw_y+""")) - 
(10,10);
+            %%.ne = (max("""+elements_ne_x+"""), max("""+elements_ne_y+""")) + 
(10,10);
+            """
+        s = s + """
             draw bboxmeasuredpic(%%);
             drawmeasuredpic(%%.titl);
             """