[ff-cvs] fenfire ./Makefile org/fenfire/fenpdf/actions/e...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/10/31 02:21:15

Modified files:
        .              : Makefile 
        org/fenfire/fenpdf/actions: eventgrabs.py mouse.py 
        org/fenfire/fenpdf/appearance: views.py 
        org/fenfire/fenpdf/events: eventhandler.py mousemenu.py 
        org/fenfire/spanimages/gl: PoolManager.java SingleImage.java 
        org/fenfire/view/buoy: TTConnector.java 
Added files:
        docs/official  : authordate1-4.sty authordate1.bst 

Log message:
        sync

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/Makefile.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/official/authordate1-4.sty?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/official/authordate1.bst?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/actions/eventgrabs.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/actions/mouse.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/views.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/events/eventhandler.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/events/mousemenu.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/PoolManager.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/SingleImage.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/TTConnector.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: fenfire/Makefile
diff -u fenfire/Makefile:1.48 fenfire/Makefile:1.49
--- fenfire/Makefile:1.48       Fri Oct 17 05:25:31 2003
+++ fenfire/Makefile    Fri Oct 31 02:21:14 2003
@@ -18,7 +18,7 @@
 
 
PYTHONPATH=-Dpython.path=../fenfire-depends/jythonlib.jar:../fenfire-depends/jython.jar:../fenfire-depends/pythonlib.jar:.:../libvob:../alph
 -Dpython.cachedir=$(PWD)/.
 
-JAVA ?= java -Xincgc
+JAVA ?= java -Xincgc -Xnoclassgc
 
 JAVAC ?= javac
 
@@ -26,7 +26,7 @@
        mkdir -p build
        $(JAVAC) -d build -classpath $(FFCLASSPATH):$(CLASSPATH) `find org 
-name '*.java'`
 
-JAVACMD=java -cp $(FFCLASSPATH):$(CLASSPATH) $(PYTHONPATH) 
+JAVACMD=$(JAVA) -cp $(FFCLASSPATH):$(CLASSPATH) $(PYTHONPATH) 
 
 RUNTEST=$(LDLIB) $(JAVACMD) org.python.util.jython org/fenfire/test/test.py 
 
Index: fenfire/org/fenfire/fenpdf/actions/eventgrabs.py
diff -u fenfire/org/fenfire/fenpdf/actions/eventgrabs.py:1.1 
fenfire/org/fenfire/fenpdf/actions/eventgrabs.py:1.2
--- fenfire/org/fenfire/fenpdf/actions/eventgrabs.py:1.1        Thu Oct 23 
15:09:56 2003
+++ fenfire/org/fenfire/fenpdf/actions/eventgrabs.py    Fri Oct 31 02:21:15 2003
@@ -9,8 +9,8 @@
 def p(*s):
     print 'ff.fenpdf.actions.eventgrabs::', s
 
-class Grabber:
-    def getEventGrabber(self): return None
+class Grabber(ff.fenpdf.events.MouseEventGrabber):
+    def draw(self, vs): return
 
     def createFlyingNode(self, oldVS, node, ev, fenPDF):
         transCS = oldVS.translateCS(0,'NODE_CS', ev.getX(), ev.getY())
@@ -21,85 +21,179 @@
                                   placeable.getWidth(),
                                   placeable.getHeight())
         placeable.place(oldVS, nodeCS)
-        vob.AbstractUpdateManager.setNoAnimation()
-        vob.AbstractUpdateManager.chg()
-        return nodeCS
-    
 
