Changeset 13479 for trunk/Ohana/src/opihi/lib.data/style_args.c

Timestamp:

May 22, 2007, 12:23:09 PM (19 years ago)

Author:

eugene

Message:

upgrading to kapa 2.0 API, upgrades to dvo user interface

File:

• trunk/Ohana/src/opihi/lib.data/style_args.c (modified) (1 diff)

trunk/Ohana/src/opihi/lib.data/style_args.c

@@ -2 +2 @@
 # include "display.h"
 
-int style_args (Graphdata *graphmode, int *argc, char **argv, int Nforce) {
+int style_args (Graphdata *graphmode, int *argc, char **argv, int *kapa) {
   
-  int N, Ngraph;
-  char *name;
+  int N;
+  char *colorName;
+  char *kapaName;
 
-  Ngraph = -1;
+  kapaName = NULL;
   if ((N = get_argument (*argc, argv, "-n"))) {
     remove_argument (N, argc, argv);
-    Ngraph = atof (argv[N]);
+    kapaName = strcreate (argv[N]);
     remove_argument (N, argc, argv);
   }
-  if (Nforce != -1) Ngraph = Nforce;
-  if (!GetGraph (graphmode, NULL, &Ngraph)) return (FALSE);
+  if (!GetGraph (graphmode, kapa, kapaName)) return (FALSE);
+  FREE (kapaName);
 
   if (*argc == 1) {
-    name = KapaColorName (graphmode[0].color);
-    gprint (GP_ERR, "current style (%d): -x %d -c %s -pt %d -lt %d -lw %f -sz %f\n", Ngraph,
-             graphmode[0].style, name, graphmode[0].ptype, 
+    kapaName = GetKapaName();
+    colorName = KapaColorName (graphmode[0].color);
+    gprint (GP_ERR, "current style (%s): -x %d -c %s -pt %d -lt %d -lw %f -sz %f\n", kapaName,
+             graphmode[0].style, colorName, graphmode[0].ptype, 
              graphmode[0].ltype, graphmode[0].lweight,
              graphmode[0].size);