[BACK]Return to ifplot.h CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / plot

Diff for /OpenXM_contrib2/asir2000/plot/ifplot.h between version 1.4 and 1.7

version 1.4, 2000/11/07 06:06:40 version 1.7, 2000/12/05 01:24:59
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/plot/ifplot.h,v 1.3 2000/08/22 05:04:31 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/plot/ifplot.h,v 1.6 2000/11/09 02:30:44 noro Exp $
 */  */
 #if defined(THINK_C)  #if defined(VISUAL)
 #include        <QuickDraw.h>  
 #include        <Windows.h>  
 #include        <Events.h>  
 #include        <OSUtils.h>  
 #include        <ToolUtils.h>  
 #include        <Fonts.h>  
 /* #include        <Strings.h> */  
 #elif defined(VISUAL)  
 /* for Visual C++ */  /* for Visual C++ */
 #include <windows.h>  #include <windows.h>
 #else  #else
Line 94 
Line 86 
 #define C_APLOT C_PRIV+7  #define C_APLOT C_PRIV+7
 #define C_DRAWCIRCLE C_PRIV+8  #define C_DRAWCIRCLE C_PRIV+8
   
 #define MAXCANVAS 16  #define MAXCANVAS 64
 #define MAXGC 16  #define MAXGC 16
 #if defined(THINK_C)  
 #define DEFAULTWIDTH 200  
 #define DEFAULTHEIGHT 200  
 #else  
 #define DEFAULTWIDTH 400  #define DEFAULTWIDTH 400
 #define DEFAULTHEIGHT 400  #define DEFAULTHEIGHT 400
 #endif  
   
 #define MODE_IFPLOT 0  #define MODE_IFPLOT 0
 #define MODE_CONPLOT 1  #define MODE_CONPLOT 1
Line 113 
Line 100 
 #define DIR_Y 1  #define DIR_Y 1
 #define DIR_Z 2  #define DIR_Z 2
   
 #if defined(THINK_C)  #if defined(VISUAL)
 #define COPYBITS  
   
 #define POINT Point  
 #define XC(a) ((a).h)  
 #define YC(a) ((a).v)  
 #define DRAWPOINT(d,p,g,x,y) MoveTo(x,y); Line(0,0)  
 #define DRAWLINE(d,p,g,x,y,u,v) MoveTo(x,y); LineTo(u,v)  
 #define DRAWSTRING(d,p,g,x,y,s,l) MoveTo(x,y); DrawText(s,0,l)  
 #define TEXTWIDTH(f,s,l) TextWidth(s,0,l)  
 #define DISPLAY int  
 #define WINDOW WindowPtr  
 #define CURSOR CursHandle  
 #ifndef COPYBITS  
 #define DRAWABLE PicHandle  
 #else  
 #define DRAWABLE BitMap  
 #endif  
   
 #elif defined(VISUAL)  
 /* for Visual C++ */  /* for Visual C++ */
 #define XC(a) ((a).x)  #define XC(a) ((a).x)
 #define YC(a) ((a).y)  #define YC(a) ((a).y)
Line 145 
Line 113 
 #define DRAWPOINT(d,p,g,x,y) SetPixel(p,x,y,0)  #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 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)  #define DRAWSTRING(d,p,g,x,y,s,l) TextOut(p,x,y,s,l)
 #define TEXTWIDTH(f,s,l) 0  /* #define TEXTWIDTH(f,s,l) */
 #else  #else
 /* for UNIX */  /* for UNIX */
 #define POINT XPoint  #define POINT XPoint
Line 175  typedef struct RealVect {
Line 143  typedef struct RealVect {
 #define MKRVECT2(v,x,y)\  #define MKRVECT2(v,x,y)\
 ((v)=(RealVect *)MALLOC_ATOMIC(sizeof(RealVect)+sizeof(int)),\  ((v)=(RealVect *)MALLOC_ATOMIC(sizeof(RealVect)+sizeof(int)),\
  (v)->len=2,(v)->body[0]=(x),(v)->body[1]=(y))   (v)->len=2,(v)->body[0]=(x),(v)->body[1]=(y))
 #define MKRVECT4(v,x,y,a,b)\  #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)=(RealVect *)MALLOC_ATOMIC(sizeof(RealVect)+3*sizeof(int)),\
  (v)->len=2,(v)->body[0]=(x),(v)->body[1]=(y),(v)->body[2]=(a),(v)->body[3]=(b))   (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 {  struct canvas {
         int index;          int index;
 #if defined(THINK_C)  #if defined(VISUAL)
         Rect rect;  
         WindowRecord record;  
         WindowPtr window;  
 #ifndef COPYBITS  
         PicHandle pix;  
 #else  
         BitMap pix,wbits;  
         RgnHandle rgnsav;  
 #endif  
 #elif defined(VISUAL)  
 /* for Visual C++ */  /* for Visual C++ */
         void *window; /* pointer to CMainFrame */          void *window; /* pointer to CMainFrame */
         HWND hwnd; /* handle to the canvas window */          HWND hwnd; /* handle to the canvas window */
Line 226  struct canvas {
Line 191  struct canvas {
 extern struct canvas *canvas[];  extern struct canvas *canvas[];
 extern struct canvas *current_can;  extern struct canvas *current_can;
   
 #ifdef INET  
 extern VL CO;  extern VL CO;
 extern int stream;  extern int stream;
 #endif  
   
 extern DISPLAY *display;  extern DISPLAY *display;
 extern CURSOR normalcur,runningcur,errorcur;  extern CURSOR normalcur,runningcur,errorcur;
Line 239  extern POINT start_point,end_point;
Line 202  extern POINT start_point,end_point;
 extern SIZE cansize;  extern SIZE cansize;
 #else  #else
 extern Window rootwin;  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;  extern XFontStruct *sffs;
 #endif  #endif
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.7
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>