===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ifplot.h,v
retrieving revision 1.14
retrieving revision 1.21
diff -u -p -r1.14 -r1.21
--- OpenXM_contrib2/asir2000/plot/ifplot.h	2011/08/10 04:51:58	1.14
+++ OpenXM_contrib2/asir2000/plot/ifplot.h	2014/07/05 03:55:42	1.21
@@ -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/ifplot.h,v 1.13 2005/05/18 03:27:00 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/ifplot.h,v 1.20 2014/06/27 07:58:29 saito Exp $ 
 */
 #if defined(VISUAL)
 /* for Visual C++ */
@@ -92,15 +92,92 @@
 #define DEFAULTWIDTH 400
 #define DEFAULTHEIGHT 400
 
-#define MODE_IFPLOT 0
-#define MODE_CONPLOT 1
-#define MODE_PLOT 2
-#define MODE_INTERACTIVE 3
-#define MODE_POLARPLOT 4
-#if defined(INTERVAL)
-#define MODE_INEQNP 5
-#endif
+#define IFPLOT "ifplot"
+#define CONPLOT "conplot"
+#define PLOT "plot"
+#define INTERACTIVE "interactive"
+#define POLARPLOT "polarplot"
+#define POLARPLOTD "polarplotD"
+#define PLOTOVER "plotover"
+#define IFPLOTD "ifplotD"
+#define IFPLOTQ "ifplotQ"
+#define IFPLOTB "ifplotB"
+#define INEQN "ineqn"
+#define INEQND "ineqnD"
+#define INEQNQ "ineqnQ"
+#define INEQNB "ineqnB"
+#define INEQNAND "ineqnand"
+#define INEQNDAND "ineqnDand"
+#define INEQNQAND "ineqnQand"
+#define INEQNBAND "ineqnBand"
+#define INEQNOR "ineqnor"
+#define INEQNDOR "ineqnDor"
+#define INEQNQOR "ineqnQor"
+#define INEQNBOR "ineqnBor"
+#define INEQNXOR "ineqnxor"
+#define INEQNDXOR "ineqnDxor"
+#define INEQNQXOR "ineqnQxor"
+#define INEQNBXOR "ineqnBxor"
+#define CONPLOTD "conplotD"
+#define CONPLOTQ "conplotQ"
+#define CONPLOTB "conplotB"
+#define ITVIFPLOT "itvifplot"
+#define PLOTOVERD "plotoverD"
+#define PLOTOVERQ "plotoverQ"
+#define PLOTOVERB "plotoverB"
+#define MEMORY_IFPLOT "memory_ifplot"
+#define MEMORY_CONPLOT "memory_conplot"
+#define MEMORY_PLOT "memory_plot"
+#define ARRAYPLOT "arrayplot"
+#define OPEN_CANVAS "open_canvas"
+#define DRAWCIRCLE "drawcircle"
+#define DRAW_OBJ "draw_obj"
+#define DRAW_STRING "draw_string"
+#define OBJ_CP "obj_cp"
+#define CLEAR_CANVAS "clear_canvas"
 
+/*
+#define IFPLOT 0
+#define CONPLOT 1
+#define PLOT 2
+#define INTERACTIVE 3
+#define POLARPLOT 4
+#define PLOTOVER 5
+#define IFPLOTD 6
+#define IFPLOTQ 7
+#define IFPLOTB 8
+#define INEQND 9
+#define INEQNQ 10
+#define INEQNB 11
+#define INEQNANDD 12
+#define INEQNANDQ 13
+#define INEQNANDB 14
+#define INEQNORD 15
+#define INEQNORQ 16
+#define INEQNORB 17
+#define INEQNXORD 18
+#define INEQNXORQ 19
+#define INEQNXORB 20
+#define CONPLOTD 21
+#define CONPLOTQ 22
+#define CONPLOTB 23
+#define ITVIFPLOT 24
+#define PLOTOVERD 25
+#define PLOTOVERQ 26
+#define PLOTOVERB 27
+#define MEMORY_IFPLOT 28
+#define MEMORY_CONPLOT 29
+#define MEMORY_PLOT 30
+#define ARRAYPLOT 31
+#define OPEN_CANVAS 32
+#define DRAWCIRCLE 33
+#define DRAW_OBJ 34
+#define DRAW_STRING 35
+#define OBJ_CP 36
+#define CLEAR_CANVAS 37
+#define POLARPLOTD 38
+*/
+
 #define DIR_X 0
 #define DIR_Y 1
 #define DIR_Z 2
