Changeset 23351 for branches/cnb_branches/cnb_branch_20090301/psModules/src/objects/pmSourceVisual.c

Timestamp:

Mar 17, 2009, 12:07:42 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmSourceVisual.c (modified) (6 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/objects/pmSourceVisual.c

@@ -7 +7 @@
 #include "pmSourceVisual.h"
 
-# if (HAVE_KAPA)
-# include <kapa.h>
+#if (HAVE_KAPA)
+#include <kapa.h>
+#include "pmVisual.h"
 
 // functions used to visualize the analysis as it goes
 // these are invoked by the -visual options
 
-static bool isVisual = false;
 static int kapa1 = -1;
+static bool plotPSF = true;
 // static int kapa2 = -1;
 // static int kapa3 = -1;
 
+bool pmSourceVisualClose() {
+    if (kapa1 != -1)
+        KiiClose(kapa1);
+    return true;
+}
+
 bool pmSourcePlotPoints3D (int myKapa, Graphdata *graphdata, psVector *xn, psVector *yn, psVector *zn, float theta, float phi);
 
-bool pmSourceSetVisual (bool mode) {
-
-    isVisual = mode;
-    return true;
-}
 
 bool pmSourceVisualPSFModelResid (pmTrend2D *trend, psVector *x, psVector *y, psVector *param, psVector *mask) {
 
-    KapaSection section;  // put the positive profile in one and the residuals in another? 
+    KapaSection section;  // put the positive profile in one and the residuals in another?
 
     Graphdata graphdata;
 
-    if (!isVisual) return true;
+    if (!pmVisualIsVisual() || !plotPSF) return true;
 
     if (kapa1 == -1) {
         kapa1 = KapaOpenNamedSocket ("kapa", "pmSource:plots");
-        if (kapa1 == -1) {
-            fprintf (stderr, "failure to open kapa; visual mode disabled\n");
-            isVisual = false;
-            return false;
-        }
-    }  
+        if (kapa1 == -1) {
+            fprintf (stderr, "failure to open kapa; visual mode disabled\n");
+            pmVisualSetVisual(false);
+            return false;
+        }
+    }
 
     KapaClearPlots (kapa1);
@@ -55 +57 @@
 
     for (int i = 0; i < x->n; i++) {
-        model->data.F32[i] = pmTrend2DEval (trend, x->data.F32[i], y->data.F32[i]);
-        resid->data.F32[i] = param->data.F32[i] - model->data.F32[i];
-        if (mask->data.PS_TYPE_VECTOR_MASK_DATA[i]) continue;
-        min = PS_MIN (min, resid->data.F32[i]);
-        max = PS_MAX (max, resid->data.F32[i]);
-        Min = PS_MIN (min, param->data.F32[i]);
-        Max = PS_MAX (max, param->data.F32[i]);
+        model->data.F32[i] = pmTrend2DEval (trend, x->data.F32[i], y->data.F32[i]);
+        resid->data.F32[i] = param->data.F32[i] - model->data.F32[i];
+        if (mask->data.PS_TYPE_VECTOR_MASK_DATA[i]) continue;
+        min = PS_MIN (min, resid->data.F32[i]);
+        max = PS_MAX (max, resid->data.F32[i]);
+        Min = PS_MIN (min, param->data.F32[i]);
+        Max = PS_MAX (max, param->data.F32[i]);
     }
 
@@ -70 +72 @@
     psVector *Fn = psVectorAlloc (x->n, PS_TYPE_F32);
     for (int i = 0; i < x->n; i++) {
-        xn->data.F32[i] = x->data.F32[i] / 5000.0;
-        yn->data.F32[i] = y->data.F32[i] / 5000.0;
-        zn->data.F32[i] = (resid->data.F32[i] - min) / (max - min);
-        Zn->data.F32[i] = (param->data.F32[i] - Min) / (Max - Min);
-        Fn->data.F32[i] = (model->data.F32[i] - Min) / (Max - Min);
+        xn->data.F32[i] = x->data.F32[i] / 5000.0;
+        yn->data.F32[i] = y->data.F32[i] / 5000.0;
+        zn->data.F32[i] = (resid->data.F32[i] - min) / (max - min);
+        Zn->data.F32[i] = (param->data.F32[i] - Min) / (Max - Min);
+        Fn->data.F32[i] = (model->data.F32[i] - Min) / (Max - Min);
     }
 
@@ -152 +154 @@
     // pause and wait for user input:
     // continue, save (provide name), ??
-    char key[10];
-    fprintf (stdout, "[c]ontinue? ");
-    if (!fgets(key, 8, stdin)) {
-        psWarning("Unable to read option");
-    }
+    pmVisualAskUser(&plotPSF);
+
     return true;
 }
