[ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa...

[Asko Soukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/08/15 10:10:54

Modified files:
        org/fenfire/demo: mm.py 
        org/fenfire/view/lava: mindMapView2D.py 

Log message:
        tricky background for nodes at the edge

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.14 fenfire/org/fenfire/demo/mm.py:1.15
--- fenfire/org/fenfire/demo/mm.py:1.14 Fri Aug 15 09:44:46 2003
+++ fenfire/org/fenfire/demo/mm.py      Fri Aug 15 10:10:53 2003
@@ -197,11 +197,11 @@
                 self.context.scale = self.context.main.getFocus().getZoom()
                 self.context.offset = nodeview.getPos(fen.graph, 
context.getAccursed(),
                                                   
(x-into[0])/self.context.scale/nodeScale,
-                                                  
(y-into[1])/self.context.scale/scale)
+                                                  
(y-into[1])/self.context.scale/nodeScale)
             elif ff.util.RDFUtil.isLinked(fen.graph, node):
                 self.context.offset = nodeview.getPos(fen.graph, 
context.getAccursed(),
-                                                  
(x-into[0])/self.context.scale/nodeScale,
-                                                  
(y-into[1])/self.context.scale/nodeScale)
+                                                 
(x-into[0])/self.context.scale/nodeScale,
+                                                 
(y-into[1])/self.context.scale/nodeScale)
                 self.context.scale = 1
                 self.context.main.setNewPlane(node, 0,0,1)
             else:
@@ -274,18 +274,18 @@
 
         ### custom controller support
         self.naxes = 0
-#        try:
-        self.ps2 = vob.input.impl.PS2MouseDevice("/dev/input/mouse0", "main",
-                                                 
vob.input.impl.PS2MouseDevice.IMPS_PROTO)
-        self.naxes = len(self.ps2.getAxes())
-        self.axes = [
-            vob.input.impl.StandardBoundedFloatModel(0, 400,
-                                                     actionPerformed = lambda 
x: vob.AbstractUpdateManager.chg())
-            for i in range(0,self.naxes)]
-        for i in range(0,self.naxes):
-            self.ps2.getAxes()[i].setMainListener(
+        try:
+            self.ps2 = vob.input.impl.PS2MouseDevice("/dev/input/mouse0", 
"main",
+                       vob.input.impl.PS2MouseDevice.IMPS_PROTO)
+            self.naxes = len(self.ps2.getAxes())
+            self.axes = [
+                vob.input.impl.StandardBoundedFloatModel(0, 400,
+                actionPerformed = lambda x: vob.AbstractUpdateManager.chg())
+                for i in range(0,self.naxes)]
+            for i in range(0,self.naxes):
+                self.ps2.getAxes()[i].setMainListener(
                 vob.input.BoundedFloatLinearAbsoluteAdapter(self.axes[i]))
-#        except: pass
+        except java.io.FileNotFoundException: pass
 
     def scene(self, vs):
         # custom controller support
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.17 
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.18
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.17 Fri Aug 15 09:44:46 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py      Fri Aug 15 10:10:54 2003
@@ -21,9 +21,11 @@
 dbg = 0
 
 paper = vob.gl.SpecialPapers.selectionPaper(None)
-paper_accursed = vob.gl.SpecialPapers.selectionPaper(java.awt.Color(.9, .9, 
.9));
-whiteground = vob.gl.GLRen.createFixedPaperQuad(paper, 0, 0, 1, 1, 0, 10, 10, 
10);
-whiteground_accursed = vob.gl.GLRen.createFixedPaperQuad(paper_accursed, 0, 0, 
1, 1, 0, 10, 10, 10);
+paper_accursed = vob.gl.SpecialPapers.selectionPaper(java.awt.Color(.9, .9, 
.9))
+paper_unused = vob.gl.SpecialPapers.selectionPaper(java.awt.Color(.6, .5, .0))
+whiteground = vob.gl.GLRen.createFixedPaperQuad(paper, 0, 0, 1, 1, 0, 10, 10, 
10)
+whiteground_accursed = vob.gl.GLRen.createFixedPaperQuad(paper_accursed, 0, 0, 
1, 1, 0, 10, 10, 10)
+whiteground_unused = vob.gl.GLRen.createFixedPaperQuad(paper_unused, 0, 0, 1, 
1, 0, 10, 10, 10)
 
 class MindMapMainNode2D(ff.view.buoy.MainNode2D):
     def __init__(self, plane, view2d, focus, controller):
@@ -77,7 +79,7 @@
         cs_background = vs.orthoCS(cs,'WHITE_GROUND',0, 0, 0, p.getWidth(), 
p.getHeight())
         if self.context and self.context.getAccursed() == node:
             vs.put(whiteground_accursed, cs_background)
-        else: vs.put(whiteground, cs_background)
+        else: vs.put(whiteground_unused, cs_background)
         
         cs = vs.orthoBoxCS(cs,node,0, 0, 0, 1,1, p.getWidth(), p.getHeight())
         p.place(vs, cs)