+    def setFlyingNodeZoom(self, vs, node, fenPDF, ev):
+        buoymanager = fenPDF.views.getBuoyManager()
+        mainNode = buoymanager.findTopmostMainNode(vs, ev.getX(), ev.getY())
+        if mainNode != None:
+            zoom = mainNode.getFocus().getZoom()
+        else:
+            zoom = 1
+
+        cs = vs.matcher.getCS('NODE_CS')
+        cs = vs.matcher.getCS(cs, node)
+        viewFunction = fenPDF.views.getMultiplexerNodeContentFunction()
+        placeable = viewFunction.f(fenPDF.fen.graph, node)
+        vs.coords.setOrthoBoxParams(cs, -1000, 0,0, zoom, zoom,
+                                    placeable.getWidth(), 
placeable.getHeight())
+
+    def mainNodeOfEvent(self, vs, ev, fenPDF):
+        buoymanager = fenPDF.views.getBuoyManager()
+        return buoymanager.findTopmostMainNode(vs, ev.getX(), ev.getY())
+
+    def isCanvas(self, mainNode, fenPDF):
+        return  mainNode != None and 
fenPDF.structure.canvas2d.isCanvas(mainNode.getPlane())
 
 class NodeMoverActionGrabber(Grabber):
     def __init__(self, fenpdf, x,y,node, canvas):
         self.fenPDF = fenpdf
         self.x, self.y = x,y
         self.node = node
-        self.nodeCS = None
         self.canvas = canvas
-        if self.canvas != None:
-            self.fenPDF.structure.canvas2d.removeNode(self.node)
+        self.ev = None
+        self.drewMainNode = None
 
-    def getEventGrabber(self):
-        return self.nodeMoverGrabber
+    def draw(self, vs):
+        if self.ev == None: return
+        
+        mainNode = self.mainNodeOfEvent(vs, self.ev, self.fenPDF)
+        if not self.isCanvas(mainNode, self.fenPDF):
+            self.createFlyingNode(vs, self.node, self.ev, self.fenPDF)
+        self.drewMainNode = mainNode
+        
+    def eventGrabber(self, ev, vs):
+        self.ev = ev
 
-    def nodeMoverGrabber(self, ev, vs):
-        # There seems to be posibilities to lost the right vs
-        # Now be sure that no nodes get ever lost even there are bugs
-        #
-        try:
-            cs = vs.matcher.getCS('NODE_CS')
-            if cs < 2: raise ''
-            self.transCS = cs
-        except:
-            self.createFlyingNode(vs, self.node, ev, self.fenPDF)
-            return
+        mainNode = self.mainNodeOfEvent(vs, ev, self.fenPDF)
 
-        if ev.getType() == ev.MOUSE_DRAGGED:
-            if dbg: p('drag')
-            vs.coords.setTranslateParams(self.transCS, ev.getX(), ev.getY())
+        # if there has been some kind of change!
+        if self.drewMainNode != mainNode:
+            self.fenPDF.structure.canvas2d.removeNode(self.node)
+            if self.isCanvas(mainNode, self.fenPDF):
+                canvas = mainNode.getPlane()
+                self.fenPDF.structure.canvas2d.placeOnCanvas(canvas, 
self.node, self.x, self.y)
+            self.fenPDF.animation.regenerateVS()
         else:
-            buoymanager = self.fenPDF.views.getBuoyManager()
-            mainNode = buoymanager.findTopmostMainNode(vs, ev.getX(), 
ev.getY())
-            if mainNode == None or not 
self.fenPDF.structure.canvas2d.isCanvas(mainNode.getPlane()):
-                if self.canvas != None:
-                    self.fenPDF.structure.canvas2d.placeOnCanvas(self.canvas, 
self.node, self.x, self.y)
-            else:
+            if self.isCanvas(mainNode, self.fenPDF):
+                # set coordinates if inside of some foci
                 xy = mainNode.getXYHit(vs, ev.getX(), ev.getY())
-                
self.fenPDF.structure.canvas2d.placeOnCanvas(mainNode.getPlane(), self.node, 
xy[0], xy[1])
-
+                self.fenPDF.structure.canvas2d.setCoordinates(self.node, 
xy[0], xy[1])
+                mainNode.chgFast(vs, -1)
+            else:
+                vs.coords.setTranslateParams(vs.matcher.getCS('NODE_CS'),
+                                             ev.getX(), ev.getY())
+            self.fenPDF.animation.reuseVS = 1
+            self.fenPDF.animation.animate = 0
+
+        if ev.getType() != ev.MOUSE_DRAGGED:
+            if not self.isCanvas(mainNode, self.fenPDF):
+                self.fenPDF.structure.canvas2d.placeOnCanvas(self.canvas, 
self.node, self.x, self.y)
+                p('placed on fen, using default')
             # temporarily solution, flush drags away...
             self.fenPDF.events.mouse.mainMouse.flush()
             self.fenPDF.events.eventHandler.eventGrabber = None
             self.fenPDF.animation.regenerateVS()
