[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire/view CanvasView2D.java buoy...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire/view CanvasView2D.java buoy... |
Date: |
Thu, 15 May 2003 11:12:00 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/05/15 11:12:00
Modified files:
org/fenfire/view: CanvasView2D.java
org/fenfire/view/buoy: AbstractMainNode2D.java MainNode2D.java
org/fenfire/view/lava: FenPDFContext.java RSTText.java
Log message:
show cursor in center
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/MainNode2D.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/FenPDFContext.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/RSTText.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.14
fenfire/org/fenfire/view/CanvasView2D.java:1.15
--- fenfire/org/fenfire/view/CanvasView2D.java:1.14 Tue May 13 07:48:32 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java Thu May 15 11:12:00 2003
@@ -20,7 +20,7 @@
/** A View2D of a CANVAS2D, with a given node function.
*/
public class CanvasView2D extends View2D implements NodedView2D{
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.14 2003/05/13
11:48:32 tjl Exp $";
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.15 2003/05/15
15:12:00 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("CanvasView2D::"+s);
}
@@ -70,6 +70,7 @@
}
p.place(vs, cs);
}
+
if (dbg) pa("Canvas DONE");
}
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.8
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.9
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.8 Wed May 14
07:54:45 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java Thu May 15
11:12:00 2003
@@ -23,6 +23,8 @@
public View2D getView2D() { return view2d; }
protected float panX, panY;
+ protected boolean cursor = true;
+ public void setCursor(boolean cursor) { this.cursor = cursor; }
public interface Factory {
AbstractMainNode2D create(Object plane, View2D view2d,
@@ -55,7 +57,9 @@
public void keystroke(String s) {
context.handleKeyStroke(s, view2d);
}
-
+ public interface Render {
+ void mainNodeToBeRender(AbstractMainNode2D main);
+ }
/** Cause the changes to the zooming and panning variables
* to be shown in the given vobscene.
@@ -146,22 +150,19 @@
// See around of objects
if(m_state[2] == e.BUTTON3_MASK &&
e.getID() == MouseEvent.MOUSE_CLICKED){
-
View2D view = getView2D();
while (view.getChildView2D() != null)
view = view.getChildView2D();
-
+
// currently only for canvas2d canvases
if (view instanceof CanvasView2D) {
-
+
Object obj = ((CanvasView2D)view).getNode(oldVobScene,
e.getX(), e.getY(),
plane, box2screen, box2screen,
box2paper, null);
- if (obj != null) {
- p("Object is: "+ obj.toString() + " TADAA!!");
- context.setAccursed(obj);
- AbstractUpdateManager.chg();
- }
+ if (obj != null) if (dbg) p("Object is: "+ obj.toString());
+ context.setAccursed(obj);
+ AbstractUpdateManager.chg();
}
else p("not a canvas view?");
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.20
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.21
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.20 Tue May 13 15:52:08 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java Thu May 15 11:12:00 2003
@@ -33,6 +33,8 @@
import java.awt.event.MouseEvent;
+import org.nongnu.libvob.vobs.*;
+
/** A BuoyViewMainNode showing a 2D plane rendered through
* a View2D. This class implements the keyboard and mouse
* command for moving on the spatial plane.
@@ -76,6 +78,7 @@
}
public void renderMain(VobScene vs, int into) {
+ context.mainNodeToBeRender(this);
vs.coords.getSqSize(into, tmp);
boxw = tmp[0]; boxh = tmp[1];
box2screen = into;
@@ -86,6 +89,21 @@
vs.matcher.add(box2screen, box2paper, "BOX2PAPER");
setZoomPan(vs, box2paper);
view2d.render(vs, plane, into, into, box2paper);
+
+ if (cursor) {
+ /*
+ //int paper2box = vs.invertCS(box2paper, "main_canvasview_INv");
+
+ int paper2screen = vs.concatCS(box2screen, "main_canvasview_conc",
+ box2paper);// paper2box);
+ int cursor = vs.orthoBoxCS(paper2screen, "CURSOR", 0,
+ panX, panY, 1,1, 30, 39);
+ */
+ int cursor = vs.orthoBoxCS(into, "CURSOR", 0,
+ tmp[0]/2, tmp[1]/2, 1,1, tmp[0]/12,
tmp[1]/12);
+ vs.put(new LineVob(0,0,0,1, java.awt.Color.darkGray), cursor);
+ if(dbg) p("Cursor");
+ } else p("not cursor!");
}
protected void setZoomPan(VobScene vs, int mainFrame) {
Index: fenfire/org/fenfire/view/lava/FenPDFContext.java
diff -u fenfire/org/fenfire/view/lava/FenPDFContext.java:1.2
fenfire/org/fenfire/view/lava/FenPDFContext.java:1.3
--- fenfire/org/fenfire/view/lava/FenPDFContext.java:1.2 Wed May 14
08:32:53 2003
+++ fenfire/org/fenfire/view/lava/FenPDFContext.java Thu May 15 11:12:00 2003
@@ -2,6 +2,7 @@
package org.fenfire.view.lava;
import org.fenfire.view.*;
+import org.fenfire.view.buoy.*;
import org.fenfire.swamp.*;
import org.fenfire.modules.pp.*;
import org.fenfire.modules.pp.lava.*;
@@ -20,7 +21,10 @@
* RULE!: context must be always left so that inserting
* text can be done easily.
*/
-public class FenPDFContext implements ContextNodeView.Context {
+public class FenPDFContext implements
+ ContextNodeView.Context,
+ AbstractMainNode2D.Render
+{
public static boolean dbg = true;
private static void p(String s) { System.out.println("FenPDFContext::
"+s); }
@@ -45,6 +49,7 @@
}
+ /** call back from ContextNodeView */
public void isCurrent(Object node, ContextNodeView nv) {
if (node==accursed) {
nv.setUnCached();
@@ -53,7 +58,7 @@
}
}
-
+ /** call back from RSTText */
public void isToBePlaced(Object node, TextHandler text) {
p("n"+node+" == "+accursed);
if (node==accursed) {
@@ -63,6 +68,12 @@
text.setColor(java.awt.Color.black);
text.setCursorOffset(-1);
}
+ }
+
+ /** call back from AbstractMainNodeView2D */
+ public void mainNodeToBeRender(AbstractMainNode2D main) {
+ if (accursed==null) main.setCursor(true);
+ else main.setCursor(false);
}
Index: fenfire/org/fenfire/view/lava/RSTText.java
diff -u fenfire/org/fenfire/view/lava/RSTText.java:1.1
fenfire/org/fenfire/view/lava/RSTText.java:1.2
--- fenfire/org/fenfire/view/lava/RSTText.java:1.1 Wed May 14 07:54:45 2003
+++ fenfire/org/fenfire/view/lava/RSTText.java Thu May 15 11:12:00 2003
@@ -37,6 +37,8 @@
* the given node as text.
*/
public class RSTText extends TextHandler implements NodeFunction {
+
+ static public boolean dbg = false;
private void p(String s) { System.out.println("RSTText:: "+s); }
final LineVob cursorVob = new LineVob(0, 0, 0, 1, java.awt.Color.black);
@@ -61,7 +63,7 @@
if (context == null) throw new Error("No context set");
context.isToBePlaced(node, this);
- p("placed, offs: "+cursorOffset);
+ if (dbg) p("placed, offs: "+cursorOffset);
Enfilade1D enf = (Enfilade1D)nodeContent.f(g, node);
@@ -78,6 +80,7 @@
0, 0, height, height);
vs.put(vob, scaled);
+ /*
// doesn't work, could someone fix this?
// I get "Error: CallistCoorded with non-glperformable."
if(offs >= 0) {
@@ -87,6 +90,7 @@
x,0, 1,1, 1, height);
vs.map.put(cursorVob, cursor);
}
+ */
}
public float getWidth() { return width; }
public float getHeight() { return height; }
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire/view CanvasView2D.java buoy...,
Matti Katila <=