[Gzz-commits] manuscripts/Paper buoyoing.mp paper.tex

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    manuscripts
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/17 14:58:10

Modified files:
        Paper          : buoyoing.mp paper.tex 

Log message:
        Working on the important demo diagram

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/Paper/buoyoing.mp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/Paper/paper.tex.diff?tr1=1.26&tr2=1.27&r1=text&r2=text

Patches:
Index: manuscripts/Paper/buoyoing.mp
diff -u manuscripts/Paper/buoyoing.mp:1.5 manuscripts/Paper/buoyoing.mp:1.6
--- manuscripts/Paper/buoyoing.mp:1.5   Fri Mar 14 00:44:28 2003
+++ manuscripts/Paper/buoyoing.mp       Mon Mar 17 14:58:09 2003
@@ -19,18 +19,35 @@
 \font\foofontii = cmcss12 scaled 1000 
 etex;
 
-def doc(suffix s)(expr pict) =
+def doc(suffix s)(expr col, pict) =
     picture s.p;
-    s.p = pict;
+    s.p = nullpicture;
+    addto s.p contour bbox(pict) withcolor col;
+    addto s.p also pict;
     addto s.p doublepath bbox(s.p);
     pair s.size;
     s.size = (urcorner pict) - (llcorner pict);
     pair s.loc;
+    transform s.tr;
+enddef;
+
+vardef docpicraw(suffix s)(expr locp) =
+    s.tr := locp;
+    s.loc := (0,0) transformed locp;
+    (s.p transformed locp)
 enddef;
 
 def docpic(suffix s)(expr locp) =
-    addto currentpicture also s.p shifted locp;
-    s.loc := locp;
+    addto currentpicture also docpicraw(s, locp);
+enddef;
+
+vardef docpicclip(suffix s)(expr locp, clipp) =
+    save p;
+    picture p;
+    p := docpicraw(s, locp);
+    clip p to clipp transformed locp;
+    addto p doublepath (clipp transformed locp) withpen pencircle scaled 4pt;
+    addto currentpicture also p;
 enddef;
 
 def ploc(suffix s) = 
@@ -40,7 +57,9 @@
 string lnk[].a;
 string lnk[].b;
 pair lnk[].a.l;
+transform lnk[].a.loc;
 pair lnk[].b.l;
+transform lnk[].b.loc;
 path lnk[].a.p;
 path lnk[].b.p;
 
@@ -48,32 +67,67 @@
 
 def linkend(suffix e)(expr n, ed, ep) =
     lnk[n].e := ed;
-    lnk[n].e.p := ep;
     lnk[n].e.l := center(ep);
+    lnk[n].e.p := ep shifted -center(ep);
 enddef;
 
-def link(sd, sp, ed, ep) =
+def link(expr sd, sp, ed, ep) =
     linkend(a, nlinks, sd, sp);
     linkend(b, nlinks, ed, ep);
     nlinks := nlinks+1;
 enddef;
 
+def strloc(expr str) =
+    scantokens (str & ".tr")
+enddef;
+
+def locatelinkend(suffix e)(expr ind) =
+    lnk[ind].e.loc := identity shifted lnk[ind].e.l transformed 
strloc(lnk[ind].e) ; 
+enddef;
+
+def plainlinkend(suffix e)(expr ind) =
+    draw lnk[ind].e.p transformed lnk[ind].e.loc withpen pencircle scaled 4pt;
+enddef;
+
+vardef plainlink(expr ind) =
+    locatelinkend(a, ind);
+    locatelinkend(b, ind);
+    plainlinkend(a, ind)
+    plainlinkend(b, ind)
+    draw ((0,0) transformed lnk[ind].a.loc){right} .. tension 2 ..
+        ((0,0) transformed lnk[ind].b.loc){right} withpen pencircle scaled 6pt;
+enddef;
+
 def cir(expr x, y, r) =
