=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ifplot.h,v retrieving revision 1.2 retrieving revision 1.6 diff -u -p -r1.2 -r1.6 --- OpenXM_contrib2/asir2000/plot/ifplot.h 2000/08/21 08:31:50 1.2 +++ OpenXM_contrib2/asir2000/plot/ifplot.h 2000/11/09 02:30:44 1.6 @@ -23,7 +23,7 @@ * shall be made on your publication or presentation in any form of the * results obtained by use of the SOFTWARE. * (4) In the event that you modify the SOFTWARE, you shall notify FLL by - * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification * for such modification or the source code of the modified part of the * SOFTWARE. * @@ -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.1.1.1 1999/12/03 07:39:13 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/plot/ifplot.h,v 1.5 2000/11/09 01:51:12 noro Exp $ */ #if defined(THINK_C) #include @@ -55,6 +55,9 @@ #include #include /* #include */ +#elif defined(VISUAL) +/* for Visual C++ */ +#include #else #include #include @@ -91,7 +94,7 @@ #define C_APLOT C_PRIV+7 #define C_DRAWCIRCLE C_PRIV+8 -#define MAXCANVAS 16 +#define MAXCANVAS 64 #define MAXGC 16 #if defined(THINK_C) #define DEFAULTWIDTH 200 @@ -104,6 +107,7 @@ #define MODE_IFPLOT 0 #define MODE_CONPLOT 1 #define MODE_PLOT 2 +#define MODE_INTERACTIVE 3 #define DIR_X 0 #define DIR_Y 1 @@ -127,7 +131,24 @@ #else #define DRAWABLE BitMap #endif + +#elif defined(VISUAL) +/* for Visual C++ */ +#define XC(a) ((a).x) +#define YC(a) ((a).y) +#define DISPLAY int +#define WINDOW int +#define CURSOR int +#define DRAWABLE HDC + +/* XXX : use GC argument as the color */ +#define DRAWPOINT(d,p,g,x,y) SetPixel(p,x,y,0) + +#define DRAWLINE(d,p,g,x,y,u,v) MoveToEx(p,x,y,&oldpos); LineTo(p,u,v) +#define DRAWSTRING(d,p,g,x,y,s,l) TextOut(p,x,y,s,l) +/* #define TEXTWIDTH(f,s,l) */ #else +/* for UNIX */ #define POINT XPoint #define XC(a) ((a).x) #define YC(a) ((a).y) @@ -146,6 +167,25 @@ struct pa { POINT *pos; }; +typedef struct RealVect { + int len; + int body[1]; +} RealVect; + +#define MKRVECT2(v,x,y)\ +((v)=(RealVect *)MALLOC_ATOMIC(sizeof(RealVect)+sizeof(int)),\ + (v)->len=2,(v)->body[0]=(x),(v)->body[1]=(y)) +#define MKRVECT3(v,x,y,z)\ +((v)=(RealVect *)MALLOC_ATOMIC(sizeof(RealVect)+2*sizeof(int)),\ + (v)->len=3,(v)->body[0]=(x),(v)->body[1]=(y),(v)->body[2]=(z)) +#define MKRVECT4(v,x,y,z,u)\ +((v)=(RealVect *)MALLOC_ATOMIC(sizeof(RealVect)+3*sizeof(int)),\ + (v)->len=4,(v)->body[0]=(x),(v)->body[1]=(y),(v)->body[2]=(z),(v)->body[3]=(u)) + +#define RV_POINT 1 +#define RV_LINE 2 +#define RV_ARC 3 + struct canvas { int index; #if defined(THINK_C) @@ -158,6 +198,14 @@ struct canvas { BitMap pix,wbits; RgnHandle rgnsav; #endif +#elif defined(VISUAL) +/* 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; #else Widget shell,xcoord,ycoord,xdone,ydone,level,wideb,preciseb,noaxisb; Window window; @@ -178,6 +226,8 @@ struct canvas { Q qxmin,qxmax; Q qymin,qymax; struct pa *pa; + /* to register the history in the interactive mode */ + NODE history; }; extern struct canvas *canvas[]; @@ -191,8 +241,11 @@ extern int stream; extern DISPLAY *display; extern CURSOR normalcur,runningcur,errorcur; -#if !defined(THINK_C) +#if defined(VISUAL) +extern POINT start_point,end_point; +extern SIZE cansize; +#else extern Window rootwin; -extern GC drawGC,dashGC,hlGC,scaleGC,clearGC,xorGC,colorGC; +extern GC drawGC,dashGC,hlGC,scaleGC,clearGC,xorGC,colorGC,cdrawGC; extern XFontStruct *sffs; #endif