Changeset 420 for trunk/Jgraph/draw.c

Timestamp:

02/27/08 07:13:31 (16 years ago)

Author:

Nicholas Riley

Message:

Jgraph: my changes - ANSIfication, few minor bug fixes; works on OS X 10.5 now

File:

• trunk/Jgraph/draw.c (modified) (15 diffs)

trunk/Jgraph/draw.c

@@ -22 +22 @@
       error_header();
       fprintf(stderr, 
-              "Value of %f is at negative infinity with logrhythmic %c axis\n", 
+              "Value of %f is at negative infinity with logarithmic %c axis\n", 
               val, (axis->is_x) ? 'x' : 'y'); 
-       exit(1);
+      exit(1);
     }
     return (log(val) / axis->logfactor - axis->logmin) * axis->factor;
@@ -51 +51 @@
 #define MAXIMUM(a,b) ((a > b) ? a : b)
 
-draw_axis(a, other)
-Axis a, other;
+void draw_label(Label l)
+{
+  if (l->label == CNULL) return;
+  comment(l->label);
+  print_label(l);
+}
+
+void draw_axis(Axis a, Axis other)
 {
   char orientation;
@@ -117 +123 @@
 
 
-draw_label(l)
-Label l;
-{
-  if (l->label == CNULL) return;
-  comment(l->label);
-  print_label(l);
-}
-
-set_clip(g)
-Graph g;
+void set_clip(Graph g)
 {
   comment("Setting Clip");
@@ -136 +133 @@
 }
 
-draw_curves(g)
-Graph g;
+void draw_curve(Curve c, Graph g);
+
+void draw_curves(Graph g)
 {
   Curve c;
@@ -151 +149 @@
 }
 
-draw_curve(c, g)
-Curve c;
-Graph g;
+void draw_mark(float x, float y, Curve c, Graph g);
+void draw_arrow(float x1, float y1, float x2, float y2, Curve c);
+
+void draw_curve(Curve c, Graph g)
 {
   Point p, px, py;
@@ -270 +269 @@
 }
 
-draw_mark(x, y, c, g)
-float x, y;
-Curve c;
-Graph g;
+void draw_mark(float x, float y, Curve c, Graph g)
 {
   Point p;
@@ -317 +313 @@
               }
               for (i = 0; i < 4; i++) {
-                if (fscanf(f, "%d", &(bb[i])) == NULL) {
+                if (fscanf(f, "%d", &(bb[i])) == 0) {
                   fprintf(stderr, "Error: Eps file '%s': eof in %s\n",
                           c->eps, "bounding box");
@@ -502 +498 @@
 }
 
-draw_arrow(x1, y1, x2, y2, c)
-float x1, y1, x2, y2;
-Curve c;
+void draw_arrow(float x1, float y1, float x2, float y2, Curve c)
 {
   float dx, dy;
@@ -542 +536 @@
 }
 
-draw_legend(g)
-Graph g;
+void draw_legend(Graph g)
 {
   Curve c;
@@ -606 +599 @@
 }
 
-draw_strings(g)
-Graph g;
+void draw_strings(Graph g)
 {
   String s;
@@ -616 +608 @@
 }
 
-draw_graph(g)
-Graph g;
+void draw_graph(Graph g)
 {
   comment("Drawing New Graph");
@@ -637 +628 @@
 }
 
-draw_graphs(gs, pp, landscape)
-Graphs gs;
-int pp;
-int landscape;
+void draw_header(Graphs gs, int pp, int landscape);
+void draw_footer(Graphs gs, int pp);
+
+void draw_graphs(Graphs gs, int pp, int landscape)
 {
   Graphs gs_p;
@@ -661 +652 @@
 }
 
-draw_header(gs, pp, landscape)
-Graphs gs;
-int pp;
-int landscape;
+void draw_header(Graphs gs, int pp, int landscape)
 {
   FILE *f;
@@ -774 +762 @@
     }
   } else if (landscape) {
-    printf("%f 0 translate\n", -gs->bb[2] - gs->bb[0]);
+    printf("%d 0 translate\n", -gs->bb[2] - gs->bb[0]);
   }
   printf("1 setlinecap 1 setlinejoin\n");
@@ -835 +823 @@
 }
 
-draw_footer(gs, pp)
-Graphs gs;
-int pp;
+void draw_footer(Graphs gs, int pp)
 {
   FILE *f;