[Gzz-commits] gzz ./TODO doc/uml/Makefile metacode/mputils.py...

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    03/01/16 04:47:26

Modified files:
        .              : TODO 
        doc/uml        : Makefile 
        metacode       : mputils.py pegboard.py umldoc.py umlhelper.mp 
                         umlrst.py umltool.py 

Log message:
        Suppressing umltool screen output, metacode errors are still fully 
shown. TODO

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.515&tr2=1.516&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/uml/Makefile.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/mputils.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/pegboard.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umldoc.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlhelper.mp.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlrst.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umltool.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.515 gzz/TODO:1.516
--- gzz/TODO:1.515      Thu Jan 16 00:59:53 2003
+++ gzz/TODO    Thu Jan 16 04:47:25 2003
@@ -21,6 +21,9 @@
     vegai:
        - Implement PEG on how "make test" output should be cleaned once
           the PEG is accepted.   
+       - make the quick o-o fix for metacode/uml* and metacode/mputils;
+          put the code into classes; umltool needs a lot of re-design and
+          this will make it easier :) 
        + "make committable": remove CLASSES and all object files,
          compile normal and GL and test both normal and GL;
          if either fails any test not marked failing, fail HARD.
@@ -35,10 +38,6 @@
        + genimages: allow using different formats for generated images.
          Specifically, need to be able to use gzipped S3TC files; 
          should be a LOT faster to load.
-    benja:
-        + DimDecorator's text is broken on GL-side. Like text seems to be
-          to tight to be readable. Probably problems with coordinate
-          systems? Other texts works fine.
     tuukkah:
        - get someone to try our main demos:
            - paper
@@ -91,6 +90,7 @@
        + remove Media*Stream and other span serialization functionality
           (PEG 1004)
        + get rid of non-random urn-5s in Ids!!!
+       + fix the "nasty thing where a '<' should be a '<='" in linebreaker 
     mudyc:
        - [PP] 
             - alt-ctrl-x for save without diff
@@ -148,17 +148,27 @@
        + speed up tests: currently too much execfile().. could
          pre-compile and exec compiled in the same globals().
     humppake:
-       - think about technical guidelines for possible field test 
-          prototype of mindmap applitude (fall 2003?), check alternatives
        - umltool paper dl 15.2., but should actually be done in the late Jan
        - enhancing umltool
-           - write all errors and warnings in some place so it's easy to
-             look for them and fix. Current output is incredibly bogously
-             spewy.
-           - warn properly about diagrams referencing classes that are
-             not there. For instance, gzz.DimManager is referenced but
-             does not exist. Maybe show jlink in some special color
-             (bright red?) if false.
+           - a lot of things, which would be easier to handle with better
+              design, so these will be fixed on the second implementation 
+              round with more object-oriented design
+               - wait vegai for basic o-o fix
+               - mputils.settings class for handling global settings
+                - mputils.dbg for handling screen output and logging
+                Two of the following would be fixed with re-design of 
+                jlink class.
+                - fix jlink focus matching problem, currently matching sees no 
+                  difference e.g. between View (Java class) and 
+                  Gzz_Frontend_Java.gen.html
+               - write all errors and warnings in some place so it's easy to
+                 look for them and fix. Current output is incredibly bogously
+                 spewy.
+               - warn properly about diagrams referencing classes that are
+                 not there. For instance, gzz.DimManager is referenced but
+                 does not exist. Maybe show jlink in some special color
+                 (bright red?) if false.
+           Probably also the following would be easier after better design...
             - reST documents where diagram is explicitly included
               using the directive, should also be included into diagram
               (and highlighted when shown in current document)
@@ -166,9 +176,8 @@
               the first header-tag. This could be enough for javadoc and
               other, but in reST this should be possible to overdrive by
               own directive.
-           - better way to store setting, maybe distinct class
            - diagram names should be unique, currently this can't be
-              easily tested, make something to it
+              easily tested, make something for it
            - Fix UML sequence diagram: now you have to put
              seqobjects *after* the sequence...
             + Highlighting should be optional. This should be in UML source,
@@ -242,6 +251,8 @@
            - load in separate thread
            - discard high-rez images when not in use
            - use lower resolution first, lazily load better
+       - create an additional focus object into umltool; "a teared
+          round edge around focused object"
        - keymapping in both directions
        - xupdf: distorted multi-page PDF view with xu links
            - overall goal: USEFUL when article writing starts
