if(!strcasecmp(mat->name->str, "vacuum")) return;
if(!strcasecmp(mat->name->str, "pvb")) return;
double *x, *y;
- #ifdef DEBUG
+ #ifdef DEBUG_ASSIGNMENT
fprintf(stderr, "put_mat_in_graph(%s) (x->%s, y->%s): ", (char*)key, propmap->xprop->str, propmap->yprop->str);
#endif
lookup_xy(mat->properties, propmap->xprop, propmap->yprop, &x, &y);
if((x != NULL) && (y != NULL)) {
graph_add_point(propmap->graph, *x, *y, mat->name);
- #ifdef DEBUG
+ #ifdef DEBUG_ASSIGNMENT
fprintf(stderr, "added (x->%s=%g, y->%s=%g)\n", propmap->xprop->str, *x, propmap->yprop->str, *y);
}else{
fprintf(stderr, "no such properties (x->%s, y->%s)\n", propmap->xprop->str, propmap->yprop->str);
double *p0_x, *p0_y, *p1_x, *p1_y, *p3_x, *p3_y;
lookup_xy(propmap->mat->properties, propmap->xprop, propmap->yprop, &p0_x, &p0_y);
lookup_xy(mat->properties, propmap->xprop, propmap->yprop, &p3_x, &p3_y);
-#ifdef DEBUG
+#ifdef DEBUG_ASSIGNMENT
fprintf(stderr, "%s:%s x=%s y=%s p0(%g,%g) p3(%g,%g)\n", propmap->mat->name->str, mat->name->str, propmap->xprop->str, propmap->yprop->str, (p0_x)?*p0_x:0, (p0_y)?*p0_y:0, (p3_x)?*p3_x:0, (p3_y)?*p3_y:0);
#endif
if((p0_x != NULL) && (p0_y != NULL) && (p3_x != NULL) && (p3_y != NULL)) {
}
if(bow != NULL) {
if((p1_x = g_hash_table_lookup(bow->properties, propmap->xprop->str)) != NULL) {
- l->p1_x = *p1_x;
+ l->p1_x = *p1_x/2.0;
graph_bezier_quadratic_to_cubic(l->p0_x, l->p3_x, &(l->p1_x), &(l->p2_x));
}else{
graph_bezier_linear_to_cubic(l->p0_x, l->p3_x, &(l->p1_x), &(l->p2_x));
}
if((p1_y = g_hash_table_lookup(bow->properties, propmap->yprop->str)) != NULL) {
- l->p1_y = *p1_y;
+ l->p1_y = *p1_y/2.0;
graph_bezier_quadratic_to_cubic(l->p0_y, l->p3_y, &(l->p1_y), &(l->p2_y));
}else{
graph_bezier_linear_to_cubic(l->p0_y, l->p3_y, &(l->p1_y), &(l->p2_y));
#ifdef DEBUG_SHOW_ONLY_BOWED
free(l);
return;
- #endif;
+ #endif
graph_bezier_linear_to_cubic(l->p0_x, l->p3_x, &(l->p1_x), &(l->p2_x));
graph_bezier_linear_to_cubic(l->p0_y, l->p3_y, &(l->p1_y), &(l->p2_y));
}
- #ifdef DEBUG
+ #ifdef DEBUG_ASSIGNMENT
fprintf(stderr, "%s:%s p0(%g,%g) p1(%g,%g) p2(%g,%g), p3(%g,%g)\n", propmap->mat->name->str, mat->name->str, l->p0_x, l->p0_y, l->p1_x, l->p1_y, l->p2_x, l->p2_y, l->p3_x, l->p3_y);
#endif
graph_add_graph_line(propmap->graph, l);
g_hash_table_foreach(mdb->materials, &put_mat_in_graph, &propmap);
//graph_add_linear_connectors(propmap.graph);
g_hash_table_foreach(mdb->materials, &link_materials, &propmap);
-
+ graph_autoset_xaxis(propmap.graph, propmap.xprop);
+ graph_autoset_yaxis(propmap.graph, propmap.yprop);
//Connect signals
g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_main_quit), NULL);