===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/glib,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -p -r1.7 -r1.11
--- OpenXM_contrib2/asir2000/lib/glib	2002/07/15 02:14:48	1.7
+++ OpenXM_contrib2/asir2000/lib/glib	2002/09/10 06:18:46	1.11
@@ -1,6 +1,9 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/lib/glib,v 1.6 2002/07/14 07:10:01 takayama Exp $ */
-/* $Id: glib,v 1.7 2002/07/15 02:14:48 takayama Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/lib/glib,v 1.10 2002/08/08 08:56:31 takayama Exp $ */
+/* $Id: glib,v 1.11 2002/09/10 06:18:46 takayama Exp $ */
 
+/* BUG: this library has not yet been adapted to the new automatic launcher
+        of ox_plot. 2002, Aug, 4.  Do not load glib more than twice. 
+*/
 
 /* #define CLIP  1 */
 /* #define DEBUG 1 */
@@ -24,7 +27,7 @@ def roots(F) {
 */
 
 /*  ---------------------------------------------- */
-def ox_get_errors(P) {
+def glib_ox_get_errors(P) {
   ox_push_cmd(P,276);
   return(ox_pop_cmo(P));
 }
@@ -41,6 +44,7 @@ Glib_canvas_x = 400$
 Glib_canvas_y = 400$
 Glib_xmin=0$  Glib_xmax=Glib_canvas_x$
 Glib_ymin=0$  Glib_ymax=Glib_canvas_y$
+Glib_math_coordinate=0$
 #define START_SERVER \
 extern Glib_server_started, Glib_process$ \
 if (type(Glib_server_started) == 0) { \
@@ -58,7 +62,7 @@ def open_Canvas(P,S) {
   open_canvas(P,S);
   R = ox_pop_cmo(P);
 /*
-  if (ox_get_errors(P) == []) {
+  if (glib_ox_get_errors(P) == []) {
     R = ox_pop_cmo(P);
   }else{
     debug;
@@ -67,6 +71,14 @@ def open_Canvas(P,S) {
   return(R);
 }
 
+/*&usage begin: glib_open()
+  It starts the ox_plot server and opens a canvas.
+  The canvas size is set to {Glib_canvas_x} X {Glib_canvas_y}
+  (the default value is 400). 
+  This function is automatically called when the user calls glib
+  functions.
+end: */
+
 def glib_open() {
   extern Glib_canvas_x, Glib_canvas_y,
          Glib_process, Glib_canvas;
@@ -98,7 +110,7 @@ def glib_check_strict() {
   if (Glib_canvas < 0) {
     glib_open();
   }
-  E = ox_get_errors(Glib_process);
+  E = glib_ox_get_errors(Glib_process);
   if (E != []) {
     ox_pops(Glib_process,200);
     print(E);
@@ -119,6 +131,9 @@ def glib_clear() {
 /*&usage begin: glib_window(Xmin,Ymin,Xmax,Ymax)
   It generates a window with the left top corner [{Xmin},{Ymin}] and
   the right bottom corner [{Xmax},{Ymax}].
+  If the global variable {Glib_math_coordinate} is set to 1, mathematical
+  coordinate system will be employed, i.e., the left top
+  corner will have the coordinate [{Xmin},{Ymax}].
   example: glib_window(-1,-1,10,10);
 end: */
 def glib_window(Xmin,Ymin,Xmax,Ymax) {
@@ -153,24 +168,34 @@ def glib_check_arg(X,Y) {
 end: */
 def glib_putpixel(X,Y) {
   extern Glib_process, Glib_canvas,
-         Glib_xoffset, Glib_yoffset, Glib_xmag, Glib_ymag, Glib_ps;
+         Glib_xoffset, Glib_yoffset, Glib_xmag, Glib_ymag, Glib_ps,
+         Glib_math_coordinate, Glib_canvas_y;
   if (Glib_canvas < 0) glib_open();
   glib_check();
   glib_check_arg(X,Y);
   C = getopt(color);
-  Pos = [glib_floor(Glib_xmag*(X+Glib_xoffset)),
-         glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+  if (Glib_math_coordinate) {
+    Pos = [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           Glib_canvas_y-glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+    Pos2= [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+  }else{
+    Pos = [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+    Pos2= [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           Glib_canvas_y-glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+  }
   if ( type(C) != -1 ) {
     draw_obj(Glib_process,Glib_canvas,Pos,C);
-    if (Glib_ps) glib_history(["putpixel",Pos,C]);
+    if (Glib_ps) glib_history(["putpixel",Pos2,C]);
   }else{
     draw_obj(Glib_process,Glib_canvas,Pos);
-    if (Glib_ps) glib_history(["putpixel",Pos,0]);
+    if (Glib_ps) glib_history(["putpixel",Pos2,0]);
   }
 }
 
 /*&usage begin: glib_line(X0,Y0,X1,Y1|color)
-  It draw the line [{X0},{Y0}]-- [{X1},{Y1}]with {color}
+  It draws the line [{X0},{Y0}]-- [{X1},{Y1}] with {color}
   example: glib_line(0,0,5,3/2 | color=0xff00ff);
 end: */
 def glib_line(X0,Y0,X1,Y1) {
@@ -188,7 +213,7 @@ def glib_clip_line(X0,Y0,X1,Y1,Color) {
   /* X0, Y0, X1, Y1 should be integers. 
      Coordinates are already translated. */
   extern Glib_process, Glib_canvas, Glib_canvas_x, Glib_canvas_y,
-         Glib_ps;
+         Glib_ps,  Glib_math_coordinate;
   if (Glib_canvas < 0) glib_open();
 
 if (Glib_ps) {
@@ -230,13 +255,21 @@ if (Glib_ps) {
 }
 
   glib_check();
-  Pos = [glib_floor(X0),glib_floor(Y0),glib_floor(X1),glib_floor(Y1)];
+  if (Glib_math_coordinate) {
+    Pos = [glib_floor(X0),Glib_canvas_y-glib_floor(Y0),
+           glib_floor(X1),Glib_canvas_y-glib_floor(Y1)];
+    Pos2= [glib_floor(X0),glib_floor(Y0),glib_floor(X1),glib_floor(Y1)];
+  }else{
+    Pos = [glib_floor(X0),glib_floor(Y0),glib_floor(X1),glib_floor(Y1)];
+    Pos2 = [glib_floor(X0),Glib_canvas_y-glib_floor(Y0),
+           glib_floor(X1),Glib_canvas_y-glib_floor(Y1)];
+  }
   if ( type(Color) != -1 ) {
     draw_obj(Glib_process,Glib_canvas,Pos,Color);
-    if (Glib_ps) glib_history(["line",Pos,Color]);
+    if (Glib_ps) glib_history(["line",Pos2,Color]);
   }else{
     draw_obj(Glib_process,Glib_canvas,Pos);
-    if (Glib_ps) glib_history(["line",Pos,0]);
+    if (Glib_ps) glib_history(["line",Pos2,0]);
   }
 }
 
@@ -287,25 +320,36 @@ def glib_clip1_y(X0,Y0,X1,Y1,Clip) {
 end: */
 def glib_print(X,Y,Text) {
   extern Glib_process, Glib_canvas,
-         Glib_xoffset, Glib_yoffset, Glib_xmag, Glib_ymag, Glib_ps;
+         Glib_xoffset, Glib_yoffset, Glib_xmag, Glib_ymag, Glib_ps,
+         Glib_math_coordinate, Glib_canvas_y;
   if (Glib_canvas < 0) glib_open();
   glib_check();
   glib_check_arg(X,Y);
   if (type(Text) != 7) error("glib_print(X,Y,Text): Text must be a string.");
   C = getopt(color);
-  Pos = [glib_floor(Glib_xmag*(X+Glib_xoffset)),
-         glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+  if (Glib_math_coordinate) {
+    Pos = [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           Glib_canvas_y-glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+    Pos2= [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+  }else{
+    Pos = [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+    Pos2= [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           Glib_canvas_y-glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+  }
   if ( type(C) != -1 ) {
     draw_string(Glib_process,Glib_canvas,Pos,Text,C);
-    if (Glib_ps) glib_history(["print",Pos,Text,C]);
+    if (Glib_ps) glib_history(["print",Pos2,Text,C]);
   }else{
     draw_string(Glib_process,Glib_canvas,Pos,Text);
-    if (Glib_ps) glib_history(["print",Pos,Text,0]);
+    if (Glib_ps) glib_history(["print",Pos2,Text,0]);
   }
 }
 
 def glib_history(L) {
-  extern Glib_h, Glib_canvas_x, Glib_canvas_y;
+  extern Glib_h, Glib_canvas_x, Glib_canvas_y,
+         Glib_math_coodinate;
   if (L[0] == "putpixel" || L[0] == "print") {
     if (L[1][0] <= Glib_canvas_x && L[1][0] >= 0) {
       if (L[1][1] <= Glib_canvas_x && L[1][1] >= 0) 
@@ -320,7 +364,7 @@ def glib_history(L) {
 /*&usage begin: glib_tops()
   If Glib_ps is set to 1, 
   it returns a postscript program to draw the picture on the canvas.
-  ref: print_output();
+  ref: print_output
 end: */
 def glib_tops() {
   extern Glib_h;
@@ -376,5 +420,17 @@ def glib_ps(L) {
 
   return PS;
 }
+
+/*&usage begin: glib_plot(F)
+  It plots an object {F} on the glib canvas.
+  example: glib_plot([[0,1],[0.1,0.9],[0.2,0.7],[0.3,0.5],[0.4,0.8]]);
+  example: glib_plot(tan(x));
+end: */
+/* bug, xmin, xmax, color should be optional variables. */
+def glib_plot(F) {
+  Opt = getopt();
+  taka_glib_plot(F,Opt);
+}
+
 end$