[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/26 10:26:34

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

Log message:
        optimizing, features, looking good now

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.47&tr2=1.48&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.42 fenfire/org/fenfire/demo/mm.py:1.43
--- fenfire/org/fenfire/demo/mm.py:1.42 Tue Aug 26 09:21:09 2003
+++ fenfire/org/fenfire/demo/mm.py      Tue Aug 26 10:26:34 2003
@@ -159,6 +159,7 @@
         if self.c.getAccursed() == None:
             self.c.setAccursed(ff.util.RDFUtil.N(self.fen.graph, 
MINDSTRUCT.Data))
             self.c.setOffset(0)
+            self.components.append(self.c.getAccursed())
         offset = self.c.getOffset()
         self.alphContent.insertText(self.c.getAccursed(), offset, text, 1)
         self.c.setOffset(offset + len(text))
@@ -175,11 +176,11 @@
 
         offset = self.c.getOffset()
         if offset == 0 and l == 0:
+            try: self.components.remove(accursed)
+            except ValueError: pass
             self.fen.graph.rm_111(accursed, RDF.type, MINDSTRUCT.Data)
-            it = self.fen.graph.findN_X11_Iter(RDF.type, MINDSTRUCT.Data)
             self.c.setAccursed(None)
-            while it.hasNext():
-                node = it.next()
+            for node in self.components:
                 if structLink.isLinked(node): continue
                 else: self.c.setAccursed(node)
             if dbg: p('Offset after deleteText:', self.getOffset(), l)
@@ -198,8 +199,8 @@
                     self.fen.graph.rm_111(with, STRUCTLINK.linkedTo, obj)
                     totRemoved += 1
         except: pass
-        if totRemoved and structLink.isLinked(obj) \
-               and not Traversals.isConnected(obj, STRUCTLINK.linkedTo, with, 
fen.graph):
+        if totRemoved and (not structLink.isLinked(obj) or 
(structLink.isLinked(obj) \
+               and not Traversals.isConnected(obj, STRUCTLINK.linkedTo, with, 
fen.graph))):
             self.components.append(obj)
         return totRemoved
 
@@ -255,20 +256,14 @@
             # scaling
             nodeScale = ff.fenmm.MMGeometry.getTextScale(int(100+into[2]))
 
-            if node == self.context.main.getPlane(): # from border to linked
-                cursor.setOffset((x-into[0])/scale/nodeScale, 
(y-into[1])/scale/nodeScale)
-            elif structLink.isLinked(node): # from linked or border to another 
linked
-                try:
-                    self.context.components.remove(node)
-                    self.context.components.append(main.getPlane())
-                    cursor.setOffset((x-into[0])/nodeScale, 
(y-into[1])/nodeScale)
-                except ValueError:
-                    cursor.setOffset((x-into[0])/scale/nodeScale, 
(y-into[1])/scale/nodeScale)
-                    
-                focus = main.getFocus()
-                main.setNewPlane(node, focus.getPanX(), focus.getPanY(), 
focus.getZoom())
-            else: # from border to border
+            try:
+                self.context.components.remove(node)
+                self.context.components.append(main.getPlane())
                 cursor.setOffset((x-into[0])/nodeScale, (y-into[1])/nodeScale)
+            except ValueError:
+                cursor.setOffset((x-into[0])/scale/nodeScale, 
(y-into[1])/scale/nodeScale)
+            focus = main.getFocus()
+            main.setNewPlane(node, focus.getPanX(), focus.getPanY(), 
focus.getZoom())
 
         elif rmb == 'link':
             if node == main.getPlane(): pass
@@ -302,12 +297,22 @@
         self.alphContent = ff.util.AlphContent(fen)
         components = []
         if do_load_graph:
+            # find separate components
             nodes = fen.graph.findN_X1A_Iter(STRUCTLINK.linkedTo)
             comps = Traversals.findComponents(nodes, STRUCTLINK.linkedTo, 
fen.graph)
             centered = comps[1]
+
             for component in comps[0].toArray():
                 components.append(component)
             components.remove(centered)
+
+            nodes = fen.graph.findN_X11_Iter(RDF.type, MINDSTRUCT.Data)
+            # find non-linked nodes
+            while (nodes.hasNext()):
+                obj = nodes.next()
+                if structLink.isLinked(obj): continue
+                if obj == centered: continue
+                components.append(component)
         else:
             centered = ff.util.RDFUtil.N(fen.graph, MINDSTRUCT.Data)
             self.alphContent.insertText(centered, 0, 'Home', 1)
@@ -481,6 +486,21 @@
         if key == "End" or key == "Ctrl-E":
             """Move the cursor to the end of the line."""
             self.context.c.moveEndLine()
+        if key == "Ctrl-2":
+            """Set 2D filleting."""
+            self.view.depthColor = 0
+            self.view.fillet3d = 0
+            self.main.floatingView.depthColor = 0
+            self.main.floatingView.fillet3d = 0
+        if key == "Ctrl-3":
+            """Set 3D filleting."""
+            self.view.depthColor = 1
+            self.view.fillet3d = 1
+            self.main.floatingView.depthColor = 1
+            self.main.floatingView.fillet3d = 1
+        if key == "Ctrl-B":
+            """Buffer accursed node."""
+            self.context.components.append(self.context.c.getAccursed())
         if key == "Ctrl-0":
             """Set calibrating state of custom controller on / off."""
             if self.calibrating and self.naxes: 
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.47 
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.48
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.47 Tue Aug 26 09:21:10 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py      Tue Aug 26 10:26:34 2003
@@ -56,11 +56,12 @@
         self.multiplexer = ff.swamp.MultiplexerNodeFunction(normal, accursed)
 
         self.floatingView = MindMapView2D(fen, context)
-        self.floatingView.filletLength = 50
-        self.floatingView.filletWidth = 20
+        self.floatingView.multiplexer = self.multiplexer
+        self.floatingView.filletLength = 40
+        self.floatingView.filletWidth = 25
         self.floatingView.initRotation = 0
         self.floatingView.depth = 1
-        self.floatingView.geometry.init(50, 20, 0, 1)
+        self.floatingView.geometry.init(40, 25, 0, 1)
         
     def renderMain(self, vs, into):
         ff.view.buoy.MainNode2D.renderMain(self, vs, into)
@@ -73,17 +74,7 @@
             set.add(accursed)
             self.multiplexer.setMultiplexerNodes(set);
 
-        # then draw unused mind data into floating buffer.
-        buffer = []
-        iter = self.fen.graph.findN_X11_Iter(RDF.type, MINDSTRUCT.Data)
-        while (iter.hasNext()):
-            obj = iter.next()
-            if self.structLink.isLinked(obj): continue
-            if obj == self.getPlane(): continue
-            buffer.append(obj)
-
-        buffer.extend(self.context.components)
-        floating = self.floatingBuffer(vs, into, buffer)
+        floating = self.floatingBuffer(vs, into, self.context.components)
         i = floating.keySet().iterator()
 
         while i.hasNext():
@@ -156,6 +147,7 @@
         self.thick = 1
         self.drawEdge = 0
         self.drawInside = 1
+        self.drawInsideColor = java.awt.Color.blue
         self.depthColor = 1
         self.lines = 0
         self.ellipses = 1
@@ -217,7 +209,7 @@
             if dbg: p('Fillet coordinates:', c)
             def pc(conns, cs):
                 if self.context.main.getPlane() == node:
-                    vs.put(vob.putil.misc.getDListNocoords("""Color 1. 0. 
0."""))
+                    vs.put(vob.putil.misc.getDListNocoords("Color 1 0 0"))
                 vs.put(conns, cs+c)
 
             # draw fillets
@@ -234,7 +226,6 @@
                 p = self.multiplexer.f(self.fen.graph, node) 
                 cs = vs.orthoBoxCS(cs, node, 0, 0, 0, 0, 0, 0, 0)
                 p.place(vs, cs)
-                
 
     def putNodeContent(self, vs, node, into):
         # scaling after depth