-    (x-r,y)...(x,y-r)...(x+r,y)...(x,y+r)...cycle
+    (x-2*r,y)...(x,y-r)...(x+2*r,y)...(x,y+r)...cycle
 enddef;
 
-link("a", cir(50,50,40), "c", cir(100,100,30));
+link("a", cir(50,30,25), "c", cir(75,110,40));
+link("b", cir(50,230,30), "a", cir(350,290,30));
+link("b", cir(60,170,35), "d", cir(150,60,50));
+link("c", cir(70,160,37), "b", cir(58,310,32));
+
+
 
 picture p;
 
-doc(a, btex \hv\vbox{\hsize=3cm\tolerance=10000
+doc(a, (1,.90,.80), btex \hv\vbox{\hsize=3cm\tolerance=10000
 \columnseprule=.4pt
 \columnsep=.5cm
 \parskip .5cm
 \linewidth=18cm\begin{multicols}{5}\loremiii
 \end{multicols}}etex);
 
-doc(b, btex 
+doc(b, (.75,1,.75), btex \rm\vbox{\hsize=4.5cm\tolerance=10000\loremii}etex);
+
+doc(c, (.90,.80,1), btex 
+\foofonti\vbox{\linewidth=15cm\tolerance=10000
+\begin{multicols}{3}\loremiii\end{multicols}}
+etex);
+doc(d, (.80,1,1), btex 
+\foofontii\vbox{\hsize=10.5cm\tolerance=10000\loremii}etex);
+
+doc(e, (1,.80,1), btex 
 \sc\vbox{
 \linewidth=10cm
 \begin{multicols}{3}
@@ -81,22 +135,18 @@
 \end{multicols}}
 etex);
 
-doc(c, btex \rm\vbox{\hsize=6cm\tolerance=10000\loremii}etex);
-
-doc(d, btex 
-\foofonti\vbox{\linewidth=15cm\tolerance=10000
-\begin{multicols}{3}\loremiii\end{multicols}}
-etex);
-doc(e, btex 
-\foofontii\vbox{\hsize=10.5cm\tolerance=10000\loremii}etex);
-
 beginfig(1);
 
-docpic(a, (0,0));
-docpic(c, a.loc + (0, -400));
-docpic(d, c.loc + (xpart(c.size)+50, 0));
-docpic(e, c.loc + (0, -400));
-docpic(b, e.loc + (xpart(e.size)+50, 0));
+docpic(a, identity);
+docpic(b, identity shifted (a.loc + (0, -ypart(b.size)-50)));
+docpic(c, identity shifted (b.loc + (xpart(b.size)+50, 0)));
+docpic(d, identity shifted (b.loc + (0, -400)));
+docpic(e, identity shifted (d.loc + (xpart(d.size)+50, 0)));
+
+plainlink(0);
+plainlink(1);
+plainlink(2);
+plainlink(3);
 
 % addto currentpicture also a.p;
 % 
@@ -109,6 +159,55 @@
 
 scantokens("ploc(b)");
 
+endfig;
+
+cor = 20;
+path csp;
+csp = (-200, 0){up} ... (-200+cor, 150-cor) ... (0, 150){right};
+csp := (csp & (reverse csp xscaled -1) ..(csp scaled -1) ..(reverse csp 
yscaled -1)) .. cycle ;
+
+ccx = 210;
+ccy = 160;
+
+def cscreen =
+    clip currentpicture to csp;
+    draw csp withpen pencircle scaled 3pt;
+    draw (-ccx,-ccy) -- (-ccx,ccy) -- (ccx, ccy) -- (ccx,-ccy) -- cycle 
+           withpen pencircle scaled 2pt;;
+enddef;
+
+beginfig(2);
+
+docpic(a, identity shifted (-50, -50) scaled 1.2);
+
+docpicclip(c, identity shifted (-lnk0b.l) scaled .7 rotated -15 
shifted(150,-60),
+           lnk0b.p scaled 1.05 shifted lnk0b.l);
+
+locatelinkend(a, 0);
+locatelinkend(b, 0);
+
+draw ((0,0) transformed lnk0.a.loc) .. 
+     ((0,0) transformed lnk0.b.loc) withpen pencircle scaled 3pt;
+
+cscreen;
+
+endfig;
+
+beginfig(3);
+
+
+docpic(b, identity shifted (-.5*b.size) scaled 1.4);
+
+docpicclip(a, identity shifted (-lnk1b.l) scaled .7 rotated -15 shifted 
(150,10),
+           lnk1b.p scaled 1.5 shifted lnk1b.l);
+
+locatelinkend(a, 1);
+locatelinkend(b, 1);
+
+draw ((0,0) transformed lnk1.a.loc) .. 
+     ((0,0) transformed lnk1.b.loc) withpen pencircle scaled 3pt;
+
+cscreen;
 endfig;
 
 verbatimtex
Index: manuscripts/Paper/paper.tex
diff -u manuscripts/Paper/paper.tex:1.26 manuscripts/Paper/paper.tex:1.27
--- manuscripts/Paper/paper.tex:1.26    Mon Mar 17 11:51:21 2003
+++ manuscripts/Paper/paper.tex Mon Mar 17 14:58:10 2003
@@ -438,15 +438,18 @@
 
 The links are between specific locations
 
-\begin{figure}
-\includegraphics[width=\hsize]{buoyoing.1}
+\begin{figure*}
+\def\bw{7cm}
+\includegraphics[width=\bw]{buoyoing.1}
+\includegraphics[width=\bw]{buoyoing.2}
 \caption{
-a) An example network of documents to be browsed using BuoyOING.
+An example of the structure used by BuoyOING.
+a) A small network of documents.
 b)..e) The animation seen when traversing the link from node F to H.
 In b) we are in the node F and see the relevant {\em fragment} of H,
 and in the c) and d) the view fluidly animates to the opposite case.
 }
