[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire ./Makefile org/fenfire/demo/buoyoing.py...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] fenfire ./Makefile org/fenfire/demo/buoyoing.py... |
Date: |
Sun, 27 Apr 2003 04:05:32 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Tuomas J. Lukka <address@hidden> 03/04/27 04:05:32
Modified files:
. : Makefile
org/fenfire/demo: buoyoing.py
org/fenfire/view: PageScrollView2D.java
Added files:
org/fenfire/view/buoy: TransclusionConnector.java
Log message:
Starting to work with pagespans...
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/Makefile.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageScrollView2D.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/TransclusionConnector.java?rev=1.1
Patches:
Index: fenfire/Makefile
diff -u fenfire/Makefile:1.13 fenfire/Makefile:1.14
--- fenfire/Makefile:1.13 Fri Apr 25 07:30:31 2003
+++ fenfire/Makefile Sun Apr 27 04:05:31 2003
@@ -1,29 +1,35 @@
-# This is a Makefile for documentation script.
+# This is a Makefile for documentation script +
+# speedups
+#
# For a real makefile use build.xml instead of this.
-all:
- ant compile 2>&1 | sed 's/ *\[javac\] *//g'
+all: java
+# ant compile 2>&1 | sed 's/ *\[javac\] *//g'
+
TEST=org/
LDLIB=LD_LIBRARY_PATH=../libvob/src/jni
-CLASSPATH=-cp
../storm-depends/cryptix-jce-provider.jar:../fenfire/build:../storm/CLASSES:../alph/CLASSES:../libvob/CLASSES:../fenfire-depends/libvob.jar:../fenfire-depends/jython.jar:../fenfire-depends/jena.jar:../fenfire-depends/icu4j.jar:../fenfire-depends/xerces.jar
+CLASSPATH=../storm-depends/cryptix-jce-provider.jar:../fenfire/build:../storm/CLASSES:../alph/CLASSES:../libvob/CLASSES:../fenfire-depends/libvob.jar:../fenfire-depends/jython.jar:../fenfire-depends/jena.jar:../fenfire-depends/icu4j.jar:../fenfire-depends/xerces.jar
PYTHONPATH=-Dpython.path=../fenfire-depends/jythonlib.jar:../fenfire-depends/jython.jar:../fenfire-depends/pythonlib.jar:.:../libvob:../alph
+java:
+ javac -d build -classpath $(CLASSPATH) `find org -name '*.java'`
+
test:
- $(LDLIB) java $(CLASSPATH) $(PYTHONPATH) org.python.util.jython
org/fenfire/test/test.py -Dvob.api=gl $(DBG) $(TEST)
+ $(LDLIB) java -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython
org/fenfire/test/test.py -Dvob.api=gl $(DBG) $(TEST)
DEMO=org/fenfire/demo/buoyoing.py
rundemo:
- $(LDLIB) java $(CLASSPATH) $(PYTHONPATH) org.python.util.jython
../libvob/rundemo.py $(DBG) $(DEMO)
+ $(LDLIB) java -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython
../libvob/rundemo.py $(DBG) $(DEMO)
BENCH=org.fenfire.swamp.bench.graph
bench:
- $(LDLIB) java $(CLASSPATH) $(PYTHONPATH) org.python.util.jython
../libvob/bench/mark.py $(BENCH)
+ $(LDLIB) java -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython
../libvob/bench/mark.py $(BENCH)
.PHONY: docs
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.29
fenfire/org/fenfire/demo/buoyoing.py:1.30
--- fenfire/org/fenfire/demo/buoyoing.py:1.29 Sat Apr 26 04:41:03 2003
+++ fenfire/org/fenfire/demo/buoyoing.py Sun Apr 27 04:05:32 2003
@@ -124,7 +124,7 @@
ppAct.assocNotes(note1, 1, note2)
#scrollblockLinker.xuIndex = xuindexer
-scrollblockLinker.xulinkPageSpanNodeType =
ff.view.buoy.pagespanNodes.AnchorPageSpanNodeType(scrollblockLinker)
+#scrollblockLinker.xulinkPageSpanNodeType =
ff.view.buoy.pagespanNodes.AnchorPageSpanNodeType(scrollblockLinker)
# For now, no transclusions there
#scrollblockLinker.transclusionPageSpanNodeType = None
@@ -155,11 +155,20 @@
#connector = ff.view.buoy.PPConnector(fen, paperviewonly)
#connector.hackForTesting = 1
-connector = ff.view.buoy.PPConnector(fen, irregu)
+
+ppconnector = ff.view.buoy.PPConnector(fen, irregu)
+tconnector = ff.view.buoy.TransclusionConnector(fen)
+
+pagescroll2d = ff.view.IrregularViewportView2D(
+ ff.view.PaperView2D(vob.putil.demowindow.w,
+ ff.view.PageScrollView2D()))
+
+tconnector.normalNodeNodeType = ff.view.buoy.NodeType2D(irregu)
+tconnector.pageImageScrollNodeType = ff.view.buoy.NodeType2D(pagescroll2d)
class Scene(vob.buoy.buoymanager.RealBuoyManager):
def __init__(self):
- vob.buoy.buoymanager.RealBuoyManager.__init__(self, mainNode,
[connector])
+ vob.buoy.buoymanager.RealBuoyManager.__init__(self, mainNode,
[ppconnector, tconnector])
currentScene = Scene()
Index: fenfire/org/fenfire/view/PageScrollView2D.java
diff -u fenfire/org/fenfire/view/PageScrollView2D.java:1.2
fenfire/org/fenfire/view/PageScrollView2D.java:1.3
--- fenfire/org/fenfire/view/PageScrollView2D.java:1.2 Thu Apr 24 15:55:36 2003
+++ fenfire/org/fenfire/view/PageScrollView2D.java Sun Apr 27 04:05:32 2003
@@ -42,8 +42,8 @@
PageScrollBlock block = (PageScrollBlock)plane;
PageSpanLayout layout =
new PageSpanLayout((PageSpan)block.getCurrent());
- int paper2box = vs.coords.invert(box2paper);
- int paper2screen = vs.coords.concat(paper2box, box2screen);
+ int paper2box = vs.invertCS(box2paper, "PGSVinv");
+ int paper2screen = vs.concatCS(box2screen, "PGSVconc", paper2box);
layout.place(vs, paper2screen, 1, 1, box2screen);
}