From 6c4801cd3f1691446c4a9a85ef51b0caf478aa1d Mon Sep 17 00:00:00 2001 From: arif Date: Tue, 4 Mar 2008 17:54:53 +0000 Subject: [PATCH] *** empty log message *** --- cmd/smyrna/btree.c | 3 +-- cmd/smyrna/gui/callbacks.c | 9 +-------- cmd/smyrna/gui/datalistcallbacks.c | 5 ----- cmd/smyrna/gui/glmenu.c | 1 - cmd/smyrna/gui/gui.c | 16 +++++++--------- cmd/smyrna/gui/menucallbacks.c | 18 ++---------------- cmd/smyrna/gui/toolboxcallbacks.c | 14 ++++---------- cmd/smyrna/selection.h | 4 ++-- cmd/smyrna/topview.c | 21 ++++++++++----------- cmd/smyrna/topviewdata.c | 3 +-- cmd/smyrna/viewport.c | 18 +++++------------- cmd/smyrna/viewport.h | 1 + lib/cgraph/write.c | 6 ++++++ 13 files changed, 40 insertions(+), 79 deletions(-) diff --git a/cmd/smyrna/btree.c b/cmd/smyrna/btree.c index 2ec5598eb..4e198e253 100644 --- a/cmd/smyrna/btree.c +++ b/cmd/smyrna/btree.c @@ -15,7 +15,7 @@ **********************************************************/ #include "btree.h" -#include "regex.h" +#include "regex_win32.h" btree_node* new_node(char* attribute,char* regex, float min, float max) { btree_node* n; @@ -99,7 +99,6 @@ btree_node* look_up_node_with_string(btree_node* n,char* string_to_lookup) } int validate_lookup(btree_node* n,char* string_to_lookup) //it can be anything, in this case attr_name { - printf ("%s == %s\n",n->attr_name,string_to_lookup); if (strcmp(n->attr_name,string_to_lookup)==0) return 1; return 0; diff --git a/cmd/smyrna/gui/callbacks.c b/cmd/smyrna/gui/callbacks.c index b074ab997..a1d64bedc 100755 --- a/cmd/smyrna/gui/callbacks.c +++ b/cmd/smyrna/gui/callbacks.c @@ -216,13 +216,6 @@ on_newNode (GtkWidget *button, int* b; a=(int*) malloc (sizeof(int)); b=(int*) malloc (sizeof(int)); - if(gdk_gl_query_version(a,b)) - { - printf ("min ver:%i\n",a); - printf ("min ver:%i\n",b); - - - } } @@ -308,7 +301,7 @@ void frmObjectBtnOK_clicked (GtkWidget *widget,gpointer user_data) do_graph_layout(view->g[view->activeGraph],0,1); else { - set_update_required(&view->Topview); + set_update_required(view->Topview); deselect_all(view->g[view->activeGraph]); } diff --git a/cmd/smyrna/gui/datalistcallbacks.c b/cmd/smyrna/gui/datalistcallbacks.c index a61b21013..92fe78c3d 100755 --- a/cmd/smyrna/gui/datalistcallbacks.c +++ b/cmd/smyrna/gui/datalistcallbacks.c @@ -18,11 +18,9 @@ #include "tvnodes.h" void btnTVEdit_clicked_cb (GtkWidget *widget,gpointer user_data) { - printf("btnTVEdit_clicked_cb\n"); } void btnTVDelete_clicked_cb (GtkWidget *widget,gpointer user_data) { - printf("btnTVDelete_clicked_cb\n"); } void btnTVFilter_clicked_cb (GtkWidget *widget,gpointer user_data) { @@ -62,7 +60,6 @@ void btnTVGotopage_clicked_cb (GtkWidget *widget,gpointer user_data) } void btnTVCancel_clicked_cb (GtkWidget *widget,gpointer user_data) { - printf("btnTVCancel_clicked_cb\n"); } void btnTVOK_clicked_cb (GtkWidget *widget,gpointer user_data) { @@ -71,11 +68,9 @@ void btnTVOK_clicked_cb (GtkWidget *widget,gpointer user_data) } void btnTVReverse_clicked_cb (GtkWidget *widget,gpointer user_data) { - printf("btnTVEdit_clicked_cb\n"); } void cgbTVSelect_toggled_cb (GtkWidget *widget,gpointer user_data) { - printf("btnTVEdit_clicked_cb\n"); } diff --git a/cmd/smyrna/gui/glmenu.c b/cmd/smyrna/gui/glmenu.c index 14569d484..f944389c1 100644 --- a/cmd/smyrna/gui/glmenu.c +++ b/cmd/smyrna/gui/glmenu.c @@ -7,7 +7,6 @@ */ GtkWidget* create_popup_menu (GtkWidget* drawing_area) { - GtkWidget *shapes_menu; GtkWidget *actions_menu; GtkWidget *editing_menu; GtkWidget *menu; diff --git a/cmd/smyrna/gui/gui.c b/cmd/smyrna/gui/gui.c index 2d1e03a71..6160b53b6 100755 --- a/cmd/smyrna/gui/gui.c +++ b/cmd/smyrna/gui/gui.c @@ -30,6 +30,11 @@ static char guibuffer[255]; //general purpose buffer +#ifdef WIN32 +extern int strcasecmp(const char *s1, const char *s2); +extern int strncasecmp(const char *s1, const char *s2, unsigned int n); +#endif + GdkWindow* window1; GtkWidget *statusbar1; @@ -55,7 +60,6 @@ attribute attr[MAXIMUM_WIDGET_COUNT]; //call this function only ones void create_object_properties() { - char** testRows; char* data0="TEST0"; char* data1="TEST1"; char* data2="TEST2"; @@ -80,8 +84,6 @@ void create_object_properties() //call this after create_object_properties() void object_properties_node_init() { - GladeXML *xml; - GtkWidget *widget; } void object_properties_edge_init() //customize window for Edges @@ -295,10 +297,7 @@ int load_object_properties(int typeIndex,Agraph_t* g) //load from object to gui //load attr from first selected object GtkLayout* layout; GdkColor color; - FILE * file; char buf[100]; - char string [100]; - char *ss; int ind=0; int Y=45; int X=90; @@ -310,7 +309,6 @@ int load_object_properties(int typeIndex,Agraph_t* g) //load from object to gui void* obj; char line [ 128 ]; float a,b; - char* pch; layout=(GtkLayout*)glade_xml_get_widget(xml, "layout4"); frmObjectTypeIndex=typeIndex; frmObjectg=g; @@ -428,8 +426,8 @@ int load_object_properties(int typeIndex,Agraph_t* g) //load from object to gui ) { sprintf (line, "%s", agget(obj,"pos")); - a=atof(strtok (line,"," )); - b=atof(strtok (NULL,"," )); + a=(float)atof(strtok (line,"," )); + b=(float)atof(strtok (NULL,"," )); gtk_spin_button_set_value ((GtkSpinButton*)glade_xml_get_widget(xml,"frmObjectPosX"), a ); gtk_spin_button_set_value ((GtkSpinButton*)glade_xml_get_widget(xml,"frmObjectPosY"), b ); gtk_spin_button_set_value ((GtkSpinButton*)glade_xml_get_widget(xml,"frmObjectPosZ"), 0 ); diff --git a/cmd/smyrna/gui/menucallbacks.c b/cmd/smyrna/gui/menucallbacks.c index 92e20ce53..27cee7af9 100755 --- a/cmd/smyrna/gui/menucallbacks.c +++ b/cmd/smyrna/gui/menucallbacks.c @@ -17,12 +17,13 @@ #include "menucallbacks.h" #include "viewport.h" #include "tvnodes.h" +#include "selection.h" + //file char buf[255]; void mNewSlot (GtkWidget *widget,gpointer user_data) { - printf("mNewSlot \n"); } void mOpenSlot (GtkWidget *widget,gpointer user_data) @@ -30,7 +31,6 @@ void mNewSlot (GtkWidget *widget,gpointer user_data) GtkWidget *dialog; GtkFileFilter* filter; - printf("mOpenSlot \n"); filter=gtk_file_filter_new (); gtk_file_filter_add_pattern(filter,"*.dot"); @@ -65,7 +65,6 @@ void mNewSlot (GtkWidget *widget,gpointer user_data) } void mOptionsSlot (GtkWidget *widget,gpointer user_data) { - printf("mOptionsSlot\n"); } void mQuitSlot (GtkWidget *widget,gpointer user_data) @@ -108,22 +107,18 @@ void mNewSlot (GtkWidget *widget,gpointer user_data) //edit void mCutSlot (GtkWidget *widget,gpointer user_data) { - printf("mCutSlot\n"); } void mCopySlot (GtkWidget *widget,gpointer user_data) { - printf("mCopySlot\n"); } void mPasteSlot (GtkWidget *widget,gpointer user_data) { - printf("mPasteSlot\n"); } void mDeleteSlot (GtkWidget *widget,gpointer user_data) { - printf("mDeleteSlot\n"); } @@ -155,16 +150,13 @@ void mShowHostSelectionSlot(GtkWidget *widget,gpointer user_data) void mNewNodeSlot (GtkWidget *widget,gpointer user_data) { - printf("mNewNodeSlot\n"); } void mNewEdgeSlot (GtkWidget *widget,gpointer user_data) { - printf("mNewEdgeSlot\n"); } void mNewClusterSlot (GtkWidget *widget,gpointer user_data) { - printf("mNewClusterSlot\n"); } void mGraphPropertiesSlot (GtkWidget *widget,gpointer user_data) @@ -245,7 +237,6 @@ void mShowHostSelectionSlot(GtkWidget *widget,gpointer user_data) void mShowCodeSlot (GtkWidget *widget,gpointer user_data) { - printf("mShowCodeSlot\n"); } void mDotSlot (GtkWidget *widget,gpointer user_data) { @@ -372,27 +363,22 @@ void mUnselectAllClustersSlot(GtkWidget *widget,gpointer user_data) void mSingleSelectSlot(GtkWidget *widget,gpointer user_data) { - printf("mSingleSelectSlot\n"); } void mSelectAreaSlot(GtkWidget *widget,gpointer user_data) { - printf("mSelectAreaSlot\n"); } void mSelectAreaXSlot(GtkWidget *widget,gpointer user_data) { - printf("mSelectAreaXSlot\n"); } //help void mAbout(GtkWidget *widget,gpointer user_data) { - printf("mAbout\n"); } void mHelp(GtkWidget *widget,gpointer user_data) { - printf("mHelp\n"); } diff --git a/cmd/smyrna/gui/toolboxcallbacks.c b/cmd/smyrna/gui/toolboxcallbacks.c index acbb924d8..38212842a 100755 --- a/cmd/smyrna/gui/toolboxcallbacks.c +++ b/cmd/smyrna/gui/toolboxcallbacks.c @@ -16,6 +16,8 @@ #include "toolboxcallbacks.h" #include "viewport.h" +#include "selection.h" +#include "gltemplate.h" void btnToolSingleSelect_clicked(GtkWidget *widget,gpointer user_data) @@ -64,8 +66,8 @@ void btnToolZoomIn_clicked (GtkWidget *widget,gpointer use { view->zoom = view->zoom + ZOOM_STEP; if(view->zoom > MAX_ZOOM) - view->zoom=MAX_ZOOM; - expose_event (view->drawing_area,NULL,NULL); + view->zoom=(float)MAX_ZOOM; + glexpose(); } void btnToolZoomOut_clicked (GtkWidget *widget,gpointer user_data) @@ -77,7 +79,6 @@ void btnToolZoomOut_clicked (GtkWidget *widget,gpointer us } void btnToolFit_clicked (GtkWidget *widget,gpointer user_data) { - printf("btnToolFit_clicked\n"); } void btnToolMove_clicked (GtkWidget *widget,gpointer user_data) { @@ -85,26 +86,19 @@ void btnToolMove_clicked (GtkWidget *widget,gpointer user_ } void btnToolAddNode_clicked (GtkWidget *widget,gpointer user_data) { - printf("btnToolAddNode_clicked\n"); } void btnToolDeleteNode_clicked (GtkWidget *widget,gpointer user_data) { - printf("btnToolDeleteNode_clicked\n"); } void btnToolFindNode_clicked (GtkWidget *widget,gpointer user_data) { - printf("btnToolFindNode_clicked\n"); } void btnToolAddEdge_clicked (GtkWidget *widget,gpointer user_data) { - printf("btnToolAddEdge_clicked\n"); } void btnToolDeleteEdge_clicked (GtkWidget *widget,gpointer user_data) { - printf("btnToolDeleteEdge_clicked\n"); } void btnToolFindEdge_clicked (GtkWidget *widget,gpointer user_data) { - printf("btnToolFindEdge_clicked\n"); - printf("zoom :%f\n",view->zoom); } diff --git a/cmd/smyrna/selection.h b/cmd/smyrna/selection.h index 3ba50ca48..c1e052f21 100644 --- a/cmd/smyrna/selection.h +++ b/cmd/smyrna/selection.h @@ -53,7 +53,7 @@ int SelectImage(xdot_op* op); int spline_in_rect(xdot_op* op); int spline_x_rect(xdot_op* op); -int polygon_int_rect(xdot_op* op); +int polygon_in_rect(xdot_op* op); int polygon_x_rect(xdot_op* op); int polyline_in_rect(xdot_op* op); @@ -85,7 +85,7 @@ int select_all_graphs(Agraph_t* g); int deselect_all_nodes(Agraph_t* g); int deselect_all_edges(Agraph_t* g); -int deselect_all_gprahs(Agraph_t* g); +int deselect_all_graphs(Agraph_t* g); int select_all(Agraph_t* g); int deselect_all(Agraph_t* g); diff --git a/cmd/smyrna/topview.c b/cmd/smyrna/topview.c index 092ef3791..4875c1fdd 100755 --- a/cmd/smyrna/topview.c +++ b/cmd/smyrna/topview.c @@ -66,14 +66,19 @@ void preparetopview(Agraph_t *g,topview* t) t->Edges=NULL; t->Nodes=NULL; /*initialize node and edge array*/ - printf ("edge memory required %i \n",sizeof(topview_edge)*agnedges(g)); t->Edges=malloc(sizeof(topview_edge)*agnedges(g)); - if (t->Edges) - printf ("Edge malloc is ok\n"); + if (!t->Edges) + { + printf ("memory allocation problem\n"); + exit(1); + } t->Nodes=malloc(sizeof(topview_node)*agnnodes(g)); - if (t->Nodes) - printf ("Nodes malloc is ok\n"); + if (!t->Nodes) + { + printf ("memory allocation problem\n"); + exit(1); + } printf ("# of edges :%i\n",agnnodes(g)); printf ("# of edges :%i\n",agnedges(g)); @@ -475,7 +480,6 @@ int draw_topview_label(topview_node* v,float zdepth) else fontColorA ((float)log((double)v->degree+(double)1),view->penColor.G,view->penColor.B,1); -// printf("%f \n",view->penColor.A/log((float)v->degree)*-0.02*view->zoom); fontDrawString ((int)(v->distorted_x-ddx),(int)(v->distorted_y-ddy),v->Label,(int)(fs*5)); return 1; @@ -528,10 +532,6 @@ void set_boundries(topview* t) view->bdyBottom=bottom; view->bdzTop=0; view->bdzBottom=0; -/* printf("top view graph boundries\n"); - printf("------------------------\n"); - printf("lower left (%f,%f)\n",view->bdxLeft,view->bdyBottom); - printf("upper right(%f,%f)\n",view->bdxRight,view->bdyTop);*/ } @@ -846,7 +846,6 @@ double G(double x) void test_callback() { - printf ("test button click\n"); } void menu_click_control(void* p) { diff --git a/cmd/smyrna/topviewdata.c b/cmd/smyrna/topviewdata.c index d8024325d..9c6d3b38e 100644 --- a/cmd/smyrna/topviewdata.c +++ b/cmd/smyrna/topviewdata.c @@ -73,13 +73,12 @@ int load_host_buttons(topview* t,Agraph_t *g,glCompSet* s) sprintf(hostbtncolorG,"hostbtncolorG%i",i); sprintf(hostbtncolorB,"hostbtncolorB%i",i); sprintf(hostbtncolorA,"hostbtncolorA%i",i); - printf ("caption:%s regex:%s Color(%s,%s,%s,%s)\n", agget(g,hostbtncaption ), agget(g,hostbtnregex), agget(g,hostbtncolorR), agget(g,hostbtncolorG), agget(g,hostbtncolorB), - agget(g,hostbtncolorA)); + agget(g,hostbtncolorA); t->TopviewData->hostregex[i]=agget(g,hostbtnregex); b=glCompButtonNew((GLfloat)5,(GLfloat)7+((GLfloat)i+(GLfloat)1)*(GLfloat)36,(GLfloat)150,(GLfloat)35,agget(g,hostbtncaption ),'\0',0,0); diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c index 475b9eae2..306f31b84 100755 --- a/cmd/smyrna/viewport.c +++ b/cmd/smyrna/viewport.c @@ -24,6 +24,10 @@ #include #include "gui.h" #include "string.h" +#include "topview.h" +#include "gltemplate.h" +#include "colorprocs.h" + #define countof( array ) ( sizeof( array )/sizeof( array[0] ) ) @@ -223,7 +227,7 @@ void refreshControls(ViewInfo* v) } - expose_event (view->drawing_area,NULL,NULL); + glexpose(); @@ -489,7 +493,6 @@ int do_graph_layout(Agraph_t* graph,int Engine,int keeppos) //changes the layout } else { - printf("failed to read temp filen"); return 0; } @@ -515,13 +518,6 @@ Agraph_t* loadGraph(char* filename) g_print("Cannot open %s\n", filename); else if (g = agread(input_file,NIL(Agdisc_t*))) { - printf("%s has been loaded sucessfully\n",filename); - printf("Graph statistics\n"); - printf("----------------\n"); - printf("# of edges %i\n",agnnodes(g)); - printf("# of nodes %i\n",agnedges(g)); - printf("checking xdot data\n"); - printf("binding graph record\n"); attach_object_custom_data_to_graph(g); load_graph_params(g); @@ -560,7 +556,6 @@ Agraph_t* loadGraph(char* filename) ((custom_graph_data*)AGDATA(g))->GraphFileName=(char*)malloc((strlen(filename)+1)*sizeof(char)); //attaching rec for graph objects strcpy(((custom_graph_data*)AGDATA(g))->GraphFileName,filename); - printf("Topview:%s------",agget(g, "TopView")); /*if(strcasecmp(agget(g, "TopView"),"1")==0) { if( @@ -584,7 +579,6 @@ Agraph_t* loadGraph(char* filename) } else { - printf("failed to load %s\n",filename); return 0; } return 0; @@ -755,7 +749,6 @@ void move_node(void* obj,float dx,float dy) { //tokenize strcpy(buf,agget(obj, "pos")); - printf ("org pos: %s\n",buf); pch=strtok (buf,"," ); while (pch != NULL) @@ -768,7 +761,6 @@ void move_node(void* obj,float dx,float dy) i++; } buf2[strlen(buf2)-1]='\0'; - printf ("new pos: %s\n",buf2); agset(obj,"pos",buf2); } } diff --git a/cmd/smyrna/viewport.h b/cmd/smyrna/viewport.h index 84b333964..f20a1cf5d 100755 --- a/cmd/smyrna/viewport.h +++ b/cmd/smyrna/viewport.h @@ -60,4 +60,5 @@ void glexpose(); void move_nodes(Agraph_t* g); //move selected nodes //helper functions int SetGdkColor(GdkColor* c,char* color); +int init_object_custom_data(Agraph_t* graph,void* obj);//creates a custom_object_data #endif diff --git a/lib/cgraph/write.c b/lib/cgraph/write.c index c382d7e52..b18c0c5cb 100644 --- a/lib/cgraph/write.c +++ b/lib/cgraph/write.c @@ -21,6 +21,12 @@ #define EMPTY(s) ((s == 0) || (s)[0] == '\0') #define MAX(a,b) ((a)>(b)?(a):(b)) +#ifdef WIN32 +extern int strcasecmp(const char *s1, const char *s2); +extern int strncasecmp(const char *s1, const char *s2, unsigned int n); +#endif + + typedef void iochan_t; static void ioput(Agraph_t * g, iochan_t * ofile, char *str) -- 2.40.0