Index: /trunk/psModules/src/astrom/pmAstrometryVisual.c =================================================================== --- /trunk/psModules/src/astrom/pmAstrometryVisual.c (revision 40453) +++ /trunk/psModules/src/astrom/pmAstrometryVisual.c (revision 40454) @@ -72,7 +72,7 @@ graphdata.color = KapaColorByName ("black"); - graphdata.ptype = 7; + graphdata.ptype = KAPA_POINT_BOX_SOLID; graphdata.size = 0.5; - graphdata.style = 2; + graphdata.style = KAPA_PLOT_POINTS; section.dx = 0.5; @@ -232,7 +232,7 @@ graphdata.color = KapaColorByName ("black"); - graphdata.ptype = 7; + graphdata.ptype = KAPA_POINT_BOX_SOLID; graphdata.size = 0.5; - graphdata.style = 2; + graphdata.style = KAPA_PLOT_POINTS; // initialize and populate plot vectors @@ -325,6 +325,6 @@ "Reference Star Luminosity Function, Shifted Raw Fit, and Cutoff", KAPA_LABEL_XP); - graphdata.color=KapaColorByName("black"); - graphdata.style = 1; + graphdata.color = KapaColorByName("black"); + graphdata.style = KAPA_PLOT_HISTOGRAM; KapaPrepPlot (kapa1, lnMag->n, &graphdata); KapaPlotVector(kapa1, lnMag->n, Mag->data.F32, "x"); @@ -332,5 +332,5 @@ // Overplot fit - graphdata.style=0; + graphdata.style = KAPA_PLOT_CONNECT; KapaPrepPlot(kapa1,2,&graphdata); KapaPlotVector(kapa1, 2, x, "x"); @@ -391,7 +391,7 @@ psFree(section.name); - graphdata.ptype = 7; + graphdata.ptype = KAPA_POINT_BOX_SOLID; graphdata.size = 0.5; - graphdata.style = 2; + graphdata.style = KAPA_PLOT_POINTS; graphdata.color = KapaColorByName ("black"); KapaClearPlots(kapa1); @@ -441,5 +441,5 @@ graphdata.color = KapaColorByName ("red"); - graphdata.style = 0; + graphdata.style = KAPA_PLOT_CONNECT; // overplot clumpy regions excluded from analysis @@ -507,6 +507,6 @@ KapaInitGraph (&graphdata); KapaClearPlots (kapa1); - graphdata.ptype = 2; - graphdata.style = 2; + graphdata.ptype = KAPA_POINT_CROSS; + graphdata.style = KAPA_PLOT_POINTS; psVector *xNew = psVectorAllocEmpty (xOld->n, PS_TYPE_F32); @@ -556,5 +556,5 @@ KapaPlotVector (kapa1, xOld->n, yOld->data.F32, "y"); - graphdata.ptype = 1; + graphdata.ptype = KAPA_POINT_BOX_OPEN; graphdata.color = KapaColorByName("red"); KapaPrepPlot (kapa1, xNew->n, &graphdata); @@ -590,7 +590,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; section.dx = 0.4; @@ -619,5 +619,5 @@ // New Corners graphdata.color = KapaColorByName("red"); - graphdata.ptype = 7; + graphdata.ptype = KAPA_POINT_BOX_SOLID; graphdata.size = 1.5; KapaPrepPlot (kapa1, cornerPn->n, &graphdata); @@ -812,6 +812,6 @@ KapaSendLabel (kapa1, "pmAstromGridAngle residuals. Box: Correlation Peak.", KAPA_LABEL_XP); - graphdata.style = 2; - graphdata.ptype = 0; + graphdata.style = KAPA_PLOT_POINTS; + graphdata.ptype = KAPA_POINT_BOX_SOLID; graphdata.size = 0.4; graphdata.color = KapaColorByName ("black"); @@ -861,5 +861,5 @@ offsetY - 0.5 * Scale}; graphdata.color = KapaColorByName("red"); - graphdata.style = 0; + graphdata.style = KAPA_PLOT_CONNECT; graphdata.size = 1.0; KapaPrepPlot(kapa1, 5, &graphdata); @@ -873,6 +873,6 @@ KapaSetSection(kapa1, §ionX); graphdata.color = KapaColorByName("black"); - graphdata.ptype = 1; - graphdata.style = 1; + graphdata.ptype = KAPA_POINT_BOX_OPEN; + graphdata.style = KAPA_PLOT_HISTOGRAM; graphdata.ymin = 0; graphdata.ymax = maxHorizontalSlice + 0.5; @@ -887,5 +887,5 @@ float xslice[2] = {offsetX - Scale / 2., offsetX - Scale / 2.}; float yslice[2] = {-5, 100}; - graphdata.style = 0; + graphdata.style = KAPA_PLOT_CONNECT; graphdata.color = KapaColorByName("red"); KapaPrepPlot(kapa1, 2, &graphdata); @@ -896,6 +896,6 @@ KapaSetSection(kapa1, §ionY); graphdata.color = KapaColorByName("black"); - graphdata.ptype = 1; - graphdata.style = 1; + graphdata.ptype = KAPA_POINT_BOX_OPEN; + graphdata.style = KAPA_PLOT_HISTOGRAM; graphdata.ymin = -maxOffpix; graphdata.ymax = maxOffpix; @@ -912,5 +912,5 @@ yslice[0] = yslice[1] = offsetY - Scale / 2.; xslice[0] = -5; xslice[1] = 100; - graphdata.style = 0; + graphdata.style = KAPA_PLOT_CONNECT; graphdata.color = KapaColorByName("red"); KapaPrepPlot(kapa1, 2, &graphdata); @@ -982,6 +982,6 @@ // the point size will be scaled from the z vector - graphdata.style = 2; - graphdata.ptype = 2; + graphdata.style = KAPA_PLOT_POINTS; + graphdata.ptype = KAPA_POINT_CROSS; graphdata.size = -1; graphdata.color = KapaColorByName ("black"); @@ -1019,6 +1019,6 @@ // the point size will be scaled from the z vector - graphdata.style = 2; - graphdata.ptype = 7; + graphdata.style = KAPA_PLOT_POINTS; + graphdata.ptype = KAPA_POINT_CIRCLE_OPEN; graphdata.size = -1; graphdata.color = KapaColorByName ("red"); @@ -1079,6 +1079,6 @@ KapaSendLabel (kapa3, "Horizontal Profile", KAPA_LABEL_XP); - graphdata.style = 1; - graphdata.ptype = 0; + graphdata.style = KAPA_PLOT_HISTOGRAM; + graphdata.ptype = KAPA_POINT_BOX_SOLID; graphdata.size = 0.4; graphdata.color = KapaColorByName ("black"); @@ -1107,6 +1107,6 @@ KapaSendLabel (kapa3, "Vertical Profile", KAPA_LABEL_XP); - graphdata.style = 1; - graphdata.ptype = 0; + graphdata.style = KAPA_PLOT_HISTOGRAM; + graphdata.ptype = KAPA_POINT_BOX_SOLID; graphdata.size = 0.4; @@ -1150,7 +1150,7 @@ graphdata.color = KapaColorByName ("black"); - graphdata.ptype = 7; + graphdata.ptype = KAPA_POINT_CIRCLE_OPEN; graphdata.size = 0.5; - graphdata.style = 2; + graphdata.style = KAPA_PLOT_POINTS; section.dx = 0.4; @@ -1317,8 +1317,4 @@ // X vs Y by mag (ref) - graphdata.color = KapaColorByName ("red"); - graphdata.ptype = 7; - graphdata.style = 2; - xVec = psVectorAlloc (refstars->n, PS_TYPE_F32); yVec = psVectorAlloc (refstars->n, PS_TYPE_F32); @@ -1338,4 +1334,9 @@ } xVec->n = yVec->n = zVec->n = n; + + graphdata.color = KapaColorByName ("red"); + graphdata.ptype = KAPA_POINT_X; + graphdata.style = KAPA_PLOT_POINTS; + pmVisualTriplePlot (kapa2, &graphdata, xVec, yVec, zVec, false); @@ -1356,8 +1357,4 @@ // X vs Y by mag (raw) - graphdata.color = KapaColorByName ("black"); - graphdata.ptype = 7; - graphdata.style = 2; - psFree (xVec); psFree (yVec); @@ -1381,4 +1378,8 @@ } xVec->n = yVec->n = zVec->n = n; + + graphdata.color = KapaColorByName ("black"); + graphdata.ptype = KAPA_POINT_BOX_OPEN; + graphdata.style = KAPA_PLOT_POINTS; pmVisualTripleOverplot (kapa2, &graphdata, xVec, yVec, zVec, false); @@ -1392,6 +1393,4 @@ zVec = psVectorAlloc (match->n, PS_TYPE_F32); - graphdata.ptype = 2; - graphdata.color = KapaColorByName ("blue"); n = 0; for (int i = 0; i < match->n; i++) { @@ -1411,8 +1410,11 @@ xVec->n = yVec->n = zVec->n = n; fprintf (stderr, "plotting %d matched stars (raw = blue)\n", n); + + graphdata.ptype = KAPA_POINT_CROSS; + graphdata.color = KapaColorByName ("blue"); pmVisualTripleOverplot (kapa2, &graphdata, xVec, yVec, zVec, false); if (0) { - graphdata.ptype = 3; + graphdata.ptype = KAPA_POINT_X; graphdata.color = KapaColorByName ("green"); n = 0; @@ -1449,9 +1451,5 @@ KapaClearPlots (kapa3); - // X vs Y by mag (ref) - graphdata.color = KapaColorByName ("black"); - graphdata.ptype = 2; - graphdata.style = 2; - graphdata.size = 1; + // mag vs dX section.x = 0.0; @@ -1486,4 +1484,9 @@ KapaSendLabel(kapa1, "raw mag", KAPA_LABEL_XM); KapaSendLabel(kapa1, "dY", KAPA_LABEL_YM); + + graphdata.color = KapaColorByName ("blue"); + graphdata.ptype = KAPA_POINT_TRIANGLE_OPEN; + graphdata.style = KAPA_PLOT_POINTS; + graphdata.size = 2; KapaPrepPlot (kapa3, xVec->n, &graphdata); Index: /trunk/psModules/src/detrend/pmDark.c =================================================================== --- /trunk/psModules/src/detrend/pmDark.c (revision 40453) +++ /trunk/psModules/src/detrend/pmDark.c (revision 40454) @@ -1158,6 +1158,6 @@ graphdata.color = KapaColorByName("black"); - graphdata.style = 2; - graphdata.ptype = 2; + graphdata.style = KAPA_PLOT_POINTS; + graphdata.ptype = KAPA_POINT_CROSS; KapaPrepPlot (kapa[i], xSub->n, &graphdata); KapaPlotVector(kapa[i], xSub->n, xSub->data.F32, "x"); @@ -1190,6 +1190,6 @@ KapaGetGraphData(kapa[i], &graphdata); graphdata.color = KapaColorByName("red"); - graphdata.style = 2; - graphdata.ptype = 7; + graphdata.style = KAPA_PLOT_POINTS; + graphdata.ptype = KAPA_POINT_CIRCLE_OPEN; KapaPrepPlot (kapa[i], xFit->n, &graphdata); KapaPlotVector(kapa[i], xFit->n, xFit->data.F32, "x"); Index: /trunk/psModules/src/extras/pmKapaPlots.c =================================================================== --- /trunk/psModules/src/extras/pmKapaPlots.c (revision 40453) +++ /trunk/psModules/src/extras/pmKapaPlots.c (revision 40454) @@ -136,7 +136,7 @@ graphdata.color = KapaColorByName ("black"); - graphdata.ptype = 0; + graphdata.ptype = KAPA_POINT_BOX_SOLID; graphdata.size = 0.5; - graphdata.style = 2; + graphdata.style = KAPA_PLOT_POINTS; KapaPrepPlot (kapa, xVec->n, &graphdata); KapaPlotVector (kapa, xVec->n, xVec->data.F32, "x"); Index: /trunk/psModules/src/extras/pmVisual.c =================================================================== --- /trunk/psModules/src/extras/pmVisual.c (revision 40453) +++ /trunk/psModules/src/extras/pmVisual.c (revision 40454) @@ -262,6 +262,6 @@ // the point size will be scaled from the z vector - graphdata->ptype = 7; - graphdata->style = 2; + graphdata->ptype = KAPA_POINT_CIRCLE_OPEN; + graphdata->style = KAPA_PLOT_POINTS; graphdata->size = -1; KapaPrepPlot (kapid, xVec->n, graphdata); Index: /trunk/psModules/src/imcombine/pmReadoutCombine.c =================================================================== --- /trunk/psModules/src/imcombine/pmReadoutCombine.c (revision 40453) +++ /trunk/psModules/src/imcombine/pmReadoutCombine.c (revision 40454) @@ -505,6 +505,6 @@ graphdata.color = KapaColorByName("black"); - graphdata.style = 2; - graphdata.ptype = 2; + graphdata.style = KAPA_PLOT_POINTS; + graphdata.ptype = KAPA_POINT_CROSS; KapaPrepPlot (kapa, xSub->n, &graphdata); KapaPlotVector(kapa, xSub->n, xSub->data.F32, "x"); @@ -512,6 +512,6 @@ graphdata.color = KapaColorByName("red"); - graphdata.style = 2; - graphdata.ptype = 7; + graphdata.style = KAPA_PLOT_POINTS; + graphdata.ptype = KAPA_POINT_CIRCLE_OPEN; KapaPrepPlot (kapa, xAll->n, &graphdata); KapaPlotVector(kapa, xAll->n, xAll->data.F32, "x"); @@ -519,6 +519,6 @@ graphdata.color = KapaColorByName("blue"); - graphdata.style = 0; - graphdata.ptype = 7; + graphdata.style = KAPA_PLOT_CONNECT; + graphdata.ptype = KAPA_POINT_CIRCLE_OPEN; KapaPrepPlot (kapa, 2, &graphdata); KapaPlotVector(kapa, 2, xline, "x"); Index: /trunk/psModules/src/imcombine/pmSubtractionVisual.c =================================================================== --- /trunk/psModules/src/imcombine/pmSubtractionVisual.c (revision 40453) +++ /trunk/psModules/src/imcombine/pmSubtractionVisual.c (revision 40454) @@ -908,7 +908,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; @@ -974,7 +974,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 (kapa3, lflx->n, &graphdata); @@ -1001,7 +1001,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 (kapa3, lflx->n, &graphdata); @@ -1028,7 +1028,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 (kapa3, lflx->n, &graphdata); Index: /trunk/psModules/src/objects/pmSourcePlotApResid.c =================================================================== --- /trunk/psModules/src/objects/pmSourcePlotApResid.c (revision 40453) +++ /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 40453) +++ /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 40453) +++ /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 40453) +++ /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");