Index: gzz/doc/uml/Makefile
diff -u gzz/doc/uml/Makefile:1.9 gzz/doc/uml/Makefile:1.10
--- gzz/doc/uml/Makefile:1.9    Wed Dec 18 06:37:00 2002
+++ gzz/doc/uml/Makefile        Thu Jan 16 04:47:26 2003
@@ -6,7 +6,7 @@
        echo $(TARGETS)
 
 clean:
-       rm -f *.gen.1 *.gen.2 *.gen.3 *.log *.gen.html *.gen.uml *.gen.mp 
*.gen.png *.gen.log
+       rm -f *.gen.1 *.gen.2 *.gen.3 *.log *.gen.html *.gen.uml *.gen.mp 
*.gen.png *.gen.log *.gen.refers
 
 %.html: %.uml %.mp
        MPINPUTS=../../metacode python ../../metacode/uml.py $*
Index: gzz/metacode/mputils.py
diff -u gzz/metacode/mputils.py:1.1 gzz/metacode/mputils.py:1.2
--- gzz/metacode/mputils.py:1.1 Mon Jan 13 08:39:38 2003
+++ gzz/metacode/mputils.py     Thu Jan 16 04:47:26 2003
@@ -97,13 +97,14 @@
     return [mp_node]
 
 def mp2png(prefix, scale=1.0):
+    print "mputils: compiling uml", prefix
     if settings.has_key('tmpdir'):
         path = _slashify(settings['tmpdir'])
     else: path = '';
         
     syscmd = "/usr/bin/mpost --file-line-error-style "+\
              "--interaction nonstopmode "+\
-             "%s" % prefix+".3 |grep -B2 \!";
+             "%s" % prefix+".3 >/dev/null";
 
     if settings.has_key('tmpdir'):
         os.system("cd "+path+";"+syscmd)
@@ -111,7 +112,13 @@
         os.system(syscmd)
 
     log = open(path+prefix+".log").read()
-    print "LINKS"
+    if log.find("\n!") != -1:
+        print log
+        print "mputils: summary of found errors (the full log is shown above):"
+        print "mputils: ======================================================"
+        os.system("cat "+path+prefix+".log |grep -B3 -A3 \!")
+    
+    #print "LINKS"
     links = []
 
     log = log.replace("\n","") # mpost splits lines awkwardly in the log.
@@ -126,16 +133,17 @@
            bbox = els
 
     if (bbox):
-        print "BBOX", bbox
+        #print "BBOX", bbox
         bbox = psbbox(bbox[1:])
         list = bbox.pstopnm(scaling)
 
     scaling = int(scaling / scale)
-    print "PSTOPNM: ", list
-    syscmd = ("pstopnm -verbose "+" ".join(list)+" <"+path+prefix\
-              +""".1 | pnmscale -reduce %s |
-              pnmtopng >"""%scaling+path+prefix+".png")
-    print "Command:",syscmd
+    #print "PSTOPNM: ", list
+    #-verbose
+    syscmd = ("pstopnm "+" ".join(list)+" <"+path+prefix\
+              +""".1 2>/dev/null | pnmscale -reduce %s 2>/dev/null|
+              pnmtopng >"""%scaling+path+prefix+".png 2>/dev/null")
+    #print "Command:",syscmd
     os.system(syscmd)
 
 def roundDown(x):
Index: gzz/metacode/pegboard.py
diff -u gzz/metacode/pegboard.py:1.27 gzz/metacode/pegboard.py:1.28
--- gzz/metacode/pegboard.py:1.27       Mon Jan 13 08:39:38 2003
+++ gzz/metacode/pegboard.py    Thu Jan 16 04:47:26 2003
@@ -139,7 +139,7 @@
 #converts all rsts' in pegdirs and parses pegs' meta information
 #from pegs' main files
 for pegdir in pegdirs:
