Index: /branches/eam_branches/ipp-20130307/Ohana/src/kapa2/src/DrawObjects.c
===================================================================
--- /branches/eam_branches/ipp-20130307/Ohana/src/kapa2/src/DrawObjects.c	(revision 35370)
+++ /branches/eam_branches/ipp-20130307/Ohana/src/kapa2/src/DrawObjects.c	(revision 35371)
@@ -633,5 +633,5 @@
   float *x, *y, *dxm, *dxp;
   double mxi, mxj, myi, myj, bxi, bxj, byi, byj, bx, by;
-  double sx0, sy0, sx1, sy1, sz, sx10, sx11;
+  double sx0, sy0, sx1, sy1, sz, sx10, sx11, X0, X1, Y0, Y1;
 
   mxi = graph[0].axis[0].dfx / (object[0].x1 - object[0].x0);
@@ -651,4 +651,9 @@
   bar = object[0].ebar; sz = object[0].size*graph[0].axis[1].dfy*0.03;
   
+  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 < object[0].Npts; i++) {
     if (!(finite(x[i]) && finite(y[i]) && finite(dxp[i]))) continue;
@@ -662,9 +667,9 @@
 	 (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy))) 
     {
-      DrawLine (sx0, sy0, sx1, sy1);
+      ClipLine (sx0, sy0, sx1, sy1, X0, Y0, X1, Y1);
       if (bar) {
 	sx10 = sy1 - sz;
 	sx11 = sy1 + sz;
-	DrawLine (sx1, sx10, sx1, sx11);
+	ClipLine (sx1, sx10, sx1, sx11, X0, Y0, X1, Y1);
       }
     }
@@ -679,9 +684,9 @@
 	 (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
     {
-      DrawLine (sx0, sy0, sx1, sy1);
+      ClipLine (sx0, sy0, sx1, sy1, X0, Y0, X1, Y1);
       if (bar) {
 	sx10 = sy1 - sz;
 	sx11 = sy1 + sz;
-	DrawLine (sx1, sx10, sx1, sx11);
+	ClipLine (sx1, sx10, sx1, sx11, X0, Y0, X1, Y1);
       }
     }
@@ -695,5 +700,5 @@
   float *x, *y, *dym, *dyp;
   double mxi, mxj, myi, myj, bxi, bxj, byi, byj, bx, by;
-  double sx0, sy0, sx1, sy1, sz, sx10, sx11;
+  double sx0, sy0, sx1, sy1, sz, sx10, sx11, X0, X1, Y0, Y1;
 
   mxi = graph[0].axis[0].dfx / (object[0].x1 - object[0].x0);
@@ -713,4 +718,9 @@
   bar = object[0].ebar; sz = object[0].size*graph[0].axis[0].dfx*0.03;
   
+  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 < object[0].Npts; i++) {
     if (!(finite(x[i]) && finite(y[i]) && finite(dyp[i]))) continue;
@@ -724,9 +734,9 @@
 	 (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
     {
-      DrawLine (sx0, sy0, sx1, sy1);
+      ClipLine (sx0, sy0, sx1, sy1, X0, Y0, X1, Y1);
       if (bar) {
 	sx10 = sx1 - sz;
 	sx11 = sx1 + sz;
-	DrawLine (sx10, sy1, sx11, sy1);
+	ClipLine (sx10, sy1, sx11, sy1, X0, Y0, X1, Y1);
       }
     }
@@ -741,11 +751,11 @@
 	 (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
     {
-      DrawLine (sx0, sy0, sx1, sy1);
+      ClipLine (sx0, sy0, sx1, sy1, X0, Y0, X1, Y1);
       if (bar) {
 	sx10 = sx1 - sz;
 	sx11 = sx1 + sz;
-	DrawLine (sx10, sy1, sx11, sy1);
-      }
-    }
-  }
-}
+	ClipLine (sx10, sy1, sx11, sy1, X0, Y0, X1, Y1);
+      }
+    }
+  }
+}
Index: /branches/eam_branches/ipp-20130307/Ohana/src/kapa2/src/PSObjects.c
===================================================================
--- /branches/eam_branches/ipp-20130307/Ohana/src/kapa2/src/PSObjects.c	(revision 35370)
+++ /branches/eam_branches/ipp-20130307/Ohana/src/kapa2/src/PSObjects.c	(revision 35371)
@@ -578,4 +578,9 @@
   bar = object[0].ebar; sz = object[0].size*graph[0].axis[1].dfy*0.03;
    
