[ff-cvs] fenfire/org/fenfire demo/mm.py fenpdf/fenpdfcon...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/18 11:23:33

Modified files:
        org/fenfire/demo: mm.py 
        org/fenfire/fenpdf: fenpdfcontext.py 

Log message:
        rm crud + try fast animation. still first click missed

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.27 fenfire/org/fenfire/demo/mm.py:1.28
--- fenfire/org/fenfire/demo/mm.py:1.27 Mon Aug 18 10:07:59 2003
+++ fenfire/org/fenfire/demo/mm.py      Mon Aug 18 11:23:33 2003
@@ -182,13 +182,6 @@
                 else: self.setAccursed(node)
             if dbg: p('offs:', self.offset, l)
 
-    def isLinked(self, obj):
-        iter = fen.graph.findN_11X_Iter(obj, STRUCTLINK.linkedTo)
-        if iter.hasNext(): return 1
-        iter = fen.graph.findN_X11_Iter(STRUCTLINK.linkedTo, obj)
-        if iter.hasNext(): return 1
-        return 0
-    
     def setAccursed(self, node, multiplexer = None):
         set = java.util.HashSet()
         set.add(node)
@@ -218,15 +211,10 @@
         except: pass
 
     def mainNodeToBeRender(self, vs,into, main): pass
-    def changeFastAfterMouseEvent(self): return self.fastMouseChg
+    def changeFastAfterMouseEvent(self):
+        p('returning', self.fastMouseChg, 'as fast or slow')
+        return self.fastMouseChg
 
-    def toBePlaced(self, node, text):
-        if node == self.getAccursed():
-           text.setColor(java.awt.Color(0.5, 0.1, 1))
-           text.setCursorOffset(0)
-        else:
-           text.setColor(java.awt.Color.black)
-           text.setCursorOffset(-1)
 
 context = Context()
  
@@ -247,6 +235,7 @@
 
 class Click(Action, vob.mouse.MouseClickListener):
     def clicked(self, x,y):
+        self.context.fastMouseChg = 0
         vs = context.oldVS
         node = vs.getKeyAt(0, x,y, None)
         p('key', node)
@@ -300,7 +289,6 @@
 #               if ff.util.RDFUtil.isLinkedWith(fen.graph, node, 
self.context.main.getPlane()) \
 #                      or ff.util.RDFUtil.isLinkedWith(fen.graph, 
self.context.main.getPlane(), node):
                 self.context.rmLinkTo(node, self.context.main.getPlane())
-        self.context.fastMouseChg = 0
 
 
 class ZoomPan(vob.input.RelativeAxisListener, Action, 
vob.mouse.MousePressListener):
@@ -318,6 +306,7 @@
     def pressed(self, x,y):
         return self
     def changedRelative(self, x,y='foo'):
+        p('foobar')
         f = self.context.main.getFocus()
         fX, fY = f.getPanX(), f.getPanY()
         f.setPan(fX-x/f.zoom,
@@ -366,6 +355,13 @@
         except java.io.FileNotFoundException: pass
 
     def scene(self, vs):
+        if context.fastMouseChg:
+            p('fast')
+            return context.oldVS
+        p('slow')
+        context.oldVS = vs
+        
+        
         # custom controller support
         if self.naxes >= 1:
             mindView.nodeScale = self.axes[0].getValue() / 10. + 1
@@ -374,25 +370,23 @@
         if self.naxes >= 3:
             mindView.rotation = self.axes[2].getValue() / -4
 
-        context.oldVS = vs
         vs.put(background(context.bgcolor))
         cs = vs.orthoBoxCS(0, "foo",0, 50,50, 1,1, 750,650)
         self.main.renderMain(vs, cs)
 
         if self.startup: w.setCursor('default'); self.startup = 0
 
-        return vs
 
     def mouse(self, ev):
+        p('mouse',ev)
         if self.main.mouse(ev, context.oldVS):
-            #pass
-            # XXX replace scene..
             vob.AbstractUpdateManager.setNoAnimation()
-            
-        if ev.getType() != vob.VobMouseEvent.MOUSE_PRESSED:
+        if ev.getType() != vob.VobMouseEvent.MOUSE_PRESSED and \
+               ev.getType() != vob.VobMouseEvent.MOUSE_RELEASED:
             vob.AbstractUpdateManager.chg()
         
     def key(self, key):
+        context.fastMouseChg = 0
         p("key: ", key)
         if key == 'Escape' or key == 'Tab':
             """Removes the focus from the current accursed node and sets no 
new accursed node."""
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.14 
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.15
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.14    Mon Aug 18 09:49:18 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Mon Aug 18 11:23:33 2003
@@ -382,30 +382,6 @@
            vs.put(vob.vobs.LineVob(0,0,0,1, java.awt.Color.darkGray), cursorCS)
             
         
-
-    def chgFast(self, oldVS):
-        s = self.states.buoymanager.getSingles()
-        for i in s:
-            i.getMainNode().chgFast(oldVS)
-
-
-    # /** call back from ContextNodeView */
-    def isCurrent(self, node, nv):
-        if self.states.cursor.isAccursed(node):
-            nv.setUnCached()
-        else:
-            nv.setCached()
-
-    # /** call back from TextNodeView */
-    def toBePlaced(self, node, text):
-        if dbg: p("n"+node+" == ")
-        if self.states.cursor.isAccursed(node):
-           text.setColor(java.awt.Color.red)
-           text.setCursorOffset(self.states.cursor.getCursorOffset())
-        else:
-           text.setColor(java.awt.Color.black)
-           text.setCursorOffset(-1)
-
     def renderContext(self, vs, into):
         self.mousemenu.render(vs)
         self.mousebuttons = cs = vs.translateCS(0, "BUTTONS",0,0)
@@ -448,8 +424,9 @@
                                         self.states.mainMouse))
             return 1
        elif key == "SAVE":
-           self.save()
-        else:
+           self.save() 
+            return 1
+       else:
             p('key', key)
             return 0