===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/if.c,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -p -r1.4 -r1.6
--- OpenXM_contrib2/asir2000/plot/if.c	2000/11/07 06:06:40	1.4
+++ OpenXM_contrib2/asir2000/plot/if.c	2001/08/22 09:19:21	1.6
@@ -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.3 2000/08/22 05:04:31 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/if.c,v 1.5 2000/11/09 01:51:12 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -137,6 +137,69 @@ int plot(NODE arg)
 	return id;
 }
 
+int memory_plot(NODE arg,LIST *bytes)
+{
+	int id;
+	NODE n;
+	struct canvas tmp_can;
+	struct canvas *can;
+	P formula;
+	LIST xrange,yrange,zrange,wsize;
+	int width,height;
+	double **tabe;
+	int i;
+	BYTEARRAY barray;
+	Q qw,qh;
+
+	formula = (P)ARG0(arg);
+	xrange = (LIST)ARG1(arg);
+	yrange = (LIST)ARG2(arg);
+	zrange = (LIST)ARG3(arg);
+	wsize = (LIST)ARG4(arg);
+
+	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);
+	can->xmin = ToReal(can->qxmin); can->xmax = ToReal(can->qxmax); 
+	if ( yrange ) {
+		n = BDY(yrange); can->vy = VR((P)BDY(n)); n = NEXT(n);
+		can->qymin = (Q)BDY(n); n = NEXT(n); can->qymax = (Q)BDY(n);
+		can->ymin = ToReal(can->qymin); can->ymax = ToReal(can->qymax); 
+		if ( zrange ) {
+			n = NEXT(BDY(zrange));
+			can->zmin = ToReal(BDY(n)); n = NEXT(n); can->zmax = ToReal(BDY(n));
+			if ( n = NEXT(n) )
+				can->nzstep = QTOS((Q)BDY(n));
+			else
+				can->nzstep = MAXGC;
+			can->mode = MODE_CONPLOT;
+		} else
+			can->mode = MODE_IFPLOT;
+	} else
+		can->mode = MODE_PLOT;
+	if ( !wsize ) {
+		can->width = DEFAULTWIDTH; can->height = DEFAULTHEIGHT;
+	} else {
+		can->width = QTOS((Q)BDY(BDY(wsize)));
+		can->height = QTOS((Q)BDY(NEXT(BDY(wsize))));
+	}
+	can->wname = "";
+	can->formula = formula; 
+	if ( can->mode == MODE_PLOT )
+		plotcalc(can);
+	else {
+		width = can->width; height = can->height;
+		tabe = (double **)ALLOCA(width*sizeof(double *));
+		for ( i = 0; i < width; i++ )
+			tabe[i] = (double *)ALLOCA(height*sizeof(double));
+		calc(tabe,can,1);
+		memory_if_print(tabe,can,&barray);
+		STOQ(width,qw); STOQ(height,qh);
+		n = mknode(3,qw,qh,barray);
+		MKLIST(*bytes,n);
+	}
+}
+
 int plotover(NODE arg)
 {
 	int index;
@@ -200,36 +263,43 @@ int drawcircle(NODE arg)
 int draw_obj(NODE arg)
 {
 	int index;
-	int x,y,u,v,r,l;
+	int x,y,u,v,len,r;
 	NODE obj,n;
 	RealVect *vect;
 	struct canvas *can;
+	int color;
 
 	index = QTOS((Q)ARG0(arg));
 	can = canvas[index];
-	if ( !can || !can->window )
+	if ( !can || !can->window ) {
+		set_lasterror("draw_obj : canvas does not exist");
 		return -1;
+	}
 
 	obj = BDY((LIST)ARG1(arg));
-	switch ( l = length(obj) ) {
+	if ( argc(arg) == 3 )
+		color = QTOS((Q)ARG2(arg));
+	else
+		color = 0; /* black */
+	switch ( len = length(obj) ) {
 		case 2: /* point */
 			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
-			draw_point(display,can,x,y);
-			MKRVECT2(vect,x,y);
-			MKNODE(n,vect,can->history);
-			can->history = n;
+			draw_point(display,can,x,y,color);
+			MKRVECT2(vect,x,y); 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));
-//			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;
+			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);
+			draw_line(display,can,x,y,u,v,color);
 			MKRVECT4(vect,x,y,u,v); MKNODE(n,vect,can->history); can->history = n;
 			break;
 		default:
+			set_lasterror("draw_obj : invalid request");
 			return -1;
 	}
 	return 0;
@@ -468,7 +538,7 @@ struct canvas *can;
 		tabe[i] = (double *)ALLOCA(height*sizeof(double));
 	define_cursor(can->window,runningcur);
 	set_busy(can); set_selection();
-	calc(tabe,can); if_print(display,tabe,can);
+	calc(tabe,can,0); if_print(display,tabe,can);
 	reset_selection(); reset_busy(can);
 	define_cursor(can->window,normalcur);
 }