[Gzz-commits] fenfire/org/fenfire demo/mind.py vocab/lava/MIN...

[Asko Soukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/08/13 03:03:50

Modified files:
        org/fenfire/demo: mind.py 
        org/fenfire/vocab/lava: MINDSTRUCT.java 

Log message:
        up

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mind.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/vocab/lava/MINDSTRUCT.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/mind.py
diff -u fenfire/org/fenfire/demo/mind.py:1.6 
fenfire/org/fenfire/demo/mind.py:1.7
--- fenfire/org/fenfire/demo/mind.py:1.6        Tue Aug 12 17:10:38 2003
+++ fenfire/org/fenfire/demo/mind.py    Wed Aug 13 03:03:50 2003
@@ -7,12 +7,15 @@
 import org.nongnu.storm as storm
 from java.lang import Math
 from org.fenfire.vocab import RDF
+from org.fenfire.vocab import STRUCTLINK as STRUCT
+from org.fenfire.vocab.lava import MINDSTRUCT as MIND
 from org.fenfire.util import Pair
 
 # save and load
 from com.hp.hpl.mesa.rdf.jena.mem import ModelMem
 import os.path
 
+# storm pool directory and mindmap file
 DIR = 'myFenfire/'
 FILE = DIR+'mindmap.rdf'
 
@@ -20,13 +23,13 @@
 pool = storm.impl.DirPool(java.io.File(DIR), java.util.HashSet())
 myalph = alph.impl.StormAlph(pool)
 
+# set flag to load an old graph or creating new
 do_load_graph = 0
-# automatic system for previous
 if os.path.isfile(FILE):
-    print 'Loading the RDF graph from the file %s' % (FILE)
+    print 'Loading the RDF graph from the file %s.' % (FILE)
     do_load_graph = 1
 else:
-    print 'Creating a new RDF graph'
+    print 'Creating a new RDF graph.'
     do_load_graph = 0
 
 fen = ff.Fen()
@@ -51,8 +54,6 @@
 def p(*s):
     print "mind.py::", s
 
-M = ff.vocab.lava.MINDSTRUCT()
-
 def rotatelist(list):
     list.append(list.pop(0))
 
@@ -63,7 +64,7 @@
 
     def insertText(self, text):
         if self._acc == None:
-            self.setAccursed(ff.util.RDFUtil.N(fen.graph, M.Data))
+            self.setAccursed(ff.util.RDFUtil.N(fen.graph, MIND.Data))
             self.offset = 0
         alphContent.insertText(self._acc, self.offset, text, 1)
         self.offset += len(text)
@@ -76,12 +77,13 @@
         self.offset -= 1
         l = len(alphContent.getText(fen.graph, self._acc))
         if self.offset == 0 and l == 0:
-            fen.graph.rm_111(self._acc, RDF.type, M.Data)
-#            try:
-#                self.setAaccursed(
-#                    fen.graph.findN_X11_Iter(RDF.type, M.Data).next())
-#            except:
-            self.setAccursed(None)
+            fen.graph.rm_111(self._acc, RDF.type, MIND.Data)
+            try:
+                self.setAaccursed(
+                    fen.graph.findN_X11_Iter(RDF.type, MIND.Data).next())
+            except:
+                print "ei löytynyt"
+                self.setAccursed(None)
         if dbg: p('offs:', self.offset, l)
 
     def setAccursed(self, node):
@@ -95,29 +97,29 @@
         return self._acc
 
     def rmLinkTo(self, obj, with):
-        iter = fen.graph.findN_11X_Iter(obj, M.link)
+        iter = fen.graph.findN_11X_Iter(obj, STRUCT.linkedTo)
         try:
             while (iter.hasNext()):
                 if with == iter.next():
-                    fen.graph.rm_111(obj, M.link, with)
-            iter = fen.graph.findN_11X_Iter(with, M.link)
+                    fen.graph.rm_111(obj, STRUCT.linkedTo, with)
+            iter = fen.graph.findN_11X_Iter(with, STRUCT.linkedTo)
             while (iter.hasNext()):
                 if obj == iter.next():
-                    fen.graph.rm_111(with, M.link, obj)
+                    fen.graph.rm_111(with, STRUCT.linkedTo, obj)
         except: pass
         
     def isLinked(self, obj):
-        iter = fen.graph.findN_11X_Iter(obj, M.link)
+        iter = fen.graph.findN_11X_Iter(obj, STRUCT.linkedTo)
         if iter.hasNext(): return 1
-        iter = fen.graph.findN_X11_Iter(M.link, obj)
+        iter = fen.graph.findN_X11_Iter(STRUCT.linkedTo, obj)
         if iter.hasNext(): return 1
         return 0
 
     def isLinkedTo(self, obj, obj2):
-        iter = fen.graph.findN_11X_Iter(obj, M.link)
+        iter = fen.graph.findN_11X_Iter(obj, STRUCT.linkedTo)
         while (iter.hasNext()):
             if obj2 == iter.next(): return 1
-        iter = fen.graph.findN_11X_Iter(obj2, M.link)
+        iter = fen.graph.findN_11X_Iter(obj2, STRUCT.linkedTo)
         while (iter.hasNext()):
             if obj == iter.next(): return 1
         return 0
@@ -128,7 +130,7 @@
         self.mm = MindMap()
         if do_load_graph: 
             print "Setting accursed node."
-            self.center = fen.graph.findN_X1A_Iter(M.link).next()
+            self.center = fen.graph.findN_X1A_Iter(STRUCT.linkedTo).next()
         else: self.center = None
         self.scumm = [ 'go', 'link', 'unlink' ]
 
@@ -168,7 +170,7 @@
                     elif self.mm.isLinkedTo(obj, self.center):
                         pass
                     else:
-                        fen.graph.add(self.center, M.link, obj)
+                        fen.graph.add(self.center, STRUCT.linkedTo, obj)
                     pass
                 elif c == 'unlink':
                     if obj == self.center:
@@ -185,8 +187,8 @@
         elif key == 'Backspace':
             if self.mm.getAccursed() != None:
                 self.mm.deleteText()
-                if self.mm.getAccursed() == None:
-                    self.center = None
+#                if self.mm.getAccursed() == None:
+#                    self.center = None
         elif key == "Ctrl-S":
             p("going to save");
 
@@ -215,7 +217,7 @@
         vs.put(background((1, 1, 1)))
 
         unused = []
-        iter = fen.graph.findN_X11_Iter(RDF.type, M.Data)
+        iter = fen.graph.findN_X11_Iter(RDF.type, MIND.Data)
         while (iter.hasNext()):
             obj = iter.next()
             if self.mm.isLinked(obj): continue
@@ -242,10 +244,10 @@
 
     def doMindMap(self, vs, node, x, y, deepnes = 0):
         links = []
-        iter = fen.graph.findN_11X_Iter(node, M.link)
+        iter = fen.graph.findN_11X_Iter(node, STRUCT.linkedTo)
         while iter.hasNext():
             links.append(iter.next())
-        iter = fen.graph.findN_X11_Iter(M.link, node)
+        iter = fen.graph.findN_X11_Iter(STRUCT.linkedTo, node)
         while iter.hasNext():
             links.append(iter.next())
 
@@ -318,8 +320,10 @@
 
 class MindData:
     def place(self, mm, key, vs, cs, rect=0):
-        wi, h = vs.size.width, vs.size.height
-        x0,y0 = wi/2.0, h/2.0
+        p = nodeview.f(fen.graph, key)
+
+#        wi, h = vs.size.width, vs.size.height
+#        x0,y0 = wi/2.0, h/2.0
         box = jarray.zeros(2, 'f')
         vs.coords.getSqSize(cs, box)
         bx, by = box[0], box[1]
@@ -339,8 +343,6 @@
         # put the text
         cs = vs.translateCS(cs, "TR", 0, by*0.3 )
         
-        p = nodeview.f(fen.graph, key)
-
 #        text = vob.vobs.TextVob(textstyle, alphContent
 #                                .getText(fen.graph,key), 0,
 #                                color)
Index: fenfire/org/fenfire/vocab/lava/MINDSTRUCT.java
diff -u fenfire/org/fenfire/vocab/lava/MINDSTRUCT.java:1.2 
fenfire/org/fenfire/vocab/lava/MINDSTRUCT.java:1.3
--- fenfire/org/fenfire/vocab/lava/MINDSTRUCT.java:1.2  Tue Jul  1 12:33:33 2003
+++ fenfire/org/fenfire/vocab/lava/MINDSTRUCT.java      Wed Aug 13 03:03:50 2003
@@ -1,33 +1,13 @@
-// (c): Matti J. Katila
+// (c): Matti J. Katila, Asko Soukka
 
 
 package org.fenfire.vocab.lava;
 import org.fenfire.swamp.Nodes;
 
-/** MindMap structure vocabulary.
- */
+/** Simple MindMap structure vocabulary for data in MinMap diagrams. */
 public class MINDSTRUCT {
     static public final String _nsId = 
-        "http://fenfire.org/EXPERIMENTAL/rdf-v/2003/06/mindstruct";;
-
+       "http://fenfire.org/EXPERIMENTAL/rdf-v/2003/06/mindstruct";;
     static public final Object Data;
-    static public final Object link;
-    static public final Object data2paper;
-    static public final Object data2coords;
-
-    static public final Object Coordinates;
-    static public final Object x;
-    static public final Object y;
-
-    static {
-       Data = Nodes.get(_nsId + "#Data");
-       link = Nodes.get(_nsId + "#link");
-       data2paper = Nodes.get(_nsId + "#data2paper");
-       data2coords = Nodes.get(_nsId + "#data2coords");
-
-       Coordinates = Nodes.get(_nsId + "#Coordinates");
-       x = Nodes.get(_nsId + "#x");
-       y = Nodes.get(_nsId + "#y");
-    }
-
+    static { Data = Nodes.get(_nsId + "#Data"); }
 }