-        vob.AbstractUpdateManager.chg()
-
 
+        vob.AbstractUpdateManager.chg()
 
 class TextCloud(Grabber):
-    def __init__(self, fenpdf, canvas, origNode, origOffset, node):
+    """ Very buggy and unhealthy coded text cloud.
+
+    Text has been put into canvas when coming in here.
+    """
+    def __init__(self, fenpdf, canvas, origNode, origOffset, node,x,y):
         self.fenPDF = fenpdf
         self.originalCanvas = canvas
         self.originalNode = origNode
         self.originalOffset = origOffset
         self.node = node
+        self.x, self.y = x,y
 
         self.tipNode = ff.swamp.Nodes.N()
         self.tipOffset = None
 
-    def getEventGrabber(self):
-        return self.move
-    def move(self, ev, vs):
-        try:
-            cs = vs.matcher.getCS('NODE_CS')
-            if cs < 2: raise ''
-            self.transCS = cs
-        except:
+        self.ev = None
+        self.drewMainNode = None
+
+
+##     def getNodeCS(self, vs, ev, ignoreNode):
+##         mainNode = self.mainNodeOfEvent(vs, ev, self.fenPDF)
+##         if self.isCanvas(mainNode, self.fenPDF):
+##             canvasCS = ff.view.CanvasView2D.getContainerCS(vs, 
mainNode.getBox2Screen())
+##             canvasCS = mainNode.getBox2Screen()
+##             p('canvasCS', canvasCS)
+##             ints = vs.coords.getAllCSAt(canvasCS, ev.getX(), ev.getY())
+##             #p(vs.coords.getCSAt(
+##             p('ints:', ints)
+##         else:
+##             raise 'not on canvas'
+
+    def draw(self, vs):
+        if self.ev == None: return
+        
+        mainNode = self.mainNodeOfEvent(vs, self.ev, self.fenPDF)
+        if not self.isCanvas(mainNode, self.fenPDF):
+            self.createFlyingNode(vs, self.node, self.ev, self.fenPDF)
+        self.drewMainNode = mainNode
+
+
+    def eventGrabber(self, ev, vs):
+        self.ev = ev
+
+        mainNode = self.mainNodeOfEvent(vs, ev, self.fenPDF)
+
+        # if there has been some kind of change!
+        if self.drewMainNode != mainNode:
+            self.fenPDF.structure.canvas2d.removeNode(self.node)
+            if self.isCanvas(mainNode, self.fenPDF):
+                canvas = mainNode.getPlane()
+                self.fenPDF.structure.canvas2d.placeOnCanvas(canvas, 
self.node, self.x, self.y)
+            self.fenPDF.animation.regenerateVS()
+        else:
+            if self.isCanvas(mainNode, self.fenPDF):
+                # set coordinates if inside of some foci
+                xy = mainNode.getXYHit(vs, ev.getX(), ev.getY())
+                self.fenPDF.structure.canvas2d.setCoordinates(self.node, 
xy[0], xy[1])
+                mainNode.chgFast(vs, -1)
+            else:
+                vs.coords.setTranslateParams(vs.matcher.getCS('NODE_CS'),
+                                             ev.getX(), ev.getY())
+            self.fenPDF.animation.reuseVS = 1
+            self.fenPDF.animation.animate = 0
+
+        if ev.getType() != ev.MOUSE_DRAGGED:
+            if not self.isCanvas(mainNode, self.fenPDF):
+                self.fenPDF.structure.canvas2d.removeNode(self.node)
+                # XXX others also
+                self.fenPDF.structure.canvas2d.placeOnCanvas(self.canvas, 
self.node, self.x, self.y)
+                p('placed on fen, using default')
+            # temporarily solution, flush drags away...
+            self.fenPDF.events.mouse.mainMouse.flush()
+            self.fenPDF.events.eventHandler.eventGrabber = None
+            self.fenPDF.animation.regenerateVS()
+
+        vob.AbstractUpdateManager.chg()
+
+        if 1: return
+        
+
+
+        self.getNodeCS(vs, ev, None)
+        cs = vs.matcher.getCS('NODE_CS')
+        if cs < 2:
             self.createFlyingNode(vs, self.node, ev, self.fenPDF)
             return
