[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: |
Thu, 13 Feb 2003 10:46:24 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 03/02/13 10:46:23
Modified files:
. : TODO
gzz/view/buoy : buoymanager.py pagespanNodes.py
Log message:
Buoy sizes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.575&tr2=1.576&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.575 gzz/TODO:1.576
--- gzz/TODO:1.575 Thu Feb 13 10:31:02 2003
+++ gzz/TODO Thu Feb 13 10:46:23 2003
@@ -16,8 +16,6 @@
HT03 deadline:
tjl:
- the great buoy redesign
- - texture importances
- - buoy sizes / aspect ratios
- speedups
jvk:
- article: is buoy geometry and the reasons discussed?
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.36
gzz/gzz/view/buoy/buoymanager.py:1.37
--- gzz/gzz/view/buoy/buoymanager.py:1.36 Thu Feb 13 09:51:43 2003
+++ gzz/gzz/view/buoy/buoymanager.py Thu Feb 13 10:46:23 2003
@@ -1,4 +1,5 @@
from __future__ import nested_scopes
+import jarray
from gfx.util.misc import *
import gfx
@@ -19,6 +20,7 @@
#lineconn = GLRen.createLineConnector(.5, .5, .5, .5, 0, 0, 0, 0, 0, 1)
lineconn = GLRen.createSqFilletConnection(30, 1, .125, 6)
+size = jarray.zeros(2, 'f')
class RealBuoyManager(BuoyLinkListener):
"""Manage buoys through the new APIs
@@ -92,8 +94,19 @@
x+r, self.ctry,
.1)
self.vs.matcher.add(buoy, linkId)
- w = 450
- h = 450
+ print otherNode
+ obj = otherNode.getSize(linkId, otherAnchor, size)
+ w = size[0]
+ h = size[1]
+
+ # IMPORTANT STRATEGY POINT - MAKE AN INTERFACE &c
+ # Adjust buoy size to be reasonable.
+ if w > 800:
+ m = 800 / w
+ w *= m
+ h *= m
+
+
sca = 1
into = self.vs.orthoBoxCS(buoy, "V"+str(linkId), -100, -w*sca/2,
-h*sca/20,
.5, .5, w, h)
Index: gzz/gzz/view/buoy/pagespanNodes.py
diff -u gzz/gzz/view/buoy/pagespanNodes.py:1.36
gzz/gzz/view/buoy/pagespanNodes.py:1.37
--- gzz/gzz/view/buoy/pagespanNodes.py:1.36 Thu Feb 13 10:38:38 2003
+++ gzz/gzz/view/buoy/pagespanNodes.py Thu Feb 13 10:46:23 2003
@@ -72,7 +72,6 @@
def getSize(self, linkId, anchorSpan, wh):
sb = anchorSpan.getScrollBlock();
data = getScrollblockData(sb)
- layout = getLayout(sb)
wh[0] = data.layout.w
wh[1] = data.layout.h
return data
@@ -90,6 +89,12 @@
return into
class AnchorPageSpanNodeType(AbstractPageSpanNodeType):
+ def getSize(self, linkId, anchorSpan, wh):
+ data = getScrollblockData(anchorSpan.getScrollBlock())
+ extents = data.layout.getExtents(anchorSpan, None)
+ wh[0] = extents[2]
+ wh[1] = extents[3]
+ return data
def renderBuoy(self, vs, into, linkId, anchorSpan, data):
if 0:
dbg1 = vs.unitSqCS(into, "U")