-\end{figure}
+\end{figure*}
 
 In the diagram above, the letters and colors helped identify the documents.
 Now, 
@@ -503,7 +506,7 @@
 \begin{figure}
 \centering
 %\fbox{\vbox{\vskip 3in}}
-\includegraphics{perceptual-model}
+% \includegraphics{perceptual-model}
 \caption{
 \label{fig-perceptual}
 The qualitative model of visual perception used to create
@@ -685,7 +688,7 @@
 
 
 \begin{figure}[htbp]
-\includegraphics[width=\linewidth]{pipe.1}
+% \includegraphics[width=\linewidth]{pipe.1}
 \caption{\label{figpipeline}
 The parameter hierarchy in our implementation.
 See text for explanations.
@@ -974,7 +977,7 @@
 
 \begin{figure*}
 \centering
-\includegraphics[height=10cm]{multipaper.ps}
+% \includegraphics[height=10cm]{multipaper.ps}
 \caption{
 \label{fig-examples}
 A number of unique backgrounds generated by our system.
@@ -985,7 +988,7 @@
 
 \begin{figure}
 \centering
-\includegraphics[height=5cm]{paperbasistex.ps}
+% \includegraphics[height=5cm]{paperbasistex.ps}
 \caption{
 \label{fig-basis}
 The complete set of 2D basis textures used by our implementation.
@@ -997,10 +1000,10 @@
 \begin{figure}
 \centering
 \def\w{4cm}
-\includegraphics[width=\w]{texcomb_a.ps}%
-\includegraphics[width=\w]{texcomb_b.ps}\\
-\includegraphics[width=\w]{texcomb_c.ps}%
-\includegraphics[width=\w]{texcomb_d.ps}
+% \includegraphics[width=\w]{texcomb_a.ps}%
+% \includegraphics[width=\w]{texcomb_b.ps}\\
+% \includegraphics[width=\w]{texcomb_c.ps}%
+% \includegraphics[width=\w]{texcomb_d.ps}
 \caption{
 \label{fig-regcomb}
 How the limited register combiners of the NV10 architecture