+        self.transCS = cs
 
         if ev.getType() == ev.MOUSE_DRAGGED:
             # tip panel activism
             self.showTipPanel(vs, ev)
 
             vs.coords.setTranslateParams(self.transCS, ev.getX(), ev.getY())
+
+            self.setFlyingNodeZoom(vs, self.node, self.fenPDF, ev)
+            self.fenPDF.animation.reuseVS = 1
+            self.fenPDF.animation.animate = 0
         else:
             self.hideTipPanel(vs)
             buoymanager = self.fenPDF.views.getBuoyManager()
@@ -110,8 +204,6 @@
                                                         
self.fenPDF.structure.ff.getContent(self.node))
             else:
 
-                
-                # check whether there are text under the mouse cursor
                 node = mainNode.getNodeOnPlane(vs, ev.getX(), ev.getY())
                 viewFunction = 
self.fenPDF.views.getMultiplexerNodeContentFunction()
                 placeable = viewFunction.f(self.fenPDF.fen.graph, node)
Index: fenfire/org/fenfire/fenpdf/actions/mouse.py
diff -u fenfire/org/fenfire/fenpdf/actions/mouse.py:1.11 
fenfire/org/fenfire/fenpdf/actions/mouse.py:1.12
--- fenfire/org/fenfire/fenpdf/actions/mouse.py:1.11    Thu Oct 23 15:09:56 2003
+++ fenfire/org/fenfire/fenpdf/actions/mouse.py Fri Oct 31 02:21:15 2003
@@ -240,15 +240,15 @@
            f = getMainNode().getFocus()
            fX, fY = f.getPanX(), f.getPanY()
 
-            if self.node == None: raise 'No node!!!'
+            if self.node == None:
+                p('No node!!!')
+                return
 
            g = fenPDF.fen.graph
            self.startPointX = ff.util.RDFUtil.getFloat(g, self.node, 
CANVAS2D.x)
            self.startPointY = ff.util.RDFUtil.getFloat(g, self.node, 
CANVAS2D.y)
             self.canvas =  fenPDF.structure.canvas2d.getCanvas(self.node)
 
-            grabber = ff.fenpdf.actions.eventgrabs.Grabber()
-
             # find out offset
             viewFunction = fenPDF.views.getMultiplexerNodeContentFunction()
             placeable = viewFunction.f(fenPDF.fen.graph, self.node)
@@ -258,7 +258,10 @@
                 ptsOut = jarray.zeros(3, 'f')
                 getOldVS().coords.inverseTransformPoints3(cs, ptsIn, ptsOut)
                 offs = placeable.getCursorPos(ptsOut[0], ptsOut[1])
-                if fenPDF.uistate.textScissors.isScissored(self.node, offs):
+
+                # optional textcloud
+                textcloud = 0
+                if textcloud and 
fenPDF.uistate.textScissors.isScissored(self.node, offs):
                     fenPDF.uistate.textScissors.fixOffset()
                     node = ff.swamp.Nodes.N()
                     enf = fenPDF.structure.ff \
@@ -266,10 +269,13 @@
                                         
fenPDF.uistate.textScissors.begin.offset,
                                         fenPDF.uistate.textScissors.end.offset)
                     fenPDF.structure.ff.setContent(node, enf)
+                    xy = getMainNode().getXYHit(getOldVS(), self.evX, self.evY)
+                    fenPDF.structure.canvas2d.placeOnCanvas(self.canvas, 
self.node, xy[0], xy[1])
+
                     grabber = ff.fenpdf.actions.eventgrabs.TextCloud(
                         fenPDF, self.canvas, self.node,
                         fenPDF.uistate.textScissors.begin.offset,
-                        node)
+                        node, self.evX, self.evY)
                     fenPDF.uistate.textScissors.clear()
                 else:
                     grabber = 
