[Gzz-commits] libvob doc/design_custominput.rst doc/pegboard/...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/09 08:23:51

Modified files:
        doc            : design_custominput.rst 
        doc/pegboard/buoydesign--tjl: peg.rst 
        vob/buoy       : __init__.py buoymanager.py 

Log message:
        Step 2: use the mainview fract stuff

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/doc/design_custominput.rst.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/doc/pegboard/buoydesign--tjl/peg.rst.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/buoy/__init__.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/buoy/buoymanager.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: libvob/doc/design_custominput.rst
diff -u libvob/doc/design_custominput.rst:1.7 
libvob/doc/design_custominput.rst:1.8
--- libvob/doc/design_custominput.rst:1.7       Mon Jun 30 03:08:30 2003
+++ libvob/doc/design_custominput.rst   Sat Aug  9 08:23:51 2003
@@ -253,7 +253,6 @@
     
     class RelativeAxis
        jlink
-       realize RelativeAxisListener
        realize Axis
        methods
            int changedRelative(int delta)
@@ -268,7 +267,7 @@
 
     ---
     horizontally(40, xx, InputDevice, Axis);
-    horizontally(70, yy, PSMD, RelativeInputAxis);
+    horizontally(70, yy, PSMD, RelativeAxis);
     vertically(50, zz, xx, yy);
 
 
Index: libvob/doc/pegboard/buoydesign--tjl/peg.rst
diff -u libvob/doc/pegboard/buoydesign--tjl/peg.rst:1.5 
libvob/doc/pegboard/buoydesign--tjl/peg.rst:1.6
--- libvob/doc/pegboard/buoydesign--tjl/peg.rst:1.5     Sat Aug  9 07:15:50 2003
+++ libvob/doc/pegboard/buoydesign--tjl/peg.rst Sat Aug  9 08:23:51 2003
@@ -3,8 +3,8 @@
 =============================================================
 
 :Author:   Tuomas J. Lukka
-:Last-Modified: $Date: 2003/08/09 11:15:50 $
-:Revision: $Revision: 1.5 $
+:Last-Modified: $Date: 2003/08/09 12:23:51 $
+:Revision: $Revision: 1.6 $
 :Status:   Incomplete
 
 This PEG attempts to define a flexible framework for FenPDF
@@ -284,6 +284,55 @@
 multiplexed between main node types and buoy types.
 There are two different geometry managers, one for the main view and another
 for the buoys.
+
+..  UML:: buoygeometry_flexible
+
+    jlinkpackage org.nongnu.libvob.buoy
+
+    class RealBuoyViewManager
+       dep "use" BuoyMainViewGeometer
+       dep "use" BuoyGeometer
+       dep "use" BuoySizer
+
+    class BuoyMainViewGeometer "interface"
+       jlink
+
+
+    class BuoyGeometer "interface"
+       jlink
+       
+
+    class BuoySizer "interface"
+       jlink
+
+    jlinkpackage org.nongnu.libvob.buoy.impl
+
+    class RatioMainGeometer
+       jlink
+       realize BuoyMainViewGeometer
+
+    class BuoyOnCircleGeometer "abstract"
+       jlink
+       realize BuoyGeometer
+
+    class RatioBuoyOnCircleGeometer 
+       jlink
+       inherit BuoyOnCircleGeometer
+
+    class AspectBuoySizer
+       jlink
+       realize BuoySizer
+
+    ---
+
+    horizontally(100, xx, BuoyMainViewGeometer, BuoySizer, BuoyGeometer);
+
+    vertically(60, kk, RealBuoyViewManager, xx);
+
+    vertically(50, yy, BuoyGeometer, BuoyOnCircleGeometer, 
RatioBuoyOnCircleGeometer);
+
+    vertically(130, zz, BuoyMainViewGeometer, RatioMainGeometer);
+    vertically(130, ww, BuoySizer, AspectBuoySizer);
 
 Both may be called two ways: to create the coordinate systems, or just to set
 the changed coordinates.
Index: libvob/vob/buoy/__init__.py
diff -u libvob/vob/buoy/__init__.py:1.1 libvob/vob/buoy/__init__.py:1.2
--- libvob/vob/buoy/__init__.py:1.1     Thu Apr 10 10:00:18 2003
+++ libvob/vob/buoy/__init__.py Sat Aug  9 08:23:51 2003
@@ -1 +1,13 @@
-#
+# (c) Tuomas J. Lukka
+
+import java as _java
+import org.nongnu.libvob as _libvob
+
+import vob.buoy as _buoy
+
+for i in dir(_libvob.buoy):
+    if _java.lang.Character.isUpperCase(i[0]):
+       setattr(_buoy, i, getattr(_libvob.buoy, i))
+
+impl = _libvob.buoy.impl
+
Index: libvob/vob/buoy/buoymanager.py
diff -u libvob/vob/buoy/buoymanager.py:1.39 libvob/vob/buoy/buoymanager.py:1.40
--- libvob/vob/buoy/buoymanager.py:1.39 Sat Aug  9 07:49:57 2003
+++ libvob/vob/buoy/buoymanager.py      Sat Aug  9 08:23:51 2003
@@ -70,18 +70,26 @@
        self.mainNode = mainNode
         self.connectors = connectors
 
+       self.buoySizer = vob.buoy.impl.AspectBuoySizer(400, 400, 1.5)
+       self.buoyMainViewGeometer = vob.buoy.impl.RatioMainGeometer(
+                                       .2, .25, .6, .5)
+       self.buoyGeometer = vob.buoy.impl.RatioBuoyOnCircleGeometer(
+                                   -.1, -.1, 1.2, 1.2)
+
     def getMainNode(self):
         return self.mainNode
     def _nadir(self, cs):
        n =  self.vs.coords.nadirUnitSq(cs, self.nadirCS)
        self.vs.matcher.add(cs, n, "NADIR")
        return n
-    def drawscene(self, vs, into, buoyinto, nadirCS):
+    def drawscene(self, vs, mainboxinto, into, buoyinto, nadirCS):
        self.vs = vs
        self.nadirCS = nadirCS
        self.buoyinto = buoyinto
        self.cs = { }
 
+       into = self.buoyMainViewGeometer.mainCS(vs, mainboxinto, "K", 1)
+
        self.vs.activate(into)
 
        self.mainNode.renderMain(vs, into)
@@ -238,6 +246,7 @@
 
        for i in range(0, len(self.singles)):
            self.singles[i].drawscene(vs, 
+                   geoms[i][0],
                    geoms[i][1],
                    geoms[i][2], 
                    nadirCS)