Index: trunk/psModules/src/objects/pmSourcePlotApResid.c
===================================================================
--- trunk/psModules/src/objects/pmSourcePlotApResid.c	(revision 39926)
+++ trunk/psModules/src/objects/pmSourcePlotApResid.c	(revision 40454)
@@ -153,7 +153,7 @@
 
     graphdata.color = KapaColorByName ("black");
-    graphdata.ptype = 2;
+    graphdata.ptype = KAPA_POINT_CROSS;
     graphdata.size = 0.5;
-    graphdata.style = 2;
+    graphdata.style = KAPA_PLOT_POINTS;
     KapaPrepPlot (kapa, n, &graphdata);
     KapaPlotVector (kapa, n, x->data.F32, "x");
Index: trunk/psModules/src/objects/pmSourcePlotMoments.c
===================================================================
--- trunk/psModules/src/objects/pmSourcePlotMoments.c	(revision 39926)
+++ trunk/psModules/src/objects/pmSourcePlotMoments.c	(revision 40454)
@@ -153,7 +153,7 @@
 
     graphdata.color = KapaColorByName ("black");
-    graphdata.ptype = 0;
+    graphdata.ptype = KAPA_POINT_BOX_SOLID;
     graphdata.size = 0.3;
-    graphdata.style = 2;
+    graphdata.style = KAPA_PLOT_POINTS;
     KapaPrepPlot (kapa, nF, &graphdata);
     KapaPlotVector (kapa, nF, xFaint->data.F32, "x");
@@ -161,7 +161,7 @@
 
     graphdata.color = KapaColorByName ("red");
-    graphdata.ptype = 2;
+    graphdata.ptype = KAPA_POINT_CROSS;
     graphdata.size = 0.5;
-    graphdata.style = 2;
+    graphdata.style = KAPA_PLOT_POINTS;
     KapaPrepPlot (kapa, nB, &graphdata);
     KapaPlotVector (kapa, nB, xBright->data.F32, "x");
Index: trunk/psModules/src/objects/pmSourcePlotPSFModel.c
===================================================================
--- trunk/psModules/src/objects/pmSourcePlotPSFModel.c	(revision 39926)
+++ trunk/psModules/src/objects/pmSourcePlotPSFModel.c	(revision 40454)
@@ -206,7 +206,7 @@
 
     graphdata.color = KapaColorByName ("black");
-    graphdata.ptype = 100;
+    graphdata.ptype = KAPA_POINT_PAIR_CONNECT;
     graphdata.size = 0.3;
-    graphdata.style = 2;
+    graphdata.style = KAPA_PLOT_POINTS;
     KapaPrepPlot (kapa, nMNT, &graphdata);
     KapaPlotVector (kapa, nMNT, xMNT->data.F32, "x");
@@ -214,7 +214,7 @@
 
     graphdata.color = KapaColorByName ("blue");
-    graphdata.ptype = 100;
+    graphdata.ptype = KAPA_POINT_PAIR_CONNECT;
     graphdata.size = 0.5;
-    graphdata.style = 2;
+    graphdata.style = KAPA_PLOT_POINTS;
     KapaPrepPlot (kapa, nPSF, &graphdata);
     KapaPlotVector (kapa, nPSF, xPSF->data.F32, "x");
@@ -222,7 +222,7 @@
 
     graphdata.color = KapaColorByName ("red");
-    graphdata.ptype = 100;
+    graphdata.ptype = KAPA_POINT_PAIR_CONNECT;
     graphdata.size = 0.5;
-    graphdata.style = 2;
+    graphdata.style = KAPA_PLOT_POINTS;
     KapaPrepPlot (kapa, nMIN, &graphdata);
     KapaPlotVector (kapa, nMIN, xMIN->data.F32, "x");
Index: trunk/psModules/src/objects/pmSourceVisual.c
===================================================================
--- trunk/psModules/src/objects/pmSourceVisual.c	(revision 39926)
+++ trunk/psModules/src/objects/pmSourceVisual.c	(revision 40454)
@@ -109,7 +109,7 @@
 
     graphdata.color = KapaColorByName ("black");
-    graphdata.ptype = 2;
+    graphdata.ptype = KAPA_POINT_CROSS;
     graphdata.size = 0.5;
-    graphdata.style = 2;
+    graphdata.style = KAPA_PLOT_POINTS;
     graphdata.etype |= 0x01;
 
@@ -200,7 +200,7 @@
 
     graphdata.color = KapaColorByName ("black");
