[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py view/PageSp...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py view/PageSp... |
Date: |
Sat, 09 Aug 2003 08:31:16 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Tuomas J. Lukka <address@hidden> 03/08/09 08:31:16
Modified files:
org/fenfire/bin: fenpdf10.py
org/fenfire/view: PageSpanLayout.java
Log message:
Rming crud
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageSpanLayout.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.7
fenfire/org/fenfire/bin/fenpdf10.py:1.8
--- fenfire/org/fenfire/bin/fenpdf10.py:1.7 Sat Aug 9 07:50:08 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Sat Aug 9 08:31:16 2003
@@ -347,18 +347,6 @@
if (dbg): p("SET DOUBLE ", h0, h1, w0, w1, s0, s1, buoywidth0,
buoywidth1)
- vs.coords.setOrthoBoxParams(self.into1, 1,
- ctrx - .5*w0*s0,
- 20,
- s0, s0,
- w0, h0)
-
- vs.coords.setOrthoBoxParams(self.into2, 1,
- -50,
- h-h1+50,
- s1, s1,
- w1/s1, h1/s1)
-
vs.coords.setOrthoBoxParams(self.buoyinto1, 1,
ctrx - .5*buoywidth0, 0 + .5*h0 - .5*buoyheight0,
s0, s0,
@@ -378,8 +366,6 @@
def place(self, vs):
self.height = vs.size.height
self.width = vs.size.width
- self.into1 = vs.orthoBoxCS(0, "FocusFrame1", 0, 0, 0, 0, 0, 0, 0)
- self.into2 = vs.orthoBoxCS(0, "FocusFrame2", 0, 0, 0, 0, 0, 0, 0)
self.buoyinto1 = vs.orthoBoxCS(0, "BuoyFrame1", 0, 0, 0, 0, 0, 0, 0)
self.buoyinto2 = vs.orthoBoxCS(0, "BuoyFrame2", 0, 0, 0, 0, 0, 0, 0)
@@ -391,8 +377,8 @@
self.context.renderContext(vs, 0)
- return [(self.mainbox1, self.into1, self.buoyinto1),
- (self.mainbox2, self.into2, self.buoyinto2)]
+ return [(self.mainbox1, None, self.buoyinto1),
+ (self.mainbox2, None, self.buoyinto2)]
def mouse(self, ev, oldvs):
if dbg: p(ev)
@@ -489,46 +475,6 @@
vob.AbstractUpdateManager.chg()
return 1
-
-
-class SingleGeometer(DoubleGeometer):
- def __init__(self, mgr, context, nodeview):
- DoubleGeometer.__init__(self, mgr, context, nodeview)
-
- def _doset(self, vs):
- w,h = vs.size.width, vs.size.height
-
- w0 = w*3/4
- h0 = h - 40
- s0 = 1
-
- ctrx = w/2
-
- buoywidth0 = w0 * 1.2
- buoyheight0 = h0 * 1.2
-
- if (dbg): p("SET SINGLE ", h0, w0, s0, buoywidth0)
-
- vs.coords.setOrthoBoxParams(self.into1, 1,
- ctrx - .5*w0*s0,
- 20,
- s0, s0,
- w0, h0)
-
- vs.coords.setOrthoBoxParams(self.buoyinto1, 1,
- ctrx - .5*buoywidth0, 0 + .5*h0 - .5*buoyheight0,
- s0, s0,
- buoywidth0/s0, buoyheight0/s0)
-
- def place(self, vs):
- self.height = vs.size.height
- self.width = vs.size.width
- self.into1 = vs.orthoBoxCS(0, "FocusFrame1", 0, 0, 0, 0, 0, 0, 0)
- self.buoyinto1 = vs.orthoBoxCS(0, "BuoyFrame1", 0, 0, 0, 0, 0, 0, 0)
-
- self._doset(vs)
-
- return [(self.into1, self.buoyinto1)]
Index: fenfire/org/fenfire/view/PageSpanLayout.java
diff -u fenfire/org/fenfire/view/PageSpanLayout.java:1.18
fenfire/org/fenfire/view/PageSpanLayout.java:1.19
--- fenfire/org/fenfire/view/PageSpanLayout.java:1.18 Sat Jul 19 07:12:03 2003
+++ fenfire/org/fenfire/view/PageSpanLayout.java Sat Aug 9 08:31:16 2003
@@ -107,7 +107,11 @@
Object span = enf.sub(p, p+1).getList().get(0);
if(span instanceof PageSpan)
span = ((PageSpan)span).getPage(0);
- page(p, (PageImageSpan)span, spanImageFactory);
+ if(span instanceof PageImageSpan)
+ page(p, (PageImageSpan)span, spanImageFactory);
+ else
+ p("PAGESPAN: NOT PAGE OR PAGEIMAGESPAN??? "+span);
+ // XXX what if not?
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py view/PageSp...,
Tuomas J. Lukka <=