Changeset 30637

Timestamp:

Feb 14, 2011, 4:09:00 PM (15 years ago)

Author:

eugene

Message:

clip pt 100 for png and PS

Location:

branches/eam_branches/ipp-20110213/Ohana/src/kapa2/src

Files:

• PSObjects.c (modified) (5 diffs)
• bDrawObjects.c (modified) (4 diffs)

branches/eam_branches/ipp-20110213/Ohana/src/kapa2/src/PSObjects.c

@@ -270 +270 @@
   float *x, *y, *z;
   double mxi, mxj, myi, myj, bxi, bxj, byi, byj, bx, by;
-  double sx, sy, d, sx1, sy1, sx2, sy2;
+  double sx, sy, d, sx1, sy1, sx2, sy2, X0, Y0, X1, Y1;
 
   mxi = graph[0].axis[0].dfx / (object[0].x1 - object[0].x0);
@@ -432 +432 @@
     }
     if (object[0].ptype == 100) {       /* connect a pair of points */
+        X0 = graph[0].axis[0].fx;
+        X1 = graph[0].axis[0].fx + graph[0].axis[0].dfx;
+        Y0 = graph[0].axis[1].fy;
+        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;
@@ -438 +443 @@
         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);
+        ClipLinePS (sx1, sy1, sx2, sy2, X0, Y0, X1, Y1, f);
       }
     }
@@ -585 +590 @@
     }
     if (object[0].ptype == 100) {       
+        X0 = graph[0].axis[0].fx;
+        X1 = graph[0].axis[0].fx + graph[0].axis[0].dfx;
+        Y0 = graph[0].axis[1].fy;
+        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;
@@ -591 +601 @@
         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);
+        ClipLinePS (sx1, sy1, sx2, sy2, X0, Y0, X1, Y1, f);
       }
     }

branches/eam_branches/ipp-20110213/Ohana/src/kapa2/src/bDrawObjects.c

@@ -415 +415 @@
     }
     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;
@@ -421 +427 @@
         sx2 = x[i+1]*mxi + y[i+1]*mxj + bx;
         sy2 = x[i+1]*myi + y[i+1]*myj + by;
-        DrawLine (buffer, sx1, sy1, sx2, sy2);
+        bDrawClipLine (buffer, sx1, sy1, sx2, sy2, X0, Y0, X1, Y1);
       }
     }
@@ -561 +567 @@
     }
     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;
@@ -567 +579 @@
         sx2 = x[i+1]*mxi + y[i+1]*mxj + bx;
         sy2 = x[i+1]*myi + y[i+1]*myj + by;
-        DrawLine (buffer, sx1, sy1, sx2, sy2);
+        bDrawClipLine (buffer, sx1, sy1, sx2, sy2, X0, Y0, X1, Y1);
       }
     }