Changeset 35416 for trunk/Ohana/src/kapa2/src/bDrawObjects.c

Timestamp:

Apr 19, 2013, 4:31:05 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130307 : parallelize dvosecfilt, use dvo_average,measure,secfilt_init functions more broadly; move image calibration to relphot_images; add synthetic photometry referece (w-band); put relphot MARKTIME & INITTIME in macros; in dvo_clients, mextract fields which need image data use a subset image metadata table (instead of loading full Images.dat table); create FIELD and MOSAIC fields for mextract; somewhat better rules for photcode:ave & similar selections in mextract; add hpm_* concept in relastro (high-speed proper motions); fix precision errors in dvopsps; check for dvopsps exit conditions; error-bar clipping to limits of plotting window; parallelize delstar -dup-images; do NOT delete parents (because parent IDs are broken after dvomerge); minor handshake when setting up KAPA connection; avextract and related do not need to launch remote jobs on all clients if region does not include tables from all hosts; add fitplx and xsection functions to mana; enable addstar of diff cmfs (at least PS1_DV3)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/kapa2/src/bDrawObjects.c (modified) (6 diffs)

trunk/Ohana/src/kapa2/src/bDrawObjects.c

@@ -578 +578 @@
   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 +594 @@
          (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 +613 @@
          (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 +649 @@
   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 +665 @@
          (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 +684 @@
          (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);
       }
     }