ff.fenpdf.actions.eventgrabs.NodeMoverActionGrabber(
@@ -277,30 +283,10 @@
             else:
                 grabber = ff.fenpdf.actions.eventgrabs.NodeMoverActionGrabber(
                     fenPDF, self.startPointX, self.startPointY, self.node, 
self.canvas)
-            fenPDF.events.eventHandler.eventGrabber = grabber.getEventGrabber()
+            fenPDF.events.eventHandler.eventGrabber = grabber
                     
            fenPDF.animation.noAnimation()
             fenPDF.animation.regenerateVS()
-
-
-        def theUltimateEventGrabberUtilToMoveNodesWhereEver(self, ev, oldVS):
-            if self.nodeCS == None:
-                self.createFlyingNode(oldVS)
-                vob.AbstractUpdateManager.chg()
-                return
-
-            # There seems to be posibilities to lost the right vs
-            # Now be sure that no nodes get ever lost even there are bugs
-            #
-            try:
-                oldVS.matcher.getKey(self.transCS) != 'NODE_CS'
-            except:
-                p('wrongVS!!!!')
-                self.createFlyingNode(oldVS)
-                vob.AbstractUpdateManager.chg()
-                return
-
- 
 
 
 
Index: fenfire/org/fenfire/fenpdf/appearance/views.py
diff -u fenfire/org/fenfire/fenpdf/appearance/views.py:1.27 
fenfire/org/fenfire/fenpdf/appearance/views.py:1.28
--- fenfire/org/fenfire/fenpdf/appearance/views.py:1.27 Wed Oct 22 05:16:04 2003
+++ fenfire/org/fenfire/fenpdf/appearance/views.py      Fri Oct 31 02:21:15 2003
@@ -221,7 +221,7 @@
             if dbg: p('reuse vobscene')
            return self.fenPDF.animation.lastVs
 
-       self.background.placeBackDrop(vs)
+       self.background.placeBackDrop(vs)
 
        self.buoyManager.scene(vs)
 
@@ -233,6 +233,9 @@
        self.fenPDF.events.buttons.render(vs, 0)
 
        self.fenPDF.animation.generatedNewScene(vs)
+
+        if self.fenPDF.events.eventHandler.eventGrabber != None:
+            self.fenPDF.events.eventHandler.eventGrabber.draw(vs)
 
        return vs
 
Index: fenfire/org/fenfire/fenpdf/events/eventhandler.py
diff -u fenfire/org/fenfire/fenpdf/events/eventhandler.py:1.14 
fenfire/org/fenfire/fenpdf/events/eventhandler.py:1.15
--- fenfire/org/fenfire/fenpdf/events/eventhandler.py:1.14      Sat Oct 18 
02:06:30 2003
+++ fenfire/org/fenfire/fenpdf/events/eventhandler.py   Fri Oct 31 02:21:15 2003
@@ -38,8 +38,8 @@
 
         if dbg: p(ev)
 
-        if self.eventGrabber:
-            self.eventGrabber(ev, oldvs)
+        if self.eventGrabber != None:
+            self.eventGrabber.eventGrabber(ev, oldvs)
             return
 
         if self.fenPDF.events.buttons.mouseEvent(ev, oldvs):
Index: fenfire/org/fenfire/fenpdf/events/mousemenu.py
diff -u fenfire/org/fenfire/fenpdf/events/mousemenu.py:1.13 
fenfire/org/fenfire/fenpdf/events/mousemenu.py:1.14
--- fenfire/org/fenfire/fenpdf/events/mousemenu.py:1.13 Thu Oct 23 15:09:57 2003
+++ fenfire/org/fenfire/fenpdf/events/mousemenu.py      Fri Oct 31 02:21:15 2003
@@ -32,7 +32,7 @@
 
 dbg = 0
 
-class MouseMenu:
+class MouseMenu(ff.fenpdf.actions.eventgrabs.Grabber):
     def __init__(self, fenPDF, states):
         self.fenPDF = fenPDF
         self.states = states
@@ -70,7 +70,7 @@
         vs.put(self.selectListVob, cs)
 
     def showList(self, x, y, who):
-        self.fenPDF.events.eventHandler.eventGrabber = self.mouse
+        self.fenPDF.events.eventHandler.eventGrabber = self
         self.dragged = 0
         self.notExecuted = 1
        p("showList")
@@ -101,7 +101,7 @@
        #self.fenPDF.animation.noAnimation()
        #vob.AbstractUpdateManager.chg()
 
-    def mouse(self, ev, oldVS):
+    def eventGrabber(self, ev, oldVS):
         """ Should be called only through eventHandler.eventGrabber
         """
 
Index: fenfire/org/fenfire/spanimages/gl/PoolManager.java
diff -u fenfire/org/fenfire/spanimages/gl/PoolManager.java:1.15 
fenfire/org/fenfire/spanimages/gl/PoolManager.java:1.16
--- fenfire/org/fenfire/spanimages/gl/PoolManager.java:1.15     Wed Oct 22 
05:16:05 2003
+++ fenfire/org/fenfire/spanimages/gl/PoolManager.java  Fri Oct 31 02:21:15 2003
@@ -80,24 +80,29 @@
     }
 
     IndirectMipzipManager indirectMipzipManager;
