[Gzz-commits] fenfire/org/fenfire demo/mm.py view/lava/mindMa...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/13 04:59:48

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

Log message:
        data adding works with \'tab\' + typing

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.1 fenfire/org/fenfire/demo/mm.py:1.2
--- fenfire/org/fenfire/demo/mm.py:1.1  Wed Aug 13 04:47:44 2003
+++ fenfire/org/fenfire/demo/mm.py      Wed Aug 13 04:59:48 2003
@@ -13,6 +13,7 @@
 import org.fenfire as ff
 import org.fenfire.vocab.STRUCTLINK as LINK
 from org.fenfire.vocab import *
+from org.fenfire.vocab.lava import *
 from org.fenfire.swamp import Nodes
 
 # coloredquad
@@ -56,9 +57,9 @@
 noteA9 = Nodes.get(ppAct.newNote(paperA, 100,70, 'This is a very long test 
which is used to see if asdfasdfsa'))
 
 
-fen.graph.add(noteA2, RDF.type, ff.vocab.lava.MINDSTRUCT.Data)
-fen.graph.add(noteA8, RDF.type, ff.vocab.lava.MINDSTRUCT.Data)
-fen.graph.add(noteA9, RDF.type, ff.vocab.lava.MINDSTRUCT.Data)
+fen.graph.add(noteA2, RDF.type, MINDSTRUCT.Data)
+fen.graph.add(noteA8, RDF.type, MINDSTRUCT.Data)
+fen.graph.add(noteA9, RDF.type, MINDSTRUCT.Data)
 
 ppAct.assocNotes(noteA1, 1, noteA2);
 
@@ -91,7 +92,7 @@
         else: raise 'no good cursor!?'
     def insertText(self, text):
         if self._accursed == None:
-            self.setAccursed(ff.util.RDFUtil.N(fen.graph, MIND.Data))
+            self.setAccursed(ff.util.RDFUtil.N(fen.graph, MINDSTRUCT.Data))
             self.offset = 0
         alphContent.insertText(self._accursed, self.offset, text, 1)
         self.offset += len(text)
@@ -104,8 +105,8 @@
         self.offset -= 1
         l = len(alphContent.getText(fen.graph, self._accursed))
         if self.offset == 0 and l == 0:
-            fen.graph.rm_111(self._accursed, RDF.type, MIND.Data)
-            it = fen.graph.findN_X11_Iter(RDF.type, MIND.Data)
+            fen.graph.rm_111(self._accursed, RDF.type, MINDSTRUCT.Data)
+            it = fen.graph.findN_X11_Iter(RDF.type, MINDSTRUCT.Data)
             self.setAccursed(None)
             while it.hasNext():
                 node = it.next()
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.5 
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.6
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.5  Wed Aug 13 04:47:45 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py      Wed Aug 13 04:59:48 2003
@@ -73,10 +73,10 @@
     def place(self, node, vs, cs):
         p = self.viewfunc.f(self.fen.graph, node)
 
-        cs_background = vs.coords.ortho(cs,0, 0,0, p.getWidth(), p.getHeight())
+        cs_background = vs.orthoCS(cs,'WHITE_GROUND',0, 0,0, p.getWidth(), 
p.getHeight())
         vs.put(whiteground, cs_background)
         
-        cs = vs.coords.orthoBox(cs,0, 0,0, 1,1, p.getWidth(), p.getHeight())
+        cs = vs.orthoBoxCS(cs,'CONTENT',0, 0,0, 1,1, p.getWidth(), 
p.getHeight())
         p.place(vs, cs)
 
 
@@ -289,10 +289,10 @@
     def putNodeContent(self, vs, node, cs):
         p = self.nodef.f(self.fen.graph, node)
 
-        cs_background = vs.coords.ortho(cs,0, 0,0, p.getWidth(), p.getHeight())
+        cs_background = vs.orthoCS(cs,'background',0, 0,0, p.getWidth(), 
p.getHeight())
         vs.put(whiteground, cs_background)
 
-        cs = vs.coords.orthoBox(cs,0, 0,0, 1,1, p.getWidth(), p.getHeight())
+        cs = vs.orthoBoxCS(cs,'content',0, 0,0, 1,1, p.getWidth(), 
p.getHeight())
         p.place(vs, cs)