* Now wit hlabels and line drawing!

[scdataviz] / scdataviz.c

diff --git a/scdataviz.c b/scdataviz.c
index 43e7b45..c51f21d 100644 (file)
--- a/scdataviz.c
+++ b/scdataviz.c
@@ -31,6 +31,8 @@
 #include <graphwidget.h>
 #include <matdb-dotcode.h>
 
+#undef DEBUG
+
 struct xy_properties {
   GString *xprop;
   GString *yprop;
@@ -40,13 +42,15 @@ struct xy_properties {
 static void put_mat_in_graph(gpointer key, gpointer value, gpointer user_data) {
   struct xy_properties *propmap = user_data;
   struct matdb_material *mat = value;
+  if(!strcasecmp(mat->name->str, "vacuum")) return;
+  if(!strcasecmp(mat->name->str, "pvb")) return;
   double *x, *y;
   #ifdef DEBUG
   fprintf(stderr, "put_mat_in_graph(%s) (x->%s, y->%s): ", (char*)key, propmap->xprop->str, propmap->yprop->str);
   #endif
   if(((x=g_hash_table_lookup(mat->properties, propmap->xprop->str)) != NULL)
      && ((y=g_hash_table_lookup(mat->properties, propmap->yprop->str)) != NULL)) {
-    graph_add_point(propmap->graph, *x, *y);
+    graph_add_point(propmap->graph, *x, *y, mat->name);
   #ifdef DEBUG
     fprintf(stderr, "added (x->%s=%g, y->%s=%g)\n", propmap->xprop->str, *x, propmap->yprop->str, *y);
   }else{
@@ -66,7 +70,7 @@ int main(int   argc, char *argv[])
     //fprintf(stderr, "read_matdb_dotcode(%s, %d)=%x", file->str, err,
     //(int)mdb);
     fprintf(stderr, "err=%d\n", err);
-    print_matdb(mdb);
+    //print_matdb(mdb);
     
     
     gtk_init (&argc, &argv);