[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp...
From: |
Tuomas J. Lukka |
Subject: |
[ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp... |
Date: |
Wed, 20 Aug 2003 12:34:34 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Tuomas J. Lukka <address@hidden> 03/08/20 12:34:33
Modified files:
org/fenfire/bin: fenpdf10.py
org/fenfire/fenpdf: fenpdfcontext.py
org/fenfire/spanimages/gl: papermakers.py
org/fenfire/view: CanvasView2D.java PaperView2D.java
org/fenfire/view/buoy: AbstractMainNode2D.java
AbstractNodeType2D.java
FisheyeMainNode2D.java MainNode2D.java
PPConnector.java
Added files:
org/fenfire/fenpdf/appearance: __init__.py papers.py views.py
Log message:
Refactoring
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/papers.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/views.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/papermakers.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PaperView2D.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/FisheyeMainNode2D.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/MainNode2D.java.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPConnector.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.53
fenfire/org/fenfire/bin/fenpdf10.py:1.54
--- fenfire/org/fenfire/bin/fenpdf10.py:1.53 Wed Aug 20 01:41:12 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Wed Aug 20 12:34:33 2003
@@ -168,49 +168,24 @@
else:
ff.fenpdf.demospace.createEmptySpace(fen, myalph, treetime, ppActions)
-spanImageFactory = ff.spanimages.gl.DefaultSpanImageFactory(
- ff.spanimages.gl.PageScrollBlockImager())
-spanImageFactory.paperMaker = ff.spanimages.gl.papermakers.fancyBlur()
-
-
-### Node functions
-textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
-pagenodeview = ff.view.PageNodeView(fen.txtfunc, spanImageFactory)
-
-# accursed text
-accursed_text = ff.view.TextNodeView(fen.txtfunc, textstyle,
java.awt.Color.red)
-accursed_dispatcher = ff.view.DispatchingNodeView(fen.txtfunc, accursed_text,
pagenodeview)
-accursed_function = ff.swamp.CachedPureNodeFunction(150, fen.constgraph,
accursed_dispatcher)
-
-# normal text
-normal_text = ff.view.TextNodeView(fen.txtfunc, textstyle,
java.awt.Color.black)
-normal_dispatcher = ff.view.DispatchingNodeView(fen.txtfunc, normal_text,
pagenodeview)
-normal_function = ff.swamp.CachedPureNodeFunction(150, fen.constgraph,
normal_dispatcher)
-
-multiplexerNodeFunction = ff.swamp.MultiplexerNodeFunction(normal_function,
accursed_function)
-
-view = ff.view.CanvasView2D(fen, multiplexerNodeFunction)
-view.cull = 1
-paperview = ff.view.PaperView2D(view)
-selection = ff.view.AreaSelectingView2D(paperview)
-irregu = ff.view.IrregularViewportView2D(selection)
-
-ff.view.buoy.NodeType2D.effigy = 0
-ff.view.buoy.NodeType2DFull.effigy = 0
-
-
-context = Context(w, fen, ppActions, multiplexerNodeFunction,
spanImageFactory, FILE)
-context.ppView = irregu
-context.pageView = None
-context.states.alph = myalph
-context.states.view2d.irregu = irregu
+# Default controls for main view
+## see
http://himalia.it.jyu.fi/ffdoc/fenfire/pegboard/fenpdf_v1_spec_1--tjl/peg.gen.html
and 'Bindings'
+mainMouse = vob.mouse.MouseMultiplexer()
+
+# print "APP",dir(ff.fenpdf.appearance)
+# import org.fenfire.fenpdf.appearance.papers
+papers = ff.fenpdf.appearance.papers.Papers()
+views = ff.fenpdf.appearance.views.Views(fen, papers, mainMouse)
+
+
+context = Context(w, fen, ppActions, views, FILE)
+
ff.view.buoy.MainNode2D.fen = fen
ff.view.buoy.AbstractMainNode2D.context = context
-# Default controls for main view
-## see
http://himalia.it.jyu.fi/ffdoc/fenfire/pegboard/fenpdf_v1_spec_1--tjl/peg.gen.html
and 'Bindings'
-mainMouse = vob.mouse.MouseMultiplexer()
+
+
# With button 1
mainMouse.setListener(1, 0,'Moving the pan around or the node if accursed.', \
actions.CanvasNodePressListener(context, \
@@ -270,33 +245,10 @@
-mainNode = ff.view.buoy.MainNode2D(planeHome, irregu, mainMouse)
-mainNode2 = ff.view.buoy.MainNode2D(planeHome, irregu, mainMouse)
-
-### Connectors
-# PP(Canvas)
-ppconnector = ff.view.buoy.PPConnector(fen, irregu,
- ff.view.buoy.MainNode2D.MainNode2DFactory(1, mainMouse),
- multiplexerNodeFunction)
-# Transclusion
-tconnector = ff.view.buoy.TransclusionConnector(fen, multiplexerNodeFunction)
-pagescroll2d = ff.view.PageScrollView2D(spanImageFactory)
-context.states.view2d.pageview_without_surrounding = pagescroll2d
-pagescroll2d = ff.view.AreaSelectingView2D(pagescroll2d)
-context.states.view2d.pageview = pagescroll2d
-
-tconnector.normalNodeNodeType = ff.view.buoy.NodeType2D(irregu,
- ff.view.buoy.MainNode2D.MainNode2DFactory(1, mainMouse))
-tconnector.pageImageScrollNodeType = ff.view.buoy.NodeType2DFull(pagescroll2d,
\
- ff.view.buoy.FisheyeMainNode2D.FisheyeMainNode2DFactory(mainMouse))
-
-# Treetime
-ttconnector = ff.view.buoy.TTConnector(fen, TREETIME.follows)
-ttconnector.normalNodeNodeType = tconnector.normalNodeNodeType
-ttconnector.pageImageScrollNodeType = tconnector.pageImageScrollNodeType
-
-
-connectors = [ppconnector, tconnector, ttconnector]
+mainNode = ff.view.buoy.MainNode2D(planeHome,
+ views.getCanvasView2D(), mainMouse)
+mainNode2 = ff.view.buoy.MainNode2D(planeHome,
+ views.getCanvasView2D(), mainMouse)
class EventHandler:
@@ -406,7 +358,7 @@
self.doubleGeometer = ff.view.buoy.doublegeometer.DoubleGeometer()
self.buoyManager = vob.buoy.buoymanager.MultiBuoyManager(
- [mainNode, mainNode2], connectors, self.eventHandler,
+ [mainNode, mainNode2], views.getConnectors(), self.eventHandler,
self.doubleGeometer,
ff.fenpdf.fenpdfgeometry.FenPDFGeometryConfiguration())
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.17
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.18
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.17 Wed Aug 20 01:41:12 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Wed Aug 20 12:34:33 2003
@@ -122,13 +122,13 @@
self.multiplexer.setMultiplexerNodes(set)
class ContextStates:
- def __init__(self, fen, ppAction, spanImageFactory, nodeMultiplexer):
+ def __init__(self, fen, ppAction, views):
self.clean()
- self.cursor = Cursor(fen, nodeMultiplexer)
+ self.cursor = Cursor(fen, views.getMultiplexerNodeContentFunction())
self.ppActions = ppAction
self.fen = fen
- self.spanImageFactory = spanImageFactory
self.pageview = None
+ self.views = views
# buoymanager, set with setBuoymanager()
self.buoymanager = None
@@ -344,10 +344,10 @@
class Context(ff.view.lava.ContextNodeView.Context,
ff.view.buoy.AbstractMainNode2D.Context,
ff.view.lava.TextHandler.Context):
- def __init__(self, win, fen, pp, nv, spanImageFactory, filename):
+ def __init__(self, win, fen, pp, views, filename):
global w
w = win
- self.states = ContextStates(fen, pp, spanImageFactory, nv)
+ self.states = ContextStates(fen, pp, views)
self.keys = KeyHandler(self.states)
self.mousemenu = MouseMenu(self.states)
self.filename = filename
Index: fenfire/org/fenfire/spanimages/gl/papermakers.py
diff -u fenfire/org/fenfire/spanimages/gl/papermakers.py:1.11
fenfire/org/fenfire/spanimages/gl/papermakers.py:1.12
--- fenfire/org/fenfire/spanimages/gl/papermakers.py:1.11 Mon Aug 18
05:44:03 2003
+++ fenfire/org/fenfire/spanimages/gl/papermakers.py Wed Aug 20 12:34:33 2003
@@ -28,6 +28,15 @@
from org.fenfire.spanimages.gl import PlainPaperMaker
+# A list of paper makers, as tuples:
+# (function, description)
+#
+# Separated by whether the fancy bg is shown or not.
+#
+# The function is set to None for those that are
+# not available.
+whitePaperMakers = []
+fancyPaperMakers = []
class OffsetPaperMill(PaperMill):
def __init__(self, mill, offset):
@@ -46,6 +55,7 @@
return OffsetPaperMill(paperMill, paperOffset)
return paperMill
+
def white(w = None, paperMill = None, paperOffset = 0,
filter = ""):
return PlainPaperMaker(1, """
@@ -55,21 +65,68 @@
""" + filter, """
""", None)
-def fancyBlend(paperMill = None, paperOffset = 0,
- filter = ""):
+whitePaperMakers.append( (white, "White background") )
+
+# The programs here are best-first
+
+blurProgram = None
+
+if GL.hasExtension("GL_ARB_fragment_program"):
+ blurProgram = GL.createProgram("""!!ARBfp1.0
+ # Computes color = tex0 * tex1 with
+ # tex0 blurred near non-white parts of tex1.
+
+ TEMP coord1;
+ MOV coord1, fragment.texcoord[1];
+ MOV coord1.w, 3.8;
+
+ # Filter the 'text' texture with and without blurring
+ TEMP tex1, tex1b;
+ TEX tex1, coord1, texture[1], 2D;
+ TXB tex1b, coord1, texture[1], 2D;
+
+ TEMP coord0;
+ MOV coord0, fragment.texcoord[0];
+
+ # Map blurred 'text' texture intensity to background LOD bias
+ # as follows:
+ # 1 -> no bias
+ # 0 -> large bias
+ DP4 coord0.w, {-6,-6,-6,18}, tex1b;
+
+ # Filter background texture with the proper LOD bias
+ TEMP tex0;
+ TXB tex0, coord0, texture[0], 2D;
+
+ MUL result.color, tex0, tex1;
+ END
+ """)
+
+def fancyBlur(paperMill = None, paperOffset = 0):
paperMill = getPaperMill(paperMill, paperOffset)
- return PlainPaperMaker(1,
- """
- ActiveTexture TEXTURE0
- TexEnv TEXTURE_ENV TEXTURE_ENV_MODE REPLACE
- Enable TEXTURE_2D
- ActiveTexture TEXTURE1
- TexEnv TEXTURE_ENV TEXTURE_ENV_MODE MODULATE
- Enable TEXTURE_2D
- %s
- Disable BLEND
- ActiveTexture TEXTURE0
- """ % filter, "", None, paperMill)
+ if not blurProgram:
+ print "Fancy blurring is not possible without GL_ARB_fragment_program."
+ print "Punting to Fancy halo"
+ return fancyHalo(paperMill)
+
+ if paperMill == None:
+ paperMill = PaperMill.getInstance()
+
+ return PlainPaperMaker(1, """
+ BindProgram FRAGMENT_PROGRAM_ARB %s
+ Enable FRAGMENT_PROGRAM_ARB
+ Disable REGISTER_COMBINERS_NV
+ Disable BLEND
+ """ % blurProgram.getProgId(),
+ """
+ """, [blurProgram], paperMill)
+
+if blurProgram:
+ b = fancyBlur
+else:
+ b = None
+
+fancyPaperMakers.append( (b, "Blurring background under text") )
class HaloPaperMaker_2tex(PlainPaperMaker):
def __init__(self, paperMill):
@@ -138,56 +195,30 @@
paperMill = PaperMill.getInstance()
return HaloPaperMaker_2tex(paperMill)
-blurProgram = None
-
-if GL.hasExtension("GL_ARB_fragment_program"):
- blurProgram = GL.createProgram("""!!ARBfp1.0
- # Computes color = tex0 * tex1 with
- # tex0 blurred near non-white parts of tex1.
-
- TEMP coord1;
- MOV coord1, fragment.texcoord[1];
- MOV coord1.w, 3.8;
-
- # Filter the 'text' texture with and without blurring
- TEMP tex1, tex1b;
- TEX tex1, coord1, texture[1], 2D;
- TXB tex1b, coord1, texture[1], 2D;
-
- TEMP coord0;
- MOV coord0, fragment.texcoord[0];
-
- # Map blurred 'text' texture intensity to background LOD bias
- # as follows:
- # 1 -> no bias
- # 0 -> large bias
- DP4 coord0.w, {-6,-6,-6,18}, tex1b;
-
- # Filter background texture with the proper LOD bias
- TEMP tex0;
- TXB tex0, coord0, texture[0], 2D;
+if GL.hasExtension("GL_NV_register_combiners"):
+ b = fancyHalo
+else:
+ b = None
- MUL result.color, tex0, tex1;
- END
- """)
+fancyPaperMakers.append( (b, "Brightening (bleaching) background under text") )
-def fancyBlur(paperMill = None, paperOffset = 0):
+def fancyBlend(paperMill = None, paperOffset = 0,
+ filter = ""):
paperMill = getPaperMill(paperMill, paperOffset)
- if not blurProgram:
- print "Fancy blurring is not possible without GL_ARB_fragment_program."
- print "Punting to Fancy halo"
- return fancyHalo(paperMill)
+ return PlainPaperMaker(1,
+ """
+ ActiveTexture TEXTURE0
+ TexEnv TEXTURE_ENV TEXTURE_ENV_MODE REPLACE
+ Enable TEXTURE_2D
+ ActiveTexture TEXTURE1
+ TexEnv TEXTURE_ENV TEXTURE_ENV_MODE MODULATE
+ Enable TEXTURE_2D
+ %s
+ Disable BLEND
+ ActiveTexture TEXTURE0
+ """ % filter, "", None, paperMill)
- if paperMill == None:
- paperMill = PaperMill.getInstance()
+fancyPaperMakers.append( (fancyBlend, "No enhancement, Just rendering text on
top of Bg (Not recommended)") )
- return PlainPaperMaker(1, """
- BindProgram FRAGMENT_PROGRAM_ARB %s
- Enable FRAGMENT_PROGRAM_ARB
- Disable REGISTER_COMBINERS_NV
- Disable BLEND
- """ % blurProgram.getProgId(),
- """
- """, [blurProgram], paperMill)
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.26
fenfire/org/fenfire/view/CanvasView2D.java:1.27
--- fenfire/org/fenfire/view/CanvasView2D.java:1.26 Mon Aug 18 16:07:19 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java Wed Aug 20 12:34:33 2003
@@ -45,13 +45,13 @@
/** A View2D of a CANVAS2D, with a given node function.
*/
public class CanvasView2D extends View2D implements NodedView2D,
org.fenfire.view.lava.FastView {
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.26 2003/08/18
20:07:19 tjl Exp $";
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.27 2003/08/20
16:34:33 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { System.out.println("CanvasView2D:: "+s);
}
private Fen fen;
private NodeFunction nodeView;
- public boolean cull;
+ public boolean cull = true;
protected SimpleConnection lineconn = new SimpleConnection(.5f, .5f, .5f,
.5f);
Index: fenfire/org/fenfire/view/PaperView2D.java
diff -u fenfire/org/fenfire/view/PaperView2D.java:1.17
fenfire/org/fenfire/view/PaperView2D.java:1.18
--- fenfire/org/fenfire/view/PaperView2D.java:1.17 Wed Aug 13 12:56:28 2003
+++ fenfire/org/fenfire/view/PaperView2D.java Wed Aug 20 12:34:33 2003
@@ -36,14 +36,13 @@
* this other view is rendered on top of the paper.
*/
public class PaperView2D extends View2D {
-public static final String rcsid = "$Id: PaperView2D.java,v 1.17 2003/08/13
16:56:28 tjl Exp $";
+public static final String rcsid = "$Id: PaperView2D.java,v 1.18 2003/08/20
16:34:33 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PaperView2D::"+s); }
public PaperMill paperMill;
public float dicefactor = 1;
public int flags = 0;
- public boolean drawPaper = true;
public float paperScaling = 1; // 1/200f;
@@ -76,9 +75,7 @@
int seed = plane.hashCode();
- Paper p = (drawPaper == true ?
- paperMill.getOptimizedPaper(seed) :
- SpecialPapers.solidPaper(java.awt.Color.white) );
+ Paper p = paperMill.getOptimizedPaper(seed) ;
org.nongnu.libvob.Vob v = GLRen.createEasyPaperQuad(p, dicefactor,
flags);
int magnified = box2paper;
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.45
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.46
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.45 Sun Aug 17
07:31:27 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java Wed Aug 20
12:34:33 2003
@@ -96,7 +96,7 @@
public interface Factory {
AbstractMainNode2D create(Object plane, View2D view2d,
- float panX, float panY);
+ float panX, float panY, float zoom);
}
Index: fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.7
fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.8
--- fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.7 Wed Jul 30
11:46:45 2003
+++ fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java Wed Aug 20
12:34:33 2003
@@ -54,6 +54,7 @@
View2D.Anchor a = (View2D.Anchor)anchor;
return mainNodeFactory.create(a.plane, view2d,
a.x+a.w/2f,
- a.y+a.h/2f);
+ a.y+a.h/2f,
+ 1);
}
}
Index: fenfire/org/fenfire/view/buoy/FisheyeMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/FisheyeMainNode2D.java:1.17
fenfire/org/fenfire/view/buoy/FisheyeMainNode2D.java:1.18
--- fenfire/org/fenfire/view/buoy/FisheyeMainNode2D.java:1.17 Tue Aug 19
05:49:09 2003
+++ fenfire/org/fenfire/view/buoy/FisheyeMainNode2D.java Wed Aug 20
12:34:33 2003
@@ -33,7 +33,9 @@
import org.nongnu.libvob.impl.DefaultVobMatcher;
import org.nongnu.libvob.buoy.*;
-
+/** A buoy view MainNode for View2Ds, using a fisheye
+ * transformation.
+ */
public class FisheyeMainNode2D extends AbstractMainNode2D {
public static boolean dbg = true;
private static void pa(String s) { System.out.println(s); }
@@ -48,7 +50,7 @@
this.mouseController = mouse;
}
public AbstractMainNode2D create(Object plane, View2D view2d,
- float panx, float pany) {
+ float panx, float pany, float zoom) {
return new FisheyeMainNode2D(plane, view2d,
new SimpleFocus(panx, pany),
mouseController);
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.33
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.34
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.33 Sun Aug 17 07:31:27 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java Wed Aug 20 12:34:33 2003
@@ -43,15 +43,12 @@
private float tmp[] = new float[2];
static public class MainNode2DFactory implements Factory {
- public float zoom;
protected MouseMultiplexer mouseController;
- public MainNode2DFactory(float zoom,
- MouseMultiplexer mouse) {
- this.zoom = zoom;
+ public MainNode2DFactory(MouseMultiplexer mouse) {
this.mouseController = mouse;
}
public AbstractMainNode2D create(Object plane, View2D view2d,
- float panx, float pany) {
+ float panx, float pany, float zoom) {
return new MainNode2D(plane, view2d,
new SimpleFocus(panx, pany), zoom,
mouseController);
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.20
fenfire/org/fenfire/view/buoy/PPConnector.java:1.21
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.20 Thu Jul 31 06:08:05 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java Wed Aug 20 12:34:33 2003
@@ -40,7 +40,7 @@
/** Make the kinds of links familiar from PP structure.
*/
public class PPConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: PPConnector.java,v 1.20 2003/07/31
10:08:05 mudyc Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.21 2003/08/20
16:34:33 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { System.out.println("PPConnector:: "+s); }
@@ -56,12 +56,17 @@
*/
private NodeFunction nodeView;
+ /** Create a new PP connector.
+ * @param view2d The view2D that a mainnode should have for this
+ * connector to be active.
+ * @param nodeType2D The nodetype2d to be used for the buoys
+ */
public PPConnector(Fen fen, View2D view2d,
- AbstractMainNode2D.Factory factory,
+ NodeType2D nodeType2D,
NodeFunction nodeView) {
this.fen = fen;
this.view2d = view2d;
- this.nodeType = new NodeType2D(view2d, factory);
+ this.nodeType = nodeType2D;
this.nodeView = nodeView;
}
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/20
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp...,
Tuomas J. Lukka <=
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Matti Katila, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/22
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/23
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/24
- [ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp..., Tuomas J. Lukka, 2003/08/24