=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ifplot.h,v retrieving revision 1.15 retrieving revision 1.26 diff -u -p -r1.15 -r1.26 --- OpenXM_contrib2/asir2000/plot/ifplot.h 2013/12/19 05:48:24 1.15 +++ OpenXM_contrib2/asir2000/plot/ifplot.h 2018/03/29 01:32:55 1.26 @@ -45,9 +45,9 @@ * 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.14 2011/08/10 04:51:58 saito Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/plot/ifplot.h,v 1.25 2017/09/04 01:57:53 noro Exp $ */ -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) /* for Visual C++ */ #include #else @@ -92,40 +92,97 @@ #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 -#define MODE_PLOTOVER 5 -#define MODE_IFPLOTD 6 -#define MODE_IFPLOTQ 7 -#define MODE_IFPLOTB 8 -#define MODE_INEQND 9 -#define MODE_INEQNQ 10 -#define MODE_INEQNB 11 -#define MODE_INEQNANDD 12 -#define MODE_INEQNANDQ 13 -#define MODE_INEQNANDB 14 -#define MODE_INEQNORD 15 -#define MODE_INEQNORQ 16 -#define MODE_INEQNORB 17 -#define MODE_INEQNXORD 18 -#define MODE_INEQNXORQ 19 -#define MODE_INEQNXORB 20 -#define MODE_CONPLOTD 21 -#define MODE_CONPLOTQ 22 -#define MODE_CONPLOTB 23 -#define MODE_ITVIFPLOT 24 -#define MODE_PLOTOVERD 25 -#define MODE_PLOTOVERQ 26 -#define MODE_PLOTOVERB 27 +#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 -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) /* for Visual C++ */ #define XC(a) ((a).x) #define YC(a) ((a).y) @@ -156,13 +213,13 @@ #endif struct pa { - int length; - POINT *pos; + int length; + POINT *pos; }; typedef struct RealVect { - int len; - int body[1]; + int len; + int body[1]; } RealVect; #define MKRVECT2(v,x,y)\ @@ -183,47 +240,49 @@ typedef struct RealVect { #define RV_ARC 3 struct canvas { - int index; -#if defined(VISUAL) + int index; +#if defined(VISUAL) || defined(__MINGW32__) /* for Visual C++ */ - void *window; /* pointer to CMainFrame */ - HWND hwnd; /* handle to the canvas window */ - HDC pix; /* shadow DC on memory */ - char *prefix; - int percentage; - struct canvas *real_can; + void *window; /* pointer to CMainFrame */ + HWND hwnd; /* handle to the canvas window */ + HDC pix; /* shadow DC on memory */ + char *prefix; + int percentage; + struct canvas *real_can; #else - Widget shell,xcoord,ycoord,xdone,ydone,level,wideb,preciseb,noaxisb; - Window window; - Pixmap pix; + Widget shell,xcoord,ycoord,xdone,ydone,level,wideb,preciseb,noaxisb; + Window window; + Pixmap pix; #endif - char *wname; - char mode; - char wide; - char precise; - char noaxis; - V vx,vy; - P formula; - int width,height; - 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; - int division; + char *wname; + int mode; + char wide; + char precise; + char noaxis; + V vx,vy; + P formula; + int width,height; + 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; + unsigned int color; + int division; + int prec; }; extern struct canvas *canvas[]; extern struct canvas *closed_canvas[]; extern struct canvas *current_can; +extern char* pfn[]; + #if defined(INTERVAL) -extern Pixel BackPixel; extern int Itvplot; #endif @@ -233,7 +292,7 @@ extern int stream; extern DISPLAY *display; extern CURSOR normalcur,runningcur,errorcur; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) extern POINT start_point,end_point; extern SIZE cansize; #else @@ -243,15 +302,20 @@ extern XFontStruct *sffs; #endif struct xcolorForPS { - unsigned long pixel; - double r,g,b; - int print; + unsigned long pixel; + double r,g,b; + int print; }; /* 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); @@ -267,16 +331,28 @@ 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); 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 *,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); @@ -285,25 +361,27 @@ int itvifplot(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 itvplotmain1(struct canvas *); #endif void ifplot_resize(struct canvas *,POINT,POINT); void plot_resize(struct canvas *,POINT,POINT); -void ifplotmainOld(struct canvas *); void ifplotmain(struct canvas *); -void ifplotmains(struct canvas *); +void ifplotmainNG(struct canvas *); void qifplotmain(struct canvas *); -void if_print(DISPLAY *,double **,struct canvas *,int); -void if_printOld(DISPLAY *,double **,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 *); @@ -311,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) || defined(__MINGW32__) +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