[Gzz-commits] fenfire/org/fenfire demo/actions.py demo/buoyoi...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/06/26 08:29:30

Modified files:
        org/fenfire/demo: actions.py buoyoing.py fenpdfcontext.py 
Added files:
        org/fenfire/view: AreaSelectingView2D.java 

Log message:
        area selection

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/actions.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/AreaSelectingView2D.java?rev=1.1

Patches:
Index: fenfire/org/fenfire/demo/actions.py
diff -u fenfire/org/fenfire/demo/actions.py:1.3 
fenfire/org/fenfire/demo/actions.py:1.4
--- fenfire/org/fenfire/demo/actions.py:1.3     Wed Jun 25 22:29:01 2003
+++ fenfire/org/fenfire/demo/actions.py Thu Jun 26 08:29:30 2003
@@ -36,6 +36,9 @@
 ######## Actions to control pan of main nodes etc.
 
 class MovePanFast(AbstractContextController):
+    def __init__(self, context, select):
+        AbstractContextController(context)
+        self.select = select
     def isChangeable(self): return 1
     def change(self, x, y):
         if dbg: p('move pan fast')
@@ -46,6 +49,10 @@
         self.obj.chgFast(self.oldVS)
 
         self.context.states.p()
+        if self.context.states.hasCtrl():
+            xy0 = self.context.states.getPressPans()
+            self.select.setArea(xy[0], xy[1], f.getPanX(), f.getPanY())
+        else: self.select.setArea(0,0,0,0)
 
 class MovePanSlow(ff.util.ControlBinding.AbstractController):
     def isChangeable(self): return 0
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.82 
fenfire/org/fenfire/demo/buoyoing.py:1.83
--- fenfire/org/fenfire/demo/buoyoing.py:1.82   Wed Jun 25 22:29:01 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Thu Jun 26 08:29:30 2003
@@ -121,7 +121,8 @@
 view = ff.view.CanvasView2D(fen, nodeview)
 view.cull = 1
 paperview = ff.view.PaperView2D(vob.putil.demowindow.w, view)
-irregu = ff.view.IrregularViewportView2D(paperview)
+selectview = ff.view.AreaSelectingView2D(paperview)
+irregu = ff.view.IrregularViewportView2D(selectview)
 
 ff.view.buoy.NodeType2D.effigy = 0
 ff.view.buoy.NodeType2DFull.effigy = 0
@@ -148,8 +149,8 @@
 # Default controls
 
 ctrl.setContext(context)
-main_ctrl.add(MovePanFast(context), -1, ctrl.WHEEL, 7,0, ctrl.VERTICAL)
-main_ctrl.add(MovePanFast(context), 1, ctrl.DRAG, 1, 0, ctrl.ALL)
+main_ctrl.add(MovePanFast(context, selectview), -1, ctrl.WHEEL, 7,0, 
ctrl.VERTICAL)
+main_ctrl.add(MovePanFast(context, selectview), 1, ctrl.DRAG, 1, 0, ctrl.ALL)
 main_ctrl.add(MovePanSlow(), 1, ctrl.CLICK)
 main_ctrl.add(ZoomPan(), 3, ctrl.DRAG, 1, 0, ctrl.VERTICAL)
 main_ctrl.add(PanSize(), 3, ctrl.DRAG, 1, 0, ctrl.HORIZONTAL)
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.2 
fenfire/org/fenfire/demo/fenpdfcontext.py:1.3
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.2       Thu Jun 26 03:32:58 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py   Thu Jun 26 08:29:30 2003
@@ -58,9 +58,13 @@
         if self.ctrl:
             w.setCursor('default')
         else: w.setCursor('hand')
+    def hasCtrl(self):
+        return self.ctrl
     def setPressPans(self, x, y):
         self.pressPanX = x
         self.pressPanY = y
+    def getPressPans(self):
+        return [ self.pressPanX, self.pressPanY ]
     def p(self):
         p('Pans', self.pressPanX, self.pressPanY)