[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz/modules/pp BuoyView.java PPActionsImpl....
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz/gzz/modules/pp BuoyView.java PPActionsImpl.... |
Date: |
Sun, 06 Oct 2002 09:45:46 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/10/06 09:45:46
Modified files:
gzz/modules/pp : BuoyView.java PPActionsImpl.java PlaneView.java
VobKeyer.java Win.java localpp.py
Added files:
gzz/modules/pp : demotest.py
Log message:
Start fixing. demotest will make RAD easier
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/BuoyView.java.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPActionsImpl.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PlaneView.java.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/VobKeyer.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/Win.java.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/localpp.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gzz/gzz/modules/pp/BuoyView.java
diff -c gzz/gzz/modules/pp/BuoyView.java:1.26
gzz/gzz/modules/pp/BuoyView.java:1.27
*** gzz/gzz/modules/pp/BuoyView.java:1.26 Wed Sep 4 08:48:09 2002
--- gzz/gzz/modules/pp/BuoyView.java Sun Oct 6 09:45:46 2002
***************
*** 1,7 ****
/*
BuoyView.java
*
! * Copyright (c) 1999-2001, Ted Nelson and Tuomas Lukka
*
* You may use and distribute under the terms of either the GNU Lesser
* General Public License, either version 2 of the license or,
--- 1,7 ----
/*
BuoyView.java
*
! * Copyright (c) 1999-2002, Ted Nelson and Tuomas Lukka
*
* You may use and distribute under the terms of either the GNU Lesser
* General Public License, either version 2 of the license or,
***************
*** 49,55 ****
*/
public class BuoyView implements View {
! public static final String rcsid = "$Id: BuoyView.java,v 1.26 2002/09/04
12:48:09 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
--- 49,55 ----
*/
public class BuoyView implements View {
! public static final String rcsid = "$Id: BuoyView.java,v 1.27 2002/10/06
13:45:46 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
***************
*** 117,125 ****
bwid = d.width / 5;
// Render the central view and gather the buoys.
! renderCenterView(into, context.getWindow(),
! ctrx, ctry, ctrw, ctrh,
! leftBuoys, rightBuoys);
mapBuoySizes(leftBuoys);
mapBuoySizes(rightBuoys);
--- 117,124 ----
bwid = d.width / 5;
// Render the central view and gather the buoys.
! renderCenterView(into, context.getAccursed(),
! ctrx, ctry, ctrw, ctrh, leftBuoys, rightBuoys);
mapBuoySizes(leftBuoys);
mapBuoySizes(rightBuoys);
Index: gzz/gzz/modules/pp/PPActionsImpl.java
diff -c gzz/gzz/modules/pp/PPActionsImpl.java:1.5
gzz/gzz/modules/pp/PPActionsImpl.java:1.6
*** gzz/gzz/modules/pp/PPActionsImpl.java:1.5 Thu Aug 8 14:51:12 2002
--- gzz/gzz/modules/pp/PPActionsImpl.java Sun Oct 6 09:45:46 2002
***************
*** 74,80 ****
p("New note\n");
c = c.N(d_contains);
! c.setText(""); // XXX null content crashes
Cell arg = c.N(d_pan);
arg.setText("" + x);
arg = arg.N(d_pan);
--- 74,80 ----
p("New note\n");
c = c.N(d_contains);
! c.setText(text); // XXX null content crashes
Cell arg = c.N(d_pan);
arg.setText("" + x);
arg = arg.N(d_pan);
Index: gzz/gzz/modules/pp/PlaneView.java
diff -c gzz/gzz/modules/pp/PlaneView.java:1.45
gzz/gzz/modules/pp/PlaneView.java:1.46
*** gzz/gzz/modules/pp/PlaneView.java:1.45 Wed Sep 25 10:45:43 2002
--- gzz/gzz/modules/pp/PlaneView.java Sun Oct 6 09:45:46 2002
***************
*** 1,7 ****
/*
PlaneView.java
*
! * Copyright (c) 1999-2001, Ted Nelson and Tuomas Lukka
*
* You may use and distribute under the terms of either the GNU Lesser
* General Public License, either version 2 of the license or,
--- 1,7 ----
/*
PlaneView.java
*
! * Copyright (c) 1999-2002, Ted Nelson and Tuomas Lukka
*
* You may use and distribute under the terms of either the GNU Lesser
* General Public License, either version 2 of the license or,
***************
*** 39,47 ****
*/
public class PlaneView {
! public static final String rcsid = "$Id: PlaneView.java,v 1.45 2002/09/25
14:45:43 tjl Exp $";
public static boolean dbg = true;
- private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
static TextStyle style = GraphicsAPI.getInstance()
--- 39,46 ----
*/
public class PlaneView {
! public static final String rcsid = "$Id: PlaneView.java,v 1.46 2002/10/06
13:45:46 tjl Exp $";
public static boolean dbg = true;
private static void pa(String s) { System.err.println(s); }
static TextStyle style = GraphicsAPI.getInstance()
***************
*** 51,78 ****
return (int)(style.getHeight(1) * 1.1f);
}
-
public static final Object TEXTCURSORKEY = new Object();
-
-
VobKeyer keyer;
public PlaneView(VobKeyer keyer) {
this.keyer = keyer;
}
! /** Get the vobscene to be put into a viewport vob.
! * The vobscene contains, in straight vobscene coordinates,
! * the paper contents.
! * The idea is that these could be cached using Obs's...
*/
! VobScene getPaperScene(VobScene parent, Cell cursor, List leftBuoys,
List rightBuoys) {
! p("GetPaperscene: "+cursor);
- VobScene vs = parent.window.createVobScene(new Dimension(42, 42));
Cell plane = cursor.h(Win.d_contains);
Cell note = plane.s(Win.d_contains);
--- 50,70 ----
return (int)(style.getHeight(1) * 1.1f);
}
public static final Object TEXTCURSORKEY = new Object();
VobKeyer keyer;
public PlaneView(VobKeyer keyer) {
this.keyer = keyer;
}
! /** Render a single paper into the given coordinate system
*/
! public VobScene renderPaper(VobScene vs, Cell cursor, int into, List
leftBuoys,
List rightBuoys) {
! if(dbg) pa("GetPaperscene: "+cursor);
Cell plane = cursor.h(Win.d_contains);
Cell note = plane.s(Win.d_contains);
***************
*** 81,92 ****
Dim d_clone = space.getDim(Ids.d_clone);
while(note != null) { // For every note on the paper
! p("Note: "+note);
int place[] = Params.getInts(note.s(Win.d_pan, 1), Win.d_pan, 2,
null);
int notex = place[0];
int notey = place[1];
-
int dw = (int)style.getWidth(note.t(), 1);
int dh = (int)style.getHeight(1);
--- 73,83 ----
Dim d_clone = space.getDim(Ids.d_clone);
while(note != null) { // For every note on the paper
! if(dbg) pa("Note: "+note);
int place[] = Params.getInts(note.s(Win.d_pan, 1), Win.d_pan, 2,
null);
int notex = place[0];
int notey = place[1];
int dw = (int)style.getWidth(note.t(), 1);
int dh = (int)style.getHeight(1);
***************
*** 99,105 ****
int cursorx = (int)style.getWidth(note.t()
.substring(0,Win.offsetInCell),
1);
! p("Placing text cursor "+notex+" "+cursorx+" "+notey+" "+dh);
vs.put(new TextCursorVob(), TEXTCURSORKEY,
6, notex+cursorx,
notey-dh/4, 0, 2*dh);
--- 90,96 ----
int cursorx = (int)style.getWidth(note.t()
.substring(0,Win.offsetInCell),
1);
! if(dbg) pa("Placing text cursor "+notex+" "+cursorx+" "+notey+"
"+dh);
vs.put(new TextCursorVob(), TEXTCURSORKEY,
6, notex+cursorx,
notey-dh/4, 0, 2*dh);
***************
*** 190,196 ****
if(offsOut != null)
offsOut[0] = style.getOffsetInText(cell.t(), 1, (ic[0]+1)/2 * w);
! if(dbg) p("getCellAndOffset: "+x+" "+y+" --> "+ic[0]+" "+ic[1]
+"("+w+") --> ");
return cell;
}
--- 181,187 ----
if(offsOut != null)
offsOut[0] = style.getOffsetInText(cell.t(), 1, (ic[0]+1)/2 * w);
! if(dbg) pa("getCellAndOffset: "+x+" "+y+" --> "+ic[0]+" "+ic[1]
+"("+w+") --> ");
return cell;
}
***************
*** 207,213 ****
VobKeyer.Entry keys) {
Cell plane = cursor.h(Win.d_contains);
! p("Planeview render");
if(dbg) {
pa("View render: "+x+" "+y+" "+w+" "+h);
--- 198,204 ----
VobKeyer.Entry keys) {
Cell plane = cursor.h(Win.d_contains);
! if(dbg) pa("Planeview render");
if(dbg) {
pa("View render: "+x+" "+y+" "+w+" "+h);
***************
*** 243,249 ****
2*zoom/1000.0f, 2*zoom/1000.0f);
into.matcher.add(cs2, keys.coordKey);
! VobScene subvs = getPaperScene(into, cursor, leftBuoys, rightBuoys);
keys.setVobScene(subvs);
ViewportVob viewport = new ViewportVob(subvs);
Vob.RenderInfo inf2 = into.coords.getRenderInfo(cs2);
--- 234,242 ----
2*zoom/1000.0f, 2*zoom/1000.0f);
into.matcher.add(cs2, keys.coordKey);
! // XXX VobScene subvs = getPaperScene(into, cursor, leftBuoys,
rightBuoys);
! VobScene subvs = null;
!
keys.setVobScene(subvs);
ViewportVob viewport = new ViewportVob(subvs);
Vob.RenderInfo inf2 = into.coords.getRenderInfo(cs2);
***************
*** 257,263 ****
// into.dump();
// pa("Buoys AT END: "+leftBuoys+" "+rightBuoys);
! p("Planeview render end");
}
/** A buoy which contains a plane.
--- 250,256 ----
// into.dump();
// pa("Buoys AT END: "+leftBuoys+" "+rightBuoys);
! if(dbg) pa("Planeview render end");
}
/** A buoy which contains a plane.
Index: gzz/gzz/modules/pp/VobKeyer.java
diff -c gzz/gzz/modules/pp/VobKeyer.java:1.11
gzz/gzz/modules/pp/VobKeyer.java:1.12
*** gzz/gzz/modules/pp/VobKeyer.java:1.11 Tue Jul 16 10:28:05 2002
--- gzz/gzz/modules/pp/VobKeyer.java Sun Oct 6 09:45:46 2002
***************
*** 34,41 ****
/** A helper class that handles the mappings between viewports and keys.
*/
! class VobKeyer {
! public static final String rcsid = "$Id: VobKeyer.java,v 1.11 2002/07/16
14:28:05 tjl Exp $";
Main mainEntry;
--- 34,41 ----
/** A helper class that handles the mappings between viewports and keys.
*/
! public class VobKeyer {
! public static final String rcsid = "$Id: VobKeyer.java,v 1.12 2002/10/06
13:45:46 tjl Exp $";
Main mainEntry;
Index: gzz/gzz/modules/pp/Win.java
diff -c gzz/gzz/modules/pp/Win.java:1.52 gzz/gzz/modules/pp/Win.java:1.53
*** gzz/gzz/modules/pp/Win.java:1.52 Thu Sep 26 07:54:07 2002
--- gzz/gzz/modules/pp/Win.java Sun Oct 6 09:45:46 2002
***************
*** 36,42 ****
*/
public class Win extends AbstractBinder implements Shower {
! public static final String rcsid = "$Id: Win.java,v 1.52 2002/09/26 11:54:07
benja Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.err.println(s); }
--- 36,42 ----
*/
public class Win extends AbstractBinder implements Shower {
! public static final String rcsid = "$Id: Win.java,v 1.53 2002/10/06 13:45:46
tjl Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.err.println(s); }
***************
*** 57,62 ****
--- 57,68 ----
static Dim d_contains, d_pan, d_association;
+ public static void initDims(Space space) {
+ d_contains =
space.getDim("0000000008000000E99BD882A20004A0AD6630BFDA693D810DED76CAE65DA9B7E873053466C52E-5");
+ d_pan =
space.getDim("0000000008000000E99BD882A20004A0AD6630BFDA693D810DED76CAE65DA9B7E873053466C52E-4");
+ d_association =
space.getDim("0000000008000000E99BD882A20004A0AD6630BFDA693D810DED76CAE65DA9B7E873053466C52E-7");
+ }
+
/** The current mode of the client.
*/
static int mode = MODE_BROWSE;
***************
*** 186,194 ****
Space space = cursor.space;
! d_contains =
space.getDim("0000000008000000E99BD882A20004A0AD6630BFDA693D810DED76CAE65DA9B7E873053466C52E-5");
! d_pan =
space.getDim("0000000008000000E99BD882A20004A0AD6630BFDA693D810DED76CAE65DA9B7E873053466C52E-4");
! d_association =
space.getDim("0000000008000000E99BD882A20004A0AD6630BFDA693D810DED76CAE65DA9B7E873053466C52E-7");
}
void startDrag(MouseEvent me, Cell clicked) {
--- 192,198 ----
Space space = cursor.space;
! initDims(space);
}
void startDrag(MouseEvent me, Cell clicked) {
Index: gzz/gzz/modules/pp/localpp.py
diff -c gzz/gzz/modules/pp/localpp.py:1.3 gzz/gzz/modules/pp/localpp.py:1.4
*** gzz/gzz/modules/pp/localpp.py:1.3 Wed Sep 4 08:48:09 2002
--- gzz/gzz/modules/pp/localpp.py Sun Oct 6 09:45:46 2002
***************
*** 41,43 ****
--- 41,45 ----
None)
gfxapi.startUpdateManager(Run())
+
+
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gzz/modules/pp BuoyView.java PPActionsImpl....,
Tuomas J. Lukka <=