===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/if.c,v
retrieving revision 1.15
retrieving revision 1.20
diff -u -p -r1.15 -r1.20
--- OpenXM_contrib2/asir2000/plot/if.c	2002/08/15 05:36:10	1.15
+++ OpenXM_contrib2/asir2000/plot/if.c	2006/11/09 03:41:47	1.20
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/plot/if.c,v 1.14 2002/08/02 09:44:37 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/if.c,v 1.19 2005/12/21 23:18:16 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -173,6 +173,7 @@ int memory_plot(NODE arg,LIST *bytes)
 	zrange = (LIST)ARG3(arg);
 	wsize = (LIST)ARG4(arg);
 
+	bzero((char *)&tmp_can,sizeof(tmp_can));
 	can = &tmp_can;
 	n = BDY(xrange); can->vx = VR((P)BDY(n)); n = NEXT(n);
 	can->qxmin = (Q)BDY(n); n = NEXT(n); can->qxmax = (Q)BDY(n);
@@ -201,9 +202,13 @@ int memory_plot(NODE arg,LIST *bytes)
 	}
 	can->wname = "";
 	can->formula = formula; 
-	if ( can->mode == MODE_PLOT )
+	if ( can->mode == MODE_PLOT ) {
 		plotcalc(can);
-	else {
+		memory_print(can,&barray);
+		STOQ(can->width,qw); STOQ(can->height,qh);
+		n = mknode(3,qw,qh,barray);
+		MKLIST(*bytes,n);
+	} else {
 		width = can->width; height = can->height;
 		tabe = (double **)ALLOCA(width*sizeof(double *));
 		for ( i = 0; i < width; i++ )
@@ -218,7 +223,7 @@ int memory_plot(NODE arg,LIST *bytes)
 
 int plotover(NODE arg)
 {
-	int index;
+	int index, org_color;
 	P formula;
 	struct canvas *can;
 	struct canvas fakecan;
@@ -227,6 +232,7 @@ int plotover(NODE arg)
 	index = QTOS((Q)ARG0(arg));
 	formula = (P)ARG1(arg);
 	can = canvas[index];
+	org_color = can->color;
 	if ( !can->window )
 		return -1;
 	get_vars_recursive((Obj)formula,&vl);
@@ -234,6 +240,13 @@ int plotover(NODE arg)
 		if ( vl0->v->attr == (pointer)V_IND )
 			if ( vl->v != can->vx && vl->v != can->vy )
 				return -1;
+	if ( argc(arg) == 3 )
+		can->color = QTOS((Q)ARG2(arg));
+	else
+		can->color = 0;
+#if !defined(VISUAL)
+	set_drawcolor(can->color);
+#endif
 	current_can = can;
 	fakecan = *can; fakecan.formula = formula;
 	if ( can->mode == MODE_PLOT ) {
@@ -242,6 +255,7 @@ int plotover(NODE arg)
 	} else
 		ifplotmain(&fakecan);
 	copy_to_canvas(&fakecan);
+	can->color = org_color;
 	return index;
 }
 
@@ -307,18 +321,21 @@ int draw_obj(NODE arg)
 		case 2: /* point */
 			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
 			draw_point(display,can,x,y,color);
-			MKRVECT2(vect,x,y); MKNODE(n,vect,can->history); can->history = n;
+			MKRVECT3(vect,x,y,color); MKNODE(n,vect,can->history);
+			can->history = n;
 			break;
 		case 3: /* circle */
 			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
 			r = (int)ToReal((Q)ARG2(obj));
-			MKRVECT3(vect,x,y,r); MKNODE(n,vect,can->history); can->history = n;
+			MKRVECT4(vect,x,y,r,color); MKNODE(n,vect,can->history);
+			can->history = n;
 			break;
 		case 4: /* line */
 			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
 			u = (int)ToReal((Q)ARG2(obj)); v = (int)ToReal((Q)ARG3(obj));
 			draw_line(display,can,x,y,u,v,color);
-			MKRVECT4(vect,x,y,u,v); MKNODE(n,vect,can->history); can->history = n;
+			MKRVECT5(vect,x,y,u,v,color); MKNODE(n,vect,can->history);
+			can->history = n;
 			break;
 		default:
 			set_lasterror("draw_obj : invalid request");