-    graphdata.ptype = 2;
+    graphdata.ptype = KAPA_POINT_CROSS;
     graphdata.size = 0.5;
-    graphdata.style = 2;
+    graphdata.style = KAPA_PLOT_POINTS;
     graphdata.etype |= 0x01;
 
@@ -265,7 +265,7 @@
 
     graphdata.color = KapaColorByName ("black");
-    graphdata.ptype = 2;
+    graphdata.ptype = KAPA_POINT_CROSS;
     graphdata.size = 0.5;
-    graphdata.style = 2;
+    graphdata.style = KAPA_PLOT_POINTS;
     graphdata.etype |= 0x01;
 
@@ -469,7 +469,7 @@
     KapaSendLabel (kapa1, "Model Param", KAPA_LABEL_YM);
 
-    graphdata.ptype = 2;
+    graphdata.ptype = KAPA_POINT_CROSS;
     graphdata.size = 1.0;
-    graphdata.style = 2;
+    graphdata.style = KAPA_PLOT_POINTS;
     KapaPrepPlot (kapa1,   x->n, &graphdata);
     KapaPlotVector (kapa1, x->n, x->data.F32, "x");
@@ -477,5 +477,5 @@
 
     graphdata.color = KapaColorByName ("red");
-    graphdata.ptype = 1;
+    graphdata.ptype = KAPA_POINT_BOX_OPEN;
     KapaPrepPlot (kapa1,   xm->n, &graphdata);
     KapaPlotVector (kapa1, xm->n, xm->data.F32, "x");
@@ -483,5 +483,5 @@
 
     graphdata.color = KapaColorByName ("blue");
-    graphdata.ptype = 1;
+    graphdata.ptype = KAPA_POINT_BOX_OPEN;
     KapaPrepPlot (kapa1,   x->n, &graphdata);
     KapaPlotVector (kapa1, x->n, x->data.F32, "x");
@@ -519,7 +519,7 @@
     KapaSendLabel (kapa1, "Model Param", KAPA_LABEL_YM);
 
-    graphdata.ptype = 2;
+    graphdata.ptype = KAPA_POINT_CROSS;
     graphdata.size = 1.0;
-    graphdata.style = 2;
+    graphdata.style = KAPA_PLOT_POINTS;
     KapaPrepPlot (kapa1,   y->n, &graphdata);
     KapaPlotVector (kapa1, y->n, y->data.F32, "x");
@@ -527,5 +527,5 @@
 
     graphdata.color = KapaColorByName ("red");
-    graphdata.ptype = 1;
+    graphdata.ptype = KAPA_POINT_BOX_OPEN;
     KapaPrepPlot (kapa1,   xm->n, &graphdata);
     KapaPlotVector (kapa1, xm->n, ym->data.F32, "x");
@@ -533,5 +533,5 @@
 
     graphdata.color = KapaColorByName ("blue");
-    graphdata.ptype = 1;
+    graphdata.ptype = KAPA_POINT_BOX_OPEN;
     KapaPrepPlot (kapa1,   y->n, &graphdata);
     KapaPlotVector (kapa1, y->n, y->data.F32, "x");
@@ -612,7 +612,7 @@
 
     graphdata->color = KapaColorByName ("black");
-    graphdata->ptype = 100;
+    graphdata->ptype = KAPA_POINT_PAIR_CONNECT;
     graphdata->size = 0.5;
-    graphdata->style = 2;
+    graphdata->style = KAPA_PLOT_POINTS;
     KapaPrepPlot (myKapa, xv->n, graphdata);
     KapaPlotVector (myKapa, xv->n, xv->data.F32, "x");
@@ -620,7 +620,7 @@
 
     graphdata->color = KapaColorByName ("blue");
-    graphdata->ptype = 0;
+    graphdata->ptype = KAPA_POINT_BOX_OPEN;
     graphdata->size = 1.5;
-    graphdata->style = 2;
+    graphdata->style = KAPA_PLOT_POINTS;
     KapaPrepPlot (myKapa, xv->n, graphdata);
     KapaPlotVector (myKapa, xv->n, xv->data.F32, "x");
@@ -652,7 +652,7 @@
 
     graphdata->color = KapaColorByName ("red");
-    graphdata->ptype = 100;
+    graphdata->ptype = KAPA_POINT_PAIR_CONNECT;
     graphdata->size = 0.5;
-    graphdata->style = 2;
+    graphdata->style = KAPA_PLOT_POINTS;
     KapaPrepPlot (myKapa, xv->n, graphdata);
     KapaPlotVector (myKapa, xv->n, xv->data.F32, "x");