[Gzz-commits] gzz gfx/demo/buoyoing.py gzz/view/buoy/buoymana...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/02/12 12:39:36

Modified files:
        gfx/demo       : buoyoing.py 
        gzz/view/buoy  : buoymanager.py 

Log message:
        pojoing

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/buoyoing.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/buoyoing.py
diff -u gzz/gfx/demo/buoyoing.py:1.21 gzz/gfx/demo/buoyoing.py:1.22
--- gzz/gfx/demo/buoyoing.py:1.21       Wed Feb 12 08:37:56 2003
+++ gzz/gfx/demo/buoyoing.py    Wed Feb 12 12:39:36 2003
@@ -61,16 +61,16 @@
     cy = cx.N(d.pan)
     cy.setText(str(y))
 
-def newNote(span, comment):
+def newNote(span, comment, transX=-150, transY=-100, commentY=30):
     paper = space.getHomeCell().h(d.d1, 1).N(d.d1)
     paper.setText('New paper')
     note = paper.N(d.contains)
-    setPan(note, 0,0)
+    setPan(note, transX,transY)
     space.getCellTexter().setEnfilade(
            note, pagespanNodes.makeEnf(span))
     note = note.N(d.contains)
     note.setText(comment)
-    setPan(note, -20,-30)
+    setPan(note, transX, commentY)
 
 xulinks = 1
 
@@ -107,7 +107,7 @@
     pg0 = pagescrolls[0]
     wholepage = pg0.getCurrent().subSpan(0,1)
     span = wholepage.subArea(50, 50, 400, 150)
-    newNote(span, 'Give\n a good\n  comment\n   over\n    here')
+    newNote(span, 'Give a good comment\nover here')
 
 
     scrollblockLinker.xuIndex = xuindexer
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.31 
gzz/gzz/view/buoy/buoymanager.py:1.32
--- gzz/gzz/view/buoy/buoymanager.py:1.31       Wed Feb 12 12:02:42 2003
+++ gzz/gzz/view/buoy/buoymanager.py    Wed Feb 12 12:39:36 2003
@@ -16,7 +16,9 @@
 
 print "LOADING BUOYMANAGER"
 
-lineconn = GLRen.createLineConnector(.5, .5, .5, .5, 0, 0, 0, 0, 0, 1)
+#lineconn = GLRen.createLineConnector(.5, .5, .5, .5, 0, 0, 0, 0, 0, 1)
+lineconn = GLRen.createSqFilletConnection(30, 1, .125, 6)
+
 
 class RealBuoyManager(BuoyLinkListener):
     """Manage buoys through the new APIs
@@ -76,7 +78,7 @@
        anchorUnit = self.vs.unitSqCS(anchorCS, "UN")
        anchorCenter = self.vs.translateCS(anchorUnit, "TR55", .5, .5)
        x = self.ctrx
-       r = self.ctry * 1.22
+       r = self.ctry * 1.2
        print "Linkreally: ",direction, otherNode
        if direction > 0:
            buoy = self.vs.coords.buoyOnCircle(0, anchorCenter,