-    print 'Processing PEG %s' % (pegdir)
+    print 'pegboard: processing PEG %s' % (pegdir)
 
     peg = {'authors': [], 'status': undefined, 'topic': pegdir, 
'stakeholders': [], 
            'last-modified': '', 'dir': pegdir, 'files': '', 'html': '', 'rst': 
'',
@@ -390,7 +390,7 @@
 
 
 #converts pegboard.rst, reads results into buffer and opens pegboard.html for 
writing
-print 'Generating '+pegroot+'/pegboard.gen.html'
+print 'pegboard: generating '+pegroot+'/pegboard.gen.html'
 args = '-stg --stylesheet '+css+' '+pegroot+'/pegboard.rst 
'+pegroot+'/pegboard.gen.html'
 
 #saves using contexts for diagrams
@@ -403,13 +403,13 @@
 if os.path.isfile(pegroot+'/.cvsignore'):
     cvsignorefile = open(pegroot+'/.cvsignore', 'r')
     if cvsignorefile.read().find('pegboard.gen.html') == -1:
-        print 'Updating '+pegroot+'/.cvsignore'
+        print 'pegboard: updating '+pegroot+'/.cvsignore'
         cvsignorefile.close()
         cvsignorefile = open(pegroot+'/.cvsignore', 'a')
         cvsignorefile.write('pegboard.gen.html\n')
     cvsignorefile.close()
 else:
-    print 'Creating '+pegroot+'/.cvsignore'    
+    print 'pegboard: creating '+pegroot+'/.cvsignore'    
     cvsignorefile = open(pegroot+'/.cvsignore', 'w')
     cvsignorefile.write('pegboard.gen.html\n')
     cvsignorefile.close()
@@ -422,11 +422,11 @@
         cvsignorefile = open(pegroot+'/'+peg['dir']+'/.cvsignore', 'a')
         for ignore in peg['cvsignore']:
             if oldignore.find(ignore) == -1:
-                print 'Updating '+pegroot+'/'+peg['dir']+'/.cvsignore'
+                print 'pegboard: updating 
'+pegroot+'/'+peg['dir']+'/.cvsignore'
                 cvsignorefile.write(ignore+'\n')
         cvsignorefile.close()
     else:
-        print 'Creating '+pegroot+'/'+peg['dir']+'/.cvsignore'        
+        print 'pegboard: creating '+pegroot+'/'+peg['dir']+'/.cvsignore'       
 
         cvsignorefile = open(pegroot+'/'+peg['dir']+'/.cvsignore', 'w')
         for ignore in peg['cvsignore']:
             cvsignorefile.write(ignore+'\n')
Index: gzz/metacode/umldoc.py
diff -u gzz/metacode/umldoc.py:1.14 gzz/metacode/umldoc.py:1.15
--- gzz/metacode/umldoc.py:1.14 Mon Jan 13 08:39:38 2003
+++ gzz/metacode/umldoc.py      Thu Jan 16 04:47:26 2003
@@ -83,11 +83,11 @@
        rstfiles = _rstFiles(path)
 
         for rstfile in rstfiles:
-           print "Embed",mputils._slashify(path)+rstfile
+           print "umldoc: embedding into",mputils._slashify(path)+rstfile
             umlrst.embed_diagrams(mputils._slashify(path)+rstfile)
 
     elif os.path.isfile(path) or os.path.isfile(path+'.rst'):
-       print "Embed",path
+       print "umldoc: embedding into",path
         umlrst.embed_diagrams(path)
 
 def rst2html(path):
@@ -117,7 +117,7 @@
         try:
             run_embed(path)
         except umltool.umlException, e:
-            print 'umlException exception occurred:', e.value
+            print "umldoc: umlException exception occurred:", e.value
             break
 
     if not loop: break
Index: gzz/metacode/umlhelper.mp
diff -u gzz/metacode/umlhelper.mp:1.18 gzz/metacode/umlhelper.mp:1.19
--- gzz/metacode/umlhelper.mp:1.18      Tue Jan  7 04:06:10 2003
+++ gzz/metacode/umlhelper.mp   Thu Jan 16 04:47:26 2003
@@ -389,6 +389,10 @@
     fill p withcolor (0.8, 0.9, 1);
     showjlinksize(name, p);
 enddef;
+vardef showlinkerror(expr name, p) =
+    fill p withcolor (0, 1, 1);
+    showjlinksize(name, p);
+enddef;
 vardef showfocus(expr name, p) =
     fill p withcolor (9, 0.8, 0.7);
     showjlinksize(name, p);
Index: gzz/metacode/umlrst.py
diff -u gzz/metacode/umlrst.py:1.14 gzz/metacode/umlrst.py:1.15
--- gzz/metacode/umlrst.py:1.14 Mon Jan 13 08:39:38 2003
+++ gzz/metacode/umlrst.py      Thu Jan 16 04:47:26 2003
@@ -141,7 +141,7 @@
                                +name+".gen.uml")):
                 prefix = name + ".gen"
             else: prefix = name
