Changeset 40477 for branches/czw_branch/20170908/Ohana/src/libkapa/src/KapaWindow.c

Timestamp:

Jun 27, 2018, 3:20:35 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/Ohana

Files:

• . (modified) (1 prop)
• src/libkapa/src/KapaWindow.c (modified) (2 diffs)

branches/czw_branch/20170908/Ohana/src/libkapa/src/KapaWindow.c

@@ -94 +94 @@
   graphdata[0].xmax = graphdata[0].ymax = 1.0;
 
-  graphdata[0].style = graphdata[0].ptype = 2;
+  graphdata[0].style = KAPA_PLOT_POINTS;
+  graphdata[0].ptype = KAPA_POINT_BOX_SOLID;
   graphdata[0].ltype = graphdata[0].color = 0;
   graphdata[0].etype = graphdata[0].ebar = 0;
@@ -357 +358 @@
 }
 
-int KapaSendTextline (int fd, char *string, float x, float y, float angle) {
-  
+int KapaSendTextline (int fd, char *string, float x, float y, float angle, int justify, int color) {
+  
+  // must be in range 0 - 8
+  justify = MIN(MAX(justify, 0), 8);
+
   KiiSendCommand (fd, 4, "PTXT");
-  KiiSendMessage (fd, "%f %f %f ", x, y, angle);
+  KiiSendMessage (fd, "%f %f %f %d %d", x, y, angle, justify, color);
   KiiSendData (fd, string, strlen(string));
   KiiWaitAnswer (fd, "DONE");