@@ -178,7 +255,7 @@ struct canvas {
 	Pixmap pix;
 #endif
 	char *wname;
-	char mode;
+	int mode;
 	char wide;
 	char precise;
 	char noaxis;
@@ -188,20 +265,24 @@ struct canvas {
 	double xmin,xmax;
 	double ymin,ymax;
 	double zmin,zmax;
+	double vmin,vmax;
 	int nzstep;
 	Q qxmin,qxmax;
 	Q qymin,qymax;
 	struct pa *pa;
 	/* to register the history in the interactive mode */
 	NODE history;
-	int color;
+	unsigned int color;
+	int division;
 };
 
 extern struct canvas *canvas[];
 extern struct canvas *closed_canvas[];
 extern struct canvas *current_can;
-#if defined(INTERVAL)
+extern char* pfn[];
+
 extern Pixel BackPixel;
+#if defined(INTERVAL)
 extern int Itvplot;
 #endif
 
@@ -227,63 +308,80 @@ struct xcolorForPS {
 };
 
 /* prototypes */
+int modeNO(char *);
 void calc(double **,struct canvas *,int);
 double usubstrp(P,double);
 void qcalc(char **,struct canvas *);
+void calcb(double **,struct canvas *,int);
+void calcq(double **,struct canvas *,int);
+void polarcalc(struct canvas *);
+void polarcalcNG(struct canvas *);
 void sturmseq(VL,P,VECT *);
 void seproot(VECT,int,int,int *);
 int numch(VECT,Q,Q);
 void usubstqp(P,Q,Q *);
 void plotcalc(struct canvas *);
 int open_canvas(NODE);
-int plot(NODE);
+int plot(NODE,int);
+int ifplotold(NODE);
+int polarplot(NODE);
+int conplotD(NODE);
 int memory_plot(NODE,LIST *);
 int plotover(NODE);
+int plotoverD(NODE);
 int drawcircle(NODE);
 int draw_obj(NODE);
+int draw_string(NODE);
 int clear_canvas(NODE);
+void popup_canvas(int);
 int arrayplot(NODE);
-#if defined(INTERVAL)
-int itvifplot(NODE);
-int itvplot1(NODE);
-int itvplot2(NODE);
-int itvplot3(NODE);
-int itvplot4(NODE);
-int objcp(NODE);
-int ineqn(NODE);
 int ineqnover(NODE);
 int ineqnand(NODE);
 int ineqnor(NODE);
 int ineqnxor(NODE);
+int ifplotOP(NODE,int);
+int ifplotNG(NODE,int);
+int polarplotNG(NODE);
 void ineqnmain(struct canvas *, int, int);
+void conplotmainD(struct canvas *);
 void obj_op(struct canvas *, struct canvas *, int);
-void area_print(DISPLAY *, int **, struct canvas *, int);
-void itvcalc(int **, struct canvas *, int, int);
-void reccalc(P,V,V,int,int,int,int,double*,double*,int, int **, int);
+void area_print(DISPLAY *,double **, struct canvas *, int);
+void memory_print(struct canvas *,BYTEARRAY *);
+void over_print(DISPLAY *,double **,struct canvas *,int);
+void polar_print(DISPLAY *,struct canvas *);
+unsigned long GetColor(DISPLAY *,char *);
+void Pox_pop_local(NODE,Obj *);
+void Pox_pop_cmo(NODE,Obj *);
+
+#if defined(INTERVAL)
+int itvifplot(NODE);
+//int itvplot1(NODE);
+//int itvplot2(NODE);
+//int itvplot3(NODE);
+//int itvplot4(NODE);
+int objcp(NODE);
+int ineqn(NODE);
+void obj_cp(struct canvas *,struct canvas *,int);
+void itvcalc(double **, struct canvas *, int);
 void itvplotmain(struct canvas *, int);
-void itvcalc1(int **, struct canvas *, int);
-void itvcalc2(int **, struct canvas *, int);
-void itvcalc3(int **, struct canvas *, int, int);
-void itvcalc4(int **, struct canvas *, int, int);
-void reccalc3(P,V,V,int,int,int,int,double*,double*, int, int **, int);
-void reccalc4(P,V,V,int,int,int,int,double*,double*, int, int **, int);
 void itvplotmain1(struct canvas *);
-void itvplotmain2(struct canvas *);
-void itvplotmain3(struct canvas *, int);
-void itvplotmain4(struct canvas *, int);
 #endif
 void ifplot_resize(struct canvas *,POINT,POINT);
 void plot_resize(struct canvas *,POINT,POINT);
 void ifplotmain(struct canvas *);
+void ifplotmainNG(struct canvas *);
 void qifplotmain(struct canvas *);
+void if_printNG(DISPLAY *,double **,struct canvas *,int);
 void if_print(DISPLAY *,double **,struct canvas *);
 void memory_if_print(double **,struct canvas *,BYTEARRAY *);
 void con_print(DISPLAY *,double **,struct canvas *);
 void memory_con_print(double **,struct canvas *,BYTEARRAY *);
 void qif_print(DISPLAY *,char **,struct canvas *);
 void plot_print(DISPLAY *,struct canvas *);
-void draw_point(DISPLAY *,struct canvas *,int,int,int);
-void draw_line(DISPLAY *,struct canvas *,int,int,int,int,int);
+void set_drawcolor(unsigned int);
+void draw_character_string(DISPLAY *,struct canvas *,int,int,char *,unsigned int);
+void draw_point(DISPLAY *,struct canvas *,int,int,unsigned int);
+void draw_line(DISPLAY *,struct canvas *,int,int,int,int,unsigned int);
 void pline(DISPLAY *,struct canvas *,DRAWABLE);
 double adjust_scale(double,double);
 void initmarker(struct canvas *,char *);
@@ -291,23 +389,25 @@ void marker(struct canvas *,int,int);
 void define_cursor(WINDOW,CURSOR);
 void count_and_flush();
 void flush();
-
-#if defined(VISUAL)
 int search_canvas();
-int search_active_canvas();
 void create_canvas(struct canvas *can);
-void destroy_canvas(struct canvas *can);
+void copy_to_canvas(struct canvas *can);
+void set_selection();
+void reset_selection();
+void set_busy();
+void reset_busy();
 void clear_pixmap(struct canvas *can);
 void alloc_pixmap(struct canvas *can);
-void copy_to_canvas(struct canvas *can);
 void copy_subimage(struct canvas *subcan,struct canvas *can,POINT pos);
+int init_plot_display(int,char **);
+void reset_current_computation();
+void process_xevent();
+
+#if defined(VISUAL)
+int search_active_canvas();
+void destroy_canvas(struct canvas *can);
 void draw_wideframe(struct canvas *can,DRAWABLE d);
 void create_brushes();
 void draw_frame0(DRAWABLE d,POINT spos,POINT epos);
 
-void reset_current_computation();
-void set_selection();
-void reset_selection();
-void set_busy();
-void reset_busy();
 #endif