-            print "Embedding %s into %s" % (prefix, path)
+            print "umlrst: embedding %s into %s" % (prefix, path)
 
             context_name = name+"_"+path.replace("/","_")
             if context_name.endswith(".gen"):
@@ -178,7 +178,7 @@
         out.write(html)
         out.close()
     else:
-       print "Strange: no file for",path+".gen.html -- ignoring"
+       print "!umlrst: strange: no file for",path+".gen.html -- ignoring"
 
 def embed_implicit(oldpath, name, path):
     """Terrible kludge to embed named diagram into path document
@@ -222,7 +222,7 @@
                 old_prefix = name + ".gen"
             else: old_prefix = name
 
-            print "Embedding %s into %s" % (name, path)
+            print "umlrst: embedding %s into %s" % (name, path)
 
             context_name = name+"_"+path.replace("/","_")
             if context_name.endswith(".gen"):
Index: gzz/metacode/umltool.py
diff -u gzz/metacode/umltool.py:1.20 gzz/metacode/umltool.py:1.21
--- gzz/metacode/umltool.py:1.20        Mon Jan 13 08:39:38 2003
+++ gzz/metacode/umltool.py     Thu Jan 16 04:47:26 2003
@@ -91,7 +91,7 @@
        self.jlink = None
        for el in l:
            self.handleContained(el)
-       print self.jlink
+       #print self.jlink
     def handleContained(self, el):
        if el[0] == "jlink":
            jlink = el[1:]
@@ -116,6 +116,7 @@
             if settings.has_key('focus') and (\
                   settings['focus'].find("_"+self.name.replace(".", "_")+".") 
!= -1 or \
                   settings['focus'].find("_"+self.name.replace(".", 
"_")+"_package") != -1):
+                
                 return 'showfocus("'+self.jlink+'", ('+box+'));'
             return 'showjlink("'+self.jlink+'", ('+box+'));'
        return ""
@@ -265,7 +266,7 @@
 
 class mpclass(namedEl):
     def __init__(self, var, s, l):
-       print "mpclass:",s,l
+       #print "mpclass:",s,l
        toks = s.split(" ");
        s = toks[0]
        self.stereo = None
@@ -331,7 +332,7 @@
 
 class mppackage(namedEl):
     def __init__(self, var, s, l):
-       print "mppackage:",s,l
+       #print "mppackage:",s,l
        self.var = var or s
        self.name = s
        self.docontents(l)
@@ -353,7 +354,7 @@
 
 class simpleEl(namedEl):
     def __init__(self, var, s, l):
-       print "mp simple element:",self, s,l
+       #print "mp simple element:",self, s,l
        self.var = var or s
        self.name = s
        self.docontents(l)
@@ -662,7 +663,7 @@
        (w,s) = matchRemove("^\s*(\w+)\s*", s)
        key = w.group(1)
        type = self.getType(key)
-       print "Internal: ", type
+       #print "Internal: ", type
        element = type(None, containerName + " " + s, e[1:])
        self.extras.append(element)
 
@@ -678,7 +679,7 @@
            jlinkpackage = s
            return None
        type = self.getType(key)
-       print type
+       #print type
        return type(name, s, e[1:])
 
     def getType(self,key):
@@ -723,14 +724,14 @@
     def __init__(self, els):
        self.name = re.match('^"(.*)"$', els[0]).group(1)
        self.corners = [float(e) for e in els[1:]]
-       print "JLINK INIT: ",self.name
+       #print "JLINK INIT: ",self.name
     def mapCorners(self, mapper):
-       print "UnMapped: ", self.corners
+       #print "UnMapped: ", self.corners
        self.corners = [int(e) for e in (
            mapper(self.corners[0], self.corners[1]) +
            mapper(self.corners[2], self.corners[3]) 
        )]
-       print "Mapped: ", self.corners
+       #print "Mapped: ", self.corners
     def target(self): 
         """Returns target file of the jlink with
            path from the current directory."""
@@ -799,7 +800,7 @@
     mputils.mp2png(prefix_out, scale)
 
     log = open(path+prefix_out+".log").read()
-    print "LINKS"
+    #print "LINKS"
     links = []
 
     log = log.replace("\n","") # mpost splits lines awkwardly in the log.
@@ -810,7 +811,7 @@
            bbox = els
        else:
            links.append(jlink(els))
-    print links
+    #print links
     bbox = mputils.psbbox(bbox[1:])
     for link in links: link.mapCorners(bbox.mapPoint)