Changeset 29410 for branches/eam_branches/ipp-20100823/Ohana/src/kapa2/src/DrawObjects.c

Timestamp:

Oct 14, 2010, 2:07:33 PM (16 years ago)

Author:

eugene

Message:

clip lines for pt 100 (contours) on edge of plot; fix significant digits for axis and axis strlen; make consistent box & image regardless of -imtool setting, both with and without image or graph; add element to GraphWidget to note existence of a plot (graph may be non NULL and plot may not be defined); update png_jmpbuf code to avoid deprecated element of png struture

File:

• branches/eam_branches/ipp-20100823/Ohana/src/kapa2/src/DrawObjects.c (modified) (4 diffs)

branches/eam_branches/ipp-20100823/Ohana/src/kapa2/src/DrawObjects.c

@@ -517 +517 @@
     }
     if (object[0].ptype == 100) {       /* connect a pair of points */
+
+      double X0 = graph[0].axis[0].fx;
+      double X1 = graph[0].axis[0].fx + graph[0].axis[0].dfx;
+      double Y0 = graph[0].axis[1].fy;
+      double Y1 = graph[0].axis[1].fy + graph[0].axis[1].dfy;
+
       for (i = 0; i + 1 < object[0].Npts; i+=2) {
         if (!(finite(x[i]) && finite(y[i]))) continue;
@@ -524 +530 @@
         sx2 = x[i+1]*mxi + y[i+1]*mxj + bx;
         sy2 = x[i+1]*myi + y[i+1]*myj + by;
-        DrawLine (sx1, sy1, sx2, sy2);
+        ClipLine (sx1, sy1, sx2, sy2, X0, Y0, X1, Y1);
       }
     }
@@ -674 +680 @@
     }
     if (object[0].ptype == 100) {       
+      double X0 = graph[0].axis[0].fx;
+      double X1 = graph[0].axis[0].fx + graph[0].axis[0].dfx;
+      double Y0 = graph[0].axis[1].fy;
+      double Y1 = graph[0].axis[1].fy + graph[0].axis[1].dfy;
+
       for (i = 0; i + 1 < object[0].Npts; i+=2) {
         if (!(finite(x[i]) && finite(y[i]))) continue;
@@ -680 +691 @@
         sx2 = x[i+1]*mxi + y[i+1]*mxj + bx;
         sy2 = x[i+1]*myi + y[i+1]*myj + by;
-        DrawLine (sx1, sy1, sx2, sy2);
+        ClipLine (sx1, sy1, sx2, sy2, X0, Y0, X1, Y1);
       }
     }