Changeset 40480 for branches/czw_branch/20170908/psModules/src/imcombine/pmReadoutCombine.c

Timestamp:

Jun 27, 2018, 3:25:07 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/psModules

Files:

• . (modified) (1 prop)
• src/imcombine/pmReadoutCombine.c (modified) (3 diffs)

branches/czw_branch/20170908/psModules/src/imcombine/pmReadoutCombine.c

@@ -505 +505 @@
 
     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 +512 @@
 
     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 +519 @@
 
     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");