From 0602291e97b0b685d89662e70b1204b4d0ef144b Mon Sep 17 00:00:00 2001 From: erg Date: Fri, 28 Mar 2008 20:45:59 +0000 Subject: [PATCH] Replace constants with enums; fix illegal C enums; add additional field macros --- cmd/smyrna/gui/callbacks.c | 10 +++++----- cmd/smyrna/gui/gui.c | 20 ++++++++++---------- cmd/smyrna/gui/menucallbacks.c | 10 +++++----- cmd/smyrna/smyrnadefs.h | 13 ++++++++----- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/cmd/smyrna/gui/callbacks.c b/cmd/smyrna/gui/callbacks.c index be1e88f07..7e20772b4 100755 --- a/cmd/smyrna/gui/callbacks.c +++ b/cmd/smyrna/gui/callbacks.c @@ -91,7 +91,7 @@ void btn_dot_clicked(GtkWidget * widget, gpointer user_data) respond = gtk_dialog_run((GtkDialog *) Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph], 0, 0); + do_graph_layout(view->g[view->activeGraph], GVK_DOT, 0); gtk_object_destroy((GtkObject *) Dlg); cursor = gdk_cursor_new(GDK_HAND2); @@ -116,7 +116,7 @@ void btn_neato_clicked(GtkWidget * widget, gpointer user_data) respond = gtk_dialog_run((GtkDialog *) Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph], 1, 0); + do_graph_layout(view->g[view->activeGraph], GVK_NEATO, 0); gtk_object_destroy((GtkObject *) Dlg); gtk_button_set_image(GTK_BUTTON (glade_xml_get_widget(xml, "btn_neato")), @@ -134,7 +134,7 @@ void btn_twopi_clicked(GtkWidget * widget, gpointer user_data) respond = gtk_dialog_run((GtkDialog *) Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph], 2, 0); + do_graph_layout(view->g[view->activeGraph], GVK_TWOPI, 0); gtk_object_destroy((GtkObject *) Dlg); } @@ -149,7 +149,7 @@ void btn_circo_clicked(GtkWidget * widget, gpointer user_data) respond = gtk_dialog_run((GtkDialog *) Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph], 3, 0); + do_graph_layout(view->g[view->activeGraph], GVK_CIRCO, 0); gtk_object_destroy((GtkObject *) Dlg); } @@ -164,7 +164,7 @@ void btn_fdp_clicked(GtkWidget * widget, gpointer user_data) respond = gtk_dialog_run((GtkDialog *) Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph], 4, 0); + do_graph_layout(view->g[view->activeGraph], GVK_FDP, 0); gtk_object_destroy((GtkObject *) Dlg); diff --git a/cmd/smyrna/gui/gui.c b/cmd/smyrna/gui/gui.c index d14b69441..e2870f5c4 100755 --- a/cmd/smyrna/gui/gui.c +++ b/cmd/smyrna/gui/gui.c @@ -710,21 +710,21 @@ void load_attributes() break; case 4: if (strstr(ss, "ALL_ENGINES")) { - attr[attrcount].Engine[0] = 1; - attr[attrcount].Engine[1] = 1; - attr[attrcount].Engine[2] = 1; - attr[attrcount].Engine[3] = 1; - attr[attrcount].Engine[4] = 1; + attr[attrcount].Engine[GVK_DOT] = 1; + attr[attrcount].Engine[GVK_NEATO] = 1; + attr[attrcount].Engine[GVK_TWOPI] = 1; + attr[attrcount].Engine[GVK_CIRCO] = 1; + attr[attrcount].Engine[GVK_FDP] = 1; } else { - attr[attrcount].Engine[0] = + attr[attrcount].Engine[GVK_DOT] = strstr(ss, "DOT") ? 1 : 0; - attr[attrcount].Engine[1] = + attr[attrcount].Engine[GVK_NEATO] = strstr(ss, "NEATO") ? 1 : 0; - attr[attrcount].Engine[2] = + attr[attrcount].Engine[GVK_TWOPI] = strstr(ss, "TWOPI") ? 1 : 0; - attr[attrcount].Engine[3] = + attr[attrcount].Engine[GVK_CIRCO] = strstr(ss, "CIRCO") ? 1 : 0; - attr[attrcount].Engine[4] = + attr[attrcount].Engine[GVK_FDP] = strstr(ss, "FDP") ? 1 : 0; } break; diff --git a/cmd/smyrna/gui/menucallbacks.c b/cmd/smyrna/gui/menucallbacks.c index 0bf7d63a6..bb9dc8a37 100755 --- a/cmd/smyrna/gui/menucallbacks.c +++ b/cmd/smyrna/gui/menucallbacks.c @@ -267,7 +267,7 @@ void mDotSlot(GtkWidget * widget, gpointer user_data) respond = gtk_dialog_run((GtkDialog *) Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph], 0, 0); + do_graph_layout(view->g[view->activeGraph], GVK_DOT, 0); gtk_object_destroy((GtkObject *) Dlg); cursor = gdk_cursor_new(GDK_HAND2); @@ -286,7 +286,7 @@ void mNeatoSlot(GtkWidget * widget, gpointer user_data) "This will change the graph layout\n all your position changes will be lost\n Are you sure?"); respond = gtk_dialog_run((GtkDialog *) Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph], 1, 0); + do_graph_layout(view->g[view->activeGraph], GVK_NEATO, 0); gtk_object_destroy((GtkObject *) Dlg); } @@ -300,7 +300,7 @@ void mTwopiSlot(GtkWidget * widget, gpointer user_data) respond = gtk_dialog_run((GtkDialog *) Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph], 2, 0); + do_graph_layout(view->g[view->activeGraph], GVK_TWOPI, 0); gtk_object_destroy((GtkObject *) Dlg); } @@ -315,7 +315,7 @@ void mCircoSlot(GtkWidget * widget, gpointer user_data) respond = gtk_dialog_run((GtkDialog *) Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph], 3, 0); + do_graph_layout(view->g[view->activeGraph], GVK_CIRCO, 0); gtk_object_destroy((GtkObject *) Dlg); } @@ -330,7 +330,7 @@ void mFdpSlot(GtkWidget * widget, gpointer user_data) respond = gtk_dialog_run((GtkDialog *) Dlg); if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph], 4, 0); + do_graph_layout(view->g[view->activeGraph], GVK_FDP, 0); gtk_object_destroy((GtkObject *) Dlg); } diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h index b772201cb..bfae67373 100644 --- a/cmd/smyrna/smyrnadefs.h +++ b/cmd/smyrna/smyrnadefs.h @@ -168,6 +168,8 @@ typedef struct _attribute { } attribute; +typedef enum { GVK_DOT,GVK_NEATO,GVK_TWOPI,GVK_CIRCO,GVK_FDP } gvk_layout; + //bind this to cgraph g typedef struct _custom_graph_data { Agrec_t h; @@ -176,7 +178,7 @@ typedef struct _custom_graph_data { int AlwaysShow; //active or not draw it int TopView; //default 0, 1 for topview data, dots and lines int Locked; - int Engine; //enum GVEngine{DOT,NEATO,TWOPI,CIRCO,FDP}; + gvk_layout Engine; //graph's location, change these to move the whole graph int Modified; //if graph has been modified after loading float offsetx; @@ -192,10 +194,11 @@ typedef struct _custom_graph_data { int selectedEdgesCount; } custom_graph_data; +#define GD_Engine(g) (((custom_graph_data*)AGDATA(g))->Engine) +#define GD_GraphFileName(g) (((custom_graph_data*)AGDATA(g))->GraphFileName) +#define GD_Modified(g) (((custom_graph_data*)AGDATA(g))->Modified) - -enum GEunit { GEpixels, GEinches, GEmm }; - +typedef enum { GEpixels, GEinches, GEmm } GEunit; typedef struct _custom_object_data //has to be attached to every Node, Edge, Graph and cluster { @@ -308,7 +311,7 @@ typedef struct _ViewInfo float bdxRight,bdyBottom,bdzBottom; /*reserved , not being used yet*/ - enum GEunit unit; //default pixels :0 + GEunit unit; //default pixels :0 /*variable to hold mouse coordinates temporarily*/ float GLx,GLy,GLz; -- 2.50.0