[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire demo/actions.py demo/buoyoi...
|
From: |
Matti Katila |
|
Subject: |
[Gzz-commits] fenfire/org/fenfire demo/actions.py demo/buoyoi... |
|
Date: |
Sat, 19 Jul 2003 08:55:11 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Matti Katila <address@hidden> 03/07/19 08:55:10
Modified files:
org/fenfire/demo: actions.py buoyoing.py fenpdfcontext.py
org/fenfire/view/buoy: AbstractMainNode2D.java
org/fenfire/view/lava: FenPDFContext.java
Log message:
more cleaning
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/actions.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.97&tr2=1.98&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/FenPDFContext.java.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/demo/actions.py
diff -u fenfire/org/fenfire/demo/actions.py:1.12
fenfire/org/fenfire/demo/actions.py:1.13
--- fenfire/org/fenfire/demo/actions.py:1.12 Sat Jul 19 05:04:36 2003
+++ fenfire/org/fenfire/demo/actions.py Sat Jul 19 08:55:10 2003
@@ -69,7 +69,7 @@
class UnSelectNodeOnPlane(AbstractContextController):
def isChangeable(self): return 0
def controlPoint(self, x, y, scale):
- self.context.setAccursed(None)
+ self.context.states.cursor.setAccursed(None)
class ShowMouseMenu(AbstractContextController):
def isChangeable(self): return 0
@@ -82,14 +82,14 @@
class SelectNodeOnPlane(AbstractContextController):
def isChangeable(self): return 0
def controlPoint(self, x, y, scale):
- self.context.setAccursed(self.obj[1])
+ self.context.states.cursor.setAccursed(self.obj[1])
class MoveNodeOnPlane(AbstractContextController):
def isChangeable(self): return 1
def change(self, x,y):
f = self.obj[0].getFocus()
node = self.obj[1]
- if not self.context.isAccursed(node): return
+ if not self.context.states.cursor.isAccursed(node): return
fX, fY = f.getPanX(), f.getPanY()
f.setPan( fX+x/f.zoom,fY+y/f.zoom)
@@ -161,7 +161,7 @@
return self.p.handleEvent(self.args, ev, vs)
### Drag if something under mouse pointer is accursed!
- if obj != None and self.p.hasBinding(ev) and
self.context.isAccursed(obj):
+ if obj != None and self.p.hasBinding(ev) and
self.context.states.cursor.isAccursed(obj):
self.last = self.p
self.args = [main, obj, self.graph, self.pp]
else:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.97
fenfire/org/fenfire/demo/buoyoing.py:1.98
--- fenfire/org/fenfire/demo/buoyoing.py:1.97 Sat Jul 19 07:12:02 2003
+++ fenfire/org/fenfire/demo/buoyoing.py Sat Jul 19 08:55:10 2003
@@ -171,8 +171,8 @@
context.initMainNodes(2)
nodeview.setContext(context)
textnodeview.setContext(context)
-context.setAccursed(noteA1)
-context.setCursorOffset(3)
+context.states.cursor.setAccursed(noteA1)
+context.states.cursor.setCursorOffset(3)
context.ppView = irregu
context.pageView = None
context.alph = myalph
@@ -320,6 +320,8 @@
self._doset(vs)
+ self.context.renderContext(vs, 0)
+
return [(self.into1, self.buoyinto1), (self.into2, self.buoyinto2)]
def mouse(self, ev, oldvs):
@@ -336,7 +338,6 @@
# ...then see context
if ev.getID() != ev.MOUSE_CLICKED:
return 0
- self.context.setMainNodeIndex(self.mgr.lastIndex)
planes = []
for single in self.mgr.singles:
planes.append(single.getMainNode())
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.11
fenfire/org/fenfire/demo/fenpdfcontext.py:1.12
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.11 Sat Jul 19 07:12:02 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py Sat Jul 19 08:55:10 2003
@@ -4,6 +4,7 @@
from org.fenfire.swamp import Nodes
import org.nongnu.libvob as vob
from org.fenfire.spanimages.gl import papermakers
+import java, jarray
dbg = 0
@@ -146,6 +147,7 @@
self.spanImageFactory = spanImageFactory
self.nodeview = nodeview
self.pageview = None
+ self.lastMain = None
class Selection:
def __init__(self):
@@ -197,7 +199,12 @@
self.w, self.h = .0, .0
-class Context(ff.view.lava.FenPDFContext, SuperCaller):
+
+
+class Context(ff.view.lava.ContextNodeView.Context,
+ ff.view.buoy.AbstractMainNode2D.Render,
+ ff.view.lava.FenPDFContext,
+ SuperCaller):
def __init__(self, win, fen, pp, nv, ctrl, spanImageFactory):
self.super = self.superproxy(ff.view.lava.FenPDFContext)
ff.view.lava.FenPDFContext.__init__(self, fen, pp, nv, ctrl)
@@ -214,6 +221,7 @@
def key(self, key):
self.keys.key(key, self.mgr.getLastMain())
+ # call back from AbstractMainNode2D
def mainNodeToBeRender(self, vs, into, main):
v = main.getView2D()
while v != None:
@@ -223,7 +231,17 @@
v = v.getChildView2D()
self.mousemenu.render(vs)
- self.super.mainNodeToBeRender(vs, into, main)
+ #self.super.mainNodeToBeRender(vs, into, main)
+
+ # draw cursor
+ if not self.states.cursor.hasAccursed() and main ==
self.states.lastMain:
+ tmp = jarray.zeros(2, 'f')
+ vs.coords.getSqSize(into, tmp)
+ cursorCS = vs.orthoBoxCS(into, "CURSOR", 0,
+ tmp[0]/2, tmp[1]/2, 1,1, tmp[0]/12,
tmp[1]/12)
+ vs.put(vob.vobs.LineVob(0,0,0,1, java.awt.Color.darkGray), cursorCS)
+
+
def chgFast(self, oldVS):
s = self.mgr.getSingles()
@@ -231,3 +249,26 @@
i.getMainNode().chgFast(oldVS)
+ # /** call back from ContextNodeView */
+ def isCurrent(self, node, nv):
+ if self.states.cursor.isAccursed(node):
+ nv.setUnCached()
+ else:
+ nv.setCached()
+
+ # /** call back from TextNodeView */
+ def isToBePlaced(self, node, text):
+ if dbg: p("n"+node+" == ")
+ if self.states.cursor.isAccursed(node):
+ text.setColor(java.awt.Color.red)
+ text.setCursorOffset(self.states.cursor.getCursorOffset())
+ else:
+ text.setColor(java.awt.Color.black)
+ text.setCursorOffset(-1)
+
+ def renderContext(self, vs, into):
+ b = ff.view.lava.Button(vs, 0, 30, 0, 50);
+ b.add("[Import PS/PDF]", "IMPORT");
+ b.add("[New paper]", "NEW_PAPER");
+ b.add("[Save]", "SAVE");
+ b.add("[Load]", "LOAD");
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.33
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.34
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.33 Thu Jul 17
12:28:19 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java Sat Jul 19
08:55:10 2003
@@ -122,12 +122,12 @@
}
- /** Ugly hack! Fix fix fix..
+ /** Render the context into the main node view i.e.,
+ * text cursor.
*/
- static public org.fenfire.view.lava.FenPDFContext context = null;
+ static public Render context = null;
public void keystroke(String s) {
- if (context != null)
- context.handleKeyStroke(s, this);
+ throw new Error("Not implemented.");
}
public void renderMain(VobScene vs, int into) {
Index: fenfire/org/fenfire/view/lava/FenPDFContext.java
diff -u fenfire/org/fenfire/view/lava/FenPDFContext.java:1.38
fenfire/org/fenfire/view/lava/FenPDFContext.java:1.39
--- fenfire/org/fenfire/view/lava/FenPDFContext.java:1.38 Thu Jul 17
12:28:19 2003
+++ fenfire/org/fenfire/view/lava/FenPDFContext.java Sat Jul 19 08:55:10 2003
@@ -88,130 +88,32 @@
// current main node nro.
- private int CURR = 0;
public void initMainNodes(int count) {
- if (cursorOffset != null &&
- cursorOffset.length == count) return;
- cursorOffset = new int[count];
- accursedColor = new Color[]{ Color.red, Color.blue,
- Color.yellow, Color.white};
- accursed = new Object[count];
- for (int i=0; i<count; i++) {
- cursorOffset[i] = 0;
- }
+
}
- public void setMainNodeIndex(int index) {
- CURR = index;
- if (dbg) p("set current: "+index);
- }
-
-
- private Color accursedColor[] = null;
- private int cursorOffset[] = null;
- public void setCursorOffset(int offset) { cursorOffset[CURR] = offset; }
-
- private Object[] accursed = null;
- public void setAccursed(Object node) {
- accursed[CURR] = node;
- cursorOffset[CURR] = 0;
- }
-
- public boolean isAccursed(Object node) {
- for (int i=0; i<accursed.length; i++) {
- if (accursed[i] == node) return true;
- }
- return false;
- }
-
/** call back from ContextNodeView */
public void isCurrent(Object node, ContextNodeView nv) {
- if (isAccursed(node)) {
- nv.setUnCached();
- } else {
- nv.setCached();
- }
+ throw new Error("implementation removed");
}
/** call back from RSTText */
public void isToBePlaced(Object node, TextHandler text) {
- if (dbg) p("n"+node+" == "+accursed[CURR]);
-
- if (isAccursed(node)) {
- float count=0;
- float r = 0, g = 0, b = 0;
- for (int i=0; i<accursed.length; i++) {
- if (accursed[i]==node) {
- r += accursedColor[i].getRed();
- g += accursedColor[i].getGreen();
- b += accursedColor[i].getBlue();
- count++;
- }
- }
- r /= count;
- g /= count;
- b /= count;
- //p("colo: " +r+" "+g+" "+b);
- text.setColor(new Color(r/255,g/255,b/255));
- text.setCursorOffset(cursorOffset[CURR]);
- } else {
- text.setColor(java.awt.Color.black);
- text.setCursorOffset(-1);
- }
+ throw new Error("implementation removed");
}
- private boolean cursor = false;
- private boolean link = false;
-
/** call back from AbstractMainNodeView2D */
public void mainNodeToBeRender(VobScene vs, int into,
AbstractMainNode2D main)
{
- // first set everything to false
- cursor = false;
- link = false;
-
- // if in canvas
- if (main instanceof MainNode2D) {
- // what to do if accursed is NULL?
- if (accursed[CURR]==null) {
- if (main instanceof MainNode2D)
- cursor = true;
- // fishey doesn't need cursor (currently)
- }
- if (accursed.length >= 2) {
- if (accursed[0] != accursed[1] &&
- accursed[0] != null &&
- accursed[1] != null) link = true;
- }
- }
-
- //render!
- renderMain(vs, into, main);
- }
-
- private void renderMain(VobScene vs, int into,
- AbstractMainNode2D main)
- {
- if (cursor) {
- float tmp[] = new float[2];
- vs.coords.getSqSize(into, tmp);
- 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);
- }
+ throw new Error("implementation removed");
}
public void renderContext(VobScene vs, int into)
{
- Button b = new Button(vs, 0, 30, 0, 50);
- b.add("[Import PS/PDF]", "IMPORT");
- b.add("[New paper]", "NEW_PAPER");
- if (link) b.add("[Link!]", "LINK");
- b.add("[Save]", "SAVE");
- b.add("[Load]", "LOAD");
+ throw new Error("implementation removed");
}
@@ -260,11 +162,11 @@
return mainNodes;
}
else if (key.equals("LINK")) {
- if (CURR >0) actionLink(1); else actionLink(-1);
+ ;
}
else if (key.equals("NEW_PAPER")) {
String paper = ppAct.newPaper();
- mainNodes[CURR] = new MainNode2D(Nodes.get(paper),
+ mainNodes[0] = new MainNode2D(Nodes.get(paper),
ppView, new
MainNode2D.SimpleFocus(0,0),1,
controller);
return mainNodes;
@@ -289,9 +191,6 @@
//fen.graph.rm_1AA(SAVE.State);
p("rm all worked out");
for (int i=0; i<mainNodes.length; i++) {
- p("accursed: " + accursed[i]+
- "\n main:"+mainNodes[i]+
- "\n plane: "+ mainNodes[i].getPlane());
//if (accursed[i] == null) continue;
fen.graph.add(SAVE.State, SAVE.point,
@@ -347,21 +246,6 @@
return null;
}
- private void actionLinkLeft() { actionLink(-1); }
- private void actionLinkRigth() { actionLink(1); }
- private void actionLink(int side) {
- { try {
- if (side < 0) {
- ppAct.assocNotes(Nodes.toString(accursed[0]), -1,
- Nodes.toString(accursed[1]));
- } else {
- ppAct.assocNotes(Nodes.toString(accursed[0]), 1,
- Nodes.toString(accursed[1]));
- }
- } catch (Exception e) {
- p("exception - do nothing.."+e);
- }}
- }
public void handleKeyStroke(String s, AbstractMainNode2D main) {