@@ -173 +172 @@
 
     for (int i = 0; i < xn->n; i++) {
-        xv->data.F32[2*i+0] = +xn->data.F32[i]*cos(theta) + yn->data.F32[i]*sin(theta)*cos(phi) + zn->data.F32[i]*sin(theta)*sin(phi);
-        yv->data.F32[2*i+0] = -xn->data.F32[i]*sin(theta) + yn->data.F32[i]*cos(theta)*cos(phi) + zn->data.F32[i]*cos(theta)*sin(phi);
-        zv->data.F32[2*i+0] = -yn->data.F32[i]*sin(phi)   + zn->data.F32[i]*cos(phi);
-        xv->data.F32[2*i+1] = +xn->data.F32[i]*cos(theta) + yn->data.F32[i]*sin(theta)*cos(phi);
-        yv->data.F32[2*i+1] = -xn->data.F32[i]*sin(theta) + yn->data.F32[i]*cos(theta)*cos(phi);
-        zv->data.F32[2*i+1] = -yn->data.F32[i]*sin(phi);
-        graphdata->xmin = PS_MIN(graphdata->xmin, xv->data.F32[2*i+0]);
-        graphdata->xmax = PS_MAX(graphdata->xmax, xv->data.F32[2*i+0]);
-        graphdata->ymin = PS_MIN(graphdata->ymin, zv->data.F32[2*i+0]);
-        graphdata->ymax = PS_MAX(graphdata->ymax, zv->data.F32[2*i+0]);
-        graphdata->xmin = PS_MIN(graphdata->xmin, xv->data.F32[2*i+1]);
-        graphdata->xmax = PS_MAX(graphdata->xmax, xv->data.F32[2*i+1]);
-        graphdata->ymin = PS_MIN(graphdata->ymin, zv->data.F32[2*i+1]);
-        graphdata->ymax = PS_MAX(graphdata->ymax, zv->data.F32[2*i+1]);
+        xv->data.F32[2*i+0] = +xn->data.F32[i]*cos(theta) + yn->data.F32[i]*sin(theta)*cos(phi) + zn->data.F32[i]*sin(theta)*sin(phi);
+        yv->data.F32[2*i+0] = -xn->data.F32[i]*sin(theta) + yn->data.F32[i]*cos(theta)*cos(phi) + zn->data.F32[i]*cos(theta)*sin(phi);
+        zv->data.F32[2*i+0] = -yn->data.F32[i]*sin(phi)   + zn->data.F32[i]*cos(phi);
+        xv->data.F32[2*i+1] = +xn->data.F32[i]*cos(theta) + yn->data.F32[i]*sin(theta)*cos(phi);
+        yv->data.F32[2*i+1] = -xn->data.F32[i]*sin(theta) + yn->data.F32[i]*cos(theta)*cos(phi);
+        zv->data.F32[2*i+1] = -yn->data.F32[i]*sin(phi);
+        graphdata->xmin = PS_MIN(graphdata->xmin, xv->data.F32[2*i+0]);
+        graphdata->xmax = PS_MAX(graphdata->xmax, xv->data.F32[2*i+0]);
+        graphdata->ymin = PS_MIN(graphdata->ymin, zv->data.F32[2*i+0]);
+        graphdata->ymax = PS_MAX(graphdata->ymax, zv->data.F32[2*i+0]);
+        graphdata->xmin = PS_MIN(graphdata->xmin, xv->data.F32[2*i+1]);
+        graphdata->xmax = PS_MAX(graphdata->xmax, xv->data.F32[2*i+1]);
+        graphdata->ymin = PS_MIN(graphdata->ymin, zv->data.F32[2*i+1]);
+        graphdata->ymax = PS_MAX(graphdata->ymax, zv->data.F32[2*i+1]);
     }
     xv->n = xn->n;
@@ -253 +252 @@
 }
 
-# else
-# endif
+#else
+
+bool pmSourceSetVisual(bool mode)
+{
+    return true;
+}
+
+bool pmSourceVisualPSFModelResid(pmTrend2D *trend, psVector *x, psVector *y, psVector *param, psVector *mask)
+{
+    return true;
+}
+
+#endif