[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./TODO gzz/view/buoy/buoymanager.py gzz/vie...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz ./TODO gzz/view/buoy/buoymanager.py gzz/vie... |
Date: |
Fri, 07 Feb 2003 05:50:00 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 03/02/07 05:49:59
Modified files:
. : TODO
gzz/view/buoy : buoymanager.py pagespanNodes.py
Log message:
Draw anchor-buoy line
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.566&tr2=1.567&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.566 gzz/TODO:1.567
--- gzz/TODO:1.566 Fri Feb 7 05:42:38 2003
+++ gzz/TODO Fri Feb 7 05:49:59 2003
@@ -16,17 +16,16 @@
HT03 deadline:
tjl:
- the great buoy redesign
- - make buoymanager draw connections
- buoy anchors in the right place
- make pagespan nodes show just the span, when
shown as buoys!
- - make buoys return the anchor
- figure out how scrollblock nodes shall be linked back
with right
coordsys
- renderBuoy returns anchor CS
- implement and test scrollblock nodes and zzstructure nodes.
- combine with mudyc's PP nodes.
+ + make buoys return the anchor
jvk:
- article: is buoy geometry and the reasons discussed?
projective lines easy, etc
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.11
gzz/gzz/view/buoy/buoymanager.py:1.12
--- gzz/gzz/view/buoy/buoymanager.py:1.11 Fri Feb 7 03:10:46 2003
+++ gzz/gzz/view/buoy/buoymanager.py Fri Feb 7 05:49:59 2003
@@ -12,6 +12,8 @@
print "LOADING BUOYMANAGER"
+lineconn = GLRen.createLineConnector(0,0)
+
class RealBuoyManager(BuoyLinkListener):
"""Manage buoys through the new APIs
@@ -74,7 +76,23 @@
into = self.nadir(into)
self.vs.activate(into)
self.cs[into] = (otherNode, linkId, otherAnchor)
- otherNode.renderBuoy(self.vs, into, linkId, otherAnchor, None)
+ otherAnchorCS = otherNode.renderBuoy(self.vs, into, linkId,
otherAnchor, None)
+ self.vs.map.put(GLCache.getCallList("""
+ PushAttrib ENABLE_BIT LINE_BIT
+ Disable TEXTURE_2D
+ LineWidth 5
+ Enable BLEND
+ Color 0 0 0 0.6
+ """))
+
+ self.vs.map.put(lineconn, anchorCS, otherAnchorCS)
+
+ # vs.map.put(filletconn, main_whole_cs, link_whole_cs)
+
+ self.vs.map.put(GLCache.getCallList("""
+ PopAttrib
+ """))
+
def key(self, key):
gzz.client.AbstractUpdateManager.chg()
Index: gzz/gzz/view/buoy/pagespanNodes.py
diff -u gzz/gzz/view/buoy/pagespanNodes.py:1.19
gzz/gzz/view/buoy/pagespanNodes.py:1.20
--- gzz/gzz/view/buoy/pagespanNodes.py:1.19 Fri Feb 7 03:15:03 2003
+++ gzz/gzz/view/buoy/pagespanNodes.py Fri Feb 7 05:49:59 2003
@@ -52,6 +52,7 @@
sb = anchorSpan.getScrollBlock();
pscv.place(makeEnf(sb.getCurrent()), vs, into,
.5, 200);
+ return into
size = jarray.zeros(3, 'f')
@@ -77,7 +78,7 @@
vs.coords.getSqSize(into, size)
print "SQ:", size[0], size[1]
- self.scale = size[1] / self.layout.h * .03
+ self.scale = size[1] / self.layout.h
self.ctr = vs.translateCS(into, "ORIGIN", .5 * size[0],
.5 * size[1])
self.scale = vs.scaleCS(self.ctr, "SCALE", self.scale, self.scale)
- [Gzz-commits] gzz ./TODO gzz/view/buoy/buoymanager.py gzz/vie...,
Tuomas J. Lukka <=