-    int[] allocations = new int[] {
-       /*
-       2, 2, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0
-       */
-
-       //  Suitable for GF FX 5600, 128MB
-       /* 
-       8, 8, 15, 20, 40, 80,
-       200, 0, 0, 0, 0, 0
-       */
 
-       4, 4, 12, 18, 30, 60,
-       100, 200, 0, 0, 0, 0
+    int[][] allocationSchemes = new int[][] {
+       {
+           // Suitable for GF4Go, 64MB
+           4, 4, 12, 18, 30, 60,
+           100, 200, 0, 0, 0, 0
+       }, {
+           //  Suitable for GF FX 5600, 128MB
+           8, 8, 15, 20, 40, 80,
+           200, 0, 0, 0, 0, 0
+       }
     };
+
+    int[] allocations;
     VirtualTexture[][] slotContents;
 
     public PoolManager() {
+
+       int scheme = Integer.parseInt(System.getProperty("fenfire.poolalloc", 
"1"));
+
+       allocations = allocationSchemes[scheme];
+
+
        indirectMipzipManager = new NonDeletingIndirectMipzipManager();
        indirectMipzipManager.init("COMPRESSED_RGB_S3TC_DXT1_EXT", 
                        2048, 2048);
Index: fenfire/org/fenfire/spanimages/gl/SingleImage.java
diff -u fenfire/org/fenfire/spanimages/gl/SingleImage.java:1.14 
fenfire/org/fenfire/spanimages/gl/SingleImage.java:1.15
--- fenfire/org/fenfire/spanimages/gl/SingleImage.java:1.14     Sat Oct 18 
02:06:30 2003
+++ fenfire/org/fenfire/spanimages/gl/SingleImage.java  Fri Oct 31 02:21:15 2003
@@ -58,7 +58,7 @@
     /** Decay coefficient.
      * Coefficient C for exp(- C*(t1-t0)) when decaying.
      */
-    public static float exponentialCoeff = (float)Math.log(.05) / 2000;
+    public static float exponentialCoeff = (float)Math.log(.05) / 1000;
 
 
     public final String scrollBlock;
Index: fenfire/org/fenfire/view/buoy/TTConnector.java
diff -u fenfire/org/fenfire/view/buoy/TTConnector.java:1.6 
fenfire/org/fenfire/view/buoy/TTConnector.java:1.7
--- fenfire/org/fenfire/view/buoy/TTConnector.java:1.6  Sun Aug 24 08:06:01 2003
+++ fenfire/org/fenfire/view/buoy/TTConnector.java      Fri Oct 31 02:21:15 2003
@@ -83,7 +83,7 @@
            nodeType = normalNodeNodeType;
        }
        View2D.Anchor anchor = new View2D.Anchor(
-                   plane,  0, 0, 200, 200, null);
+                   plane,  0, 0, 400, 400, null);
        l.link(direction, -1, nodeType, linkId, anchor, index);
     }