===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ifplot.h,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -p -r1.6 -r1.8
--- OpenXM_contrib2/asir2000/plot/ifplot.h	2000/11/09 02:30:44	1.6
+++ OpenXM_contrib2/asir2000/plot/ifplot.h	2001/10/09 01:36:27	1.8
@@ -45,17 +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.5 2000/11/09 01:51:12 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/ifplot.h,v 1.7 2000/12/05 01:24:59 noro Exp $ 
 */
-#if defined(THINK_C)
-#include        <QuickDraw.h>
-#include        <Windows.h>
-#include        <Events.h>
-#include        <OSUtils.h>
-#include        <ToolUtils.h>
-#include        <Fonts.h>
-/* #include        <Strings.h> */
-#elif defined(VISUAL)
+#if defined(VISUAL)
 /* for Visual C++ */
 #include <windows.h>
 #else
@@ -96,13 +88,8 @@
 
 #define MAXCANVAS 64
 #define MAXGC 16
-#if defined(THINK_C)
-#define DEFAULTWIDTH 200
-#define DEFAULTHEIGHT 200
-#else
 #define DEFAULTWIDTH 400
 #define DEFAULTHEIGHT 400
-#endif
 
 #define MODE_IFPLOT 0
 #define MODE_CONPLOT 1
@@ -113,31 +100,12 @@
 #define DIR_Y 1
 #define DIR_Z 2
 
-#if defined(THINK_C)
-#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)
+#if defined(VISUAL)
 /* for Visual C++ */
 #define XC(a) ((a).x)
 #define YC(a) ((a).y)
 #define DISPLAY int
-#define WINDOW int
+#define WINDOW void *
 #define CURSOR int
 #define DRAWABLE HDC
 
@@ -188,17 +156,7 @@ typedef struct RealVect {
 
 struct canvas {
 	int index;
-#if defined(THINK_C)
-	Rect rect;
-	WindowRecord record;
-	WindowPtr window;
-#ifndef COPYBITS
-	PicHandle pix;
-#else
-	BitMap pix,wbits;
-	RgnHandle rgnsav;
-#endif
-#elif defined(VISUAL)
+#if defined(VISUAL)
 /* for Visual C++ */
 	void *window; /* pointer to CMainFrame */
 	HWND hwnd; /* handle to the canvas window */
@@ -233,10 +191,8 @@ struct canvas {
 extern struct canvas *canvas[];
 extern struct canvas *current_can;
 
-#ifdef INET
 extern VL CO;
 extern int stream;
-#endif
 
 extern DISPLAY *display;
 extern CURSOR normalcur,runningcur,errorcur;
@@ -248,4 +204,61 @@ extern SIZE cansize;
 extern Window rootwin;
 extern GC drawGC,dashGC,hlGC,scaleGC,clearGC,xorGC,colorGC,cdrawGC;
 extern XFontStruct *sffs;
+#endif
+
+/* prototypes */
+void calc(double **tab,struct canvas *can,int nox);
+double usubstrp(P p,double r);
+void qcalc(char **tab,struct canvas *can);
+void sturmseq(VL vl,P p,VECT *rp);
+void seproot(VECT s,int min,int max,int *ar);
+int numch(VECT s,Q n,Q a0);
+void usubstqp(P p,Q r,Q *v);
+void plotcalc(struct canvas *can);
+int open_canvas(NODE arg);
+int plot(NODE arg);
+int memory_plot(NODE arg,LIST *bytes);
+int plotover(NODE arg);
+int drawcircle(NODE arg);
+int draw_obj(NODE arg);
+int clear_canvas(NODE arg);
+int arrayplot(NODE arg);
+void ifplot_resize(struct canvas *can,POINT spos,POINT epos);
+void plot_resize(struct canvas *can,POINT spos,POINT epos);
+void ifplotmain(struct canvas *can);
+void qifplotmain(struct canvas *can);
+void if_print(DISPLAY *display,double **tab,struct canvas *can);
+void memory_if_print(double **tab,struct canvas *can,BYTEARRAY *bytes);
+void con_print(DISPLAY *display,double **tab,struct canvas *can);
+void memory_con_print(double **tab,struct canvas *can,BYTEARRAY *bytes);
+void qif_print(DISPLAY *display,char **tab,struct canvas *can);
+void plot_print(DISPLAY *display,struct canvas *can);
+void draw_point(DISPLAY *display,struct canvas *can,int x,int y,int color);
+void draw_line(DISPLAY *display,struct canvas *can,int x,int y,int u,int v,int color);
+void pline(DISPLAY *display,struct canvas *can,DRAWABLE d);
+double adjust_scale(double e,double w);
+void initmarker(struct canvas *can,char *message);
+void marker(struct canvas *can,int dir,int p);
+void define_cursor(WINDOW w,CURSOR cur);
+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 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);
+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