+  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 < object[0].Npts; i++) {
     if (!(finite(x[i]) && finite(y[i]) && finite(dxp[i]))) continue;
@@ -589,9 +594,11 @@
 	 (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
       {
-	DrawLine (sx0, sy0, sx1, sy1);
+	ClipLinePS (sx0, sy0, sx1, sy1, X0, Y0, X1, Y1, f);
+	// DrawLine (sx0, sy0, sx1, sy1);
 	if (bar) {
 	  sx10 = sy1 - sz;
 	  sx11 = sy1 + sz;
-	  DrawLine (sx1, sx10, sx1, sx11);
+	  ClipLinePS (sx1, sx10, sx1, sx11, X0, Y0, X1, Y1, f);
+	  // DrawLine (sx1, sx10, sx1, sx11);
 	}
       }
@@ -606,9 +613,11 @@
 	 (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
       {
-	DrawLine (sx0, sy0, sx1, sy1);
+	ClipLinePS (sx0, sy0, sx1, sy1, X0, Y0, X1, Y1, f);
+	// DrawLine (sx0, sy0, sx1, sy1);
 	if (bar) {
 	  sx10 = sy1 - sz;
 	  sx11 = sy1 + sz;
-	  DrawLine (sx1, sx10, sx1, sx11);
+	  ClipLinePS (sx1, sx10, sx1, sx11, X0, Y0, X1, Y1, f);
+	  // DrawLine (sx1, sx10, sx1, sx11);
 	}
       }
@@ -641,4 +650,9 @@
   bar = object[0].ebar; sz = object[0].size*graph[0].axis[0].dfx*0.03;
   
+  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 < object[0].Npts; i++) {
     if (!(finite(x[i]) && finite(y[i]) && finite(dyp[i]))) continue;
@@ -652,9 +666,11 @@
 	 (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
       {
-	DrawLine (sx0, sy0, sx1, sy1);
+	ClipLinePS (sx0, sy0, sx1, sy1, X0, Y0, X1, Y1, f);
+	// DrawLine (sx0, sy0, sx1, sy1);
 	if (bar) {
 	  sx10 = sx1 - sz;
 	  sx11 = sx1 + sz;
-	  DrawLine (sx10, sy1, sx11, sy1);
+	  ClipLinePS (sx10, sy1, sx11, sy1, X0, Y0, X1, Y1, f);
+	  // DrawLine (sx10, sy1, sx11, sy1);
 	}
       }
@@ -669,9 +685,11 @@
 	 (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
       {
-	DrawLine (sx0, sy0, sx1, sy1);
+	ClipLinePS (sx0, sy0, sx1, sy1, X0, Y0, X1, Y1, f);
+	// DrawLine (sx0, sy0, sx1, sy1);
 	if (bar) {
 	  sx10 = sx1 - sz;
 	  sx11 = sx1 + sz;
-	  DrawLine (sx10, sy1, sx11, sy1);
+	  ClipLinePS (sx10, sy1, sx11, sy1, X0, Y0, X1, Y1, f);
+	  // DrawLine (sx10, sy1, sx11, sy1);
 	}
       }
Index: /branches/eam_branches/ipp-20130307/Ohana/src/kapa2/src/bDrawObjects.c
===================================================================
--- /branches/eam_branches/ipp-20130307/Ohana/src/kapa2/src/bDrawObjects.c	(revision 35370)
+++ /branches/eam_branches/ipp-20130307/Ohana/src/kapa2/src/bDrawObjects.c	(revision 35371)
@@ -578,4 +578,9 @@
   bar = object[0].ebar; sz = object[0].size*graph[0].axis[1].dfy*0.03;
    
+  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 < object[0].Npts; i++) {
     if (!(finite(x[i]) && finite(y[i]) && finite(dxp[i]))) continue;
@@ -589,9 +594,11 @@
 	 (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
     {
-      DrawLine (buffer, sx0, sy0, sx1, sy1);
+      bDrawClipLine (buffer, sx0, sy0, sx1, sy1, X0, Y0, X1, Y1);
+      //   DrawLine (buffer, sx0, sy0, sx1, sy1);
       if (bar) {
 	sx10 = sy1 - sz;
 	sx11 = sy1 + sz;
-	DrawLine (buffer, sx1, sx10, sx1, sx11);
+	bDrawClipLine (buffer, sx1, sx10, sx1, sx11, X0, Y0, X1, Y1);
+	//   DrawLine (buffer, sx1, sx10, sx1, sx11);
       }
     }
@@ -606,9 +613,11 @@
 	 (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
     {
-      DrawLine (buffer, sx0, sy0, sx1, sy1);
+      bDrawClipLine (buffer, sx0, sy0, sx1, sy1, X0, Y0, X1, Y1);
+      //   DrawLine (buffer, sx0, sy0, sx1, sy1);
       if (bar) {
 	sx10 = sy1 - sz;
 	sx11 = sy1 + sz;
-	DrawLine (buffer, sx1, sx10, sx1, sx11);
+	bDrawClipLine (buffer, sx1, sx10, sx1, sx11, X0, Y0, X1, Y1);
+	//   DrawLine (buffer, sx1, sx10, sx1, sx11);
       }
     }
@@ -640,4 +649,9 @@
   bar = object[0].ebar; sz = object[0].size*graph[0].axis[0].dfx*0.03;
   
+  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 < object[0].Npts; i++) {
     if (!(finite(x[i]) && finite(y[i]) && finite(dyp[i]))) continue;
@@ -651,9 +665,11 @@
 	 (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
     {
-      DrawLine (buffer, sx0, sy0, sx1, sy1);
+      bDrawClipLine (buffer, sx0, sy0, sx1, sy1, X0, Y0, X1, Y1);
+      //   DrawLine (buffer, sx0, sy0, sx1, sy1);
       if (bar) {
 	sx10 = sx1 - sz;
 	sx11 = sx1 + sz;
-	DrawLine (buffer, sx10, sy1, sx11, sy1);
+	bDrawClipLine (buffer, sx10, sy1, sx11, sy1, X0, Y0, X1, Y1);
+	//   DrawLine (buffer, sx10, sy1, sx11, sy1);
       }
     }
@@ -668,9 +684,11 @@
 	 (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
     {
-      DrawLine (buffer, sx0, sy0, sx1, sy1);
+      bDrawClipLine (buffer, sx0, sy0, sx1, sy1, X0, Y0, X1, Y1);
+      //   DrawLine (buffer, sx0, sy0, sx1, sy1);
       if (bar) {
 	sx10 = sx1 - sz;
 	sx11 = sx1 + sz;
-	DrawLine (buffer, sx10, sy1, sx11, sy1);
+	bDrawClipLine (buffer, sx10, sy1, sx11, sy1, X0, Y0, X1, Y1);
+	//   DrawLine (buffer, sx10, sy1, sx11, sy1);
       }
     }