}
n->parent->childs=realloc(n->parent->childs,sizeof(btree_node*)*n->parent->child_count);
delete_node_recursive(n);
+ return 1;
}
btree_node* look_up_node_with_string(btree_node* n,char* string_to_lookup)
int print_tree(btree_node* root)
{
static rank=0;
- //printf("Node data:%s\n",
+ return 1;
}
int print_children(btree_node* n)
{
delete_node(kurbanlik);
print_children(root);
print_children(tree_from_filter_string("(()(())((())()))"));
+ return 1;
+
}
*/
#include "draw.h"
#include "topview.h"
-#include "color.h"
+#include "colorprocs.h"
#include "glutils.h"
#include "math.h"
+#include "selection.h"
+#include "xdot.h"
+#include "viewport.h"
//delta values
for (i=0; i < 360; i=i+1)
{
//convert degrees into radians
- float degInRad = i*DEG2RAD;
- glVertex2f(x+cos(degInRad)*xradius,y+sin(degInRad)*yradius);
+ float degInRad = (float)(i*DEG2RAD);
+ glVertex2f((GLfloat)(x+cos(degInRad)*xradius),(GLfloat)(y+sin(degInRad)*yradius));
}
glEnd();
}
void SetFont(xdot_op* op,int param)
{
// view->FontName=ABSet(op->u.font.name);
- view->FontSize=op->u.font.size;
+ view->FontSize=(int)op->u.font.size;
}
void InsertImage(xdot_op* op,int param)
SelectText(op);
set_options(op,param);
if (op->u.text.align == 1)
- x=(GLfloat)op->u.text.x-(GLfloat)op->u.text.width/2.0;
+ x=(GLfloat)op->u.text.x-(GLfloat)(op->u.text.width/2.0);
if (op->u.text.align == 0)
x=(GLfloat)op->u.text.x;
if (op->u.text.align == -1)
if((view->mouse.mouse_mode==MM_MAGNIFIER) && (view->mouse.mouse_down))
{
- GLfloat mg_x,mg_y,mg_z,mg_width,mg_height;
- float a;
- int winX,winY,winW,winH;
+ GLfloat mg_x,mg_y,mg_z;
//converting screen pixel distaances to GL distances
- view->mg.GLwidth=GetOGLDistance(view->mg.width)/2.0;
- view->mg.GLheight=GetOGLDistance(view->mg.height)/2.0;
+ view->mg.GLwidth=GetOGLDistance(view->mg.width)/(float)2.0;
+ view->mg.GLheight=GetOGLDistance(view->mg.height)/(float)2.0;
GetOGLPosRef(view->mouse.mouse_X,view->mouse.mouse_Y,&mg_x,&mg_y,&mg_z);//retrieving mouse coords as GL coordinates
view->mg.x=mg_x;
view->mg.y=mg_y;
glLineWidth(4);
- local_zoom(&view->Topview);
+ local_zoom(view->Topview);
//drawing the magnifier borders
glBegin(GL_LINE_STRIP);
glColor4f((GLfloat)0.3,(GLfloat)0.1,(GLfloat)0.8,(GLfloat)1);
if((view->mouse.mouse_mode==21) && (view->mouse.mouse_down))
{
float a;
- GLfloat mg_x,mg_y,mg_z,mg_width,mg_height;
+ GLfloat mg_x,mg_y,mg_z;
a=GetOGLDistance((int)250);
- view->fmg.R=a;
+ view->fmg.R=(int)a;
GetOGLPosRef(view->mouse.mouse_X,view->mouse.mouse_Y,&mg_x,&mg_y,&mg_z);
- glColor4f(0.3,0.1,0.8,1);
+ glColor4f((GLfloat)0.3,(GLfloat)0.1,(GLfloat)0.8,(GLfloat)1);
if ((view->fmg.x != mg_x) || (view->fmg.y != mg_y))
{
fisheye_polar(mg_x, mg_y,view->Topview);
vectorX1=originX;
glLineWidth(4);
glBegin(GL_LINE_STRIP);
- for(angle=0.0;angle<=(2.1*3.14159);angle+=0.1)
+ for(angle=(float)0.0;angle<=(float)(2.1*3.14159);angle+=(float)0.1)
{
- vectorX=originX+radius*sin(angle);
- vectorY=originY+radius*cos(angle);
+ vectorX=originX+radius*(float)sin(angle);
+ vectorY=originY+radius*(float)cos(angle);
glVertex2d(vectorX1,vectorY1);
vectorY1=vectorY;
vectorX1=vectorX;
{
if(view->bdVisible)
{
- glColor4f(0.8,0.1,0.1,1);
+ glColor4f((float)0.8,(float)0.1,(float)0.1,(float)1);
glLineWidth(2);
glBegin(GL_LINE_STRIP);
glVertex2d(view->bdxLeft,view->bdyBottom);
view->Selection.Active=0;
drawGraph(g);
view->SignalBlock=1;
- expose_event (view->drawing_area,NULL,NULL);
+ glexpose();
view->SignalBlock=0;
}
{
float R,B,G;
float add;
- R=(float)(rand() % 255) / 255.0;
- G=(float)(rand() % 255) / 255.0;
- B=(float)(rand() % 255) / 255.0;
+ R=(float)(rand() % 255) / (float)255.0;
+ G=(float)(rand() % 255) / (float)255.0;
+ B=(float)(rand() % 255) / (float)255.0;
add=(brightness-(R+G+B))/3;
R = R;
G = G;
c->R=R;
c->G=G;
c->B=B;
+ return 1;
}
{
int i;
if(radius <0.3)
- radius=0.4;
+ radius=(float)0.4;
glBegin(GL_POLYGON);
for (i=0; i < 360; i=i+10)
{
- float degInRad = i*DEG2RAD;
- glVertex3f(x+cos(degInRad)*radius,y+sin(degInRad)*radius,zdepth);
+ float degInRad = (float)(i*DEG2RAD);
+ glVertex3f((GLfloat)(x+cos(degInRad)*radius),(GLfloat)(y+sin(degInRad)*radius),(GLfloat)zdepth);
}
glEnd();
RGBColor c;
if(color != '\0')
{
+
colorxlate(color, &cl, RGBA_DOUBLE);
c.R=(float)cl.u.RGBA[0];
c.G=(float)cl.u.RGBA[1];
#include <string.h>
#include <math.h>
-#define Z_MIDDLE_PLANE -0.00200
-#define Z_BACK_PLANE -0.00201
-#define Z_FORWARD_PLANE -0.00199
/*DRAWING FUNCTIONS
these are opengl based xdot drawing functions
int clear_filter(tv_filter* f)
{
delete_node(f->root);
+ return 1;
}
int init_filters(tv_filters* filters)
{
filters->filter_count=0;
filters->filters=0;
+ return 1;
+
}
int add_filter_to_filters(tv_filters* filters,tv_filter* filter)
{
filters->filters=realloc(filters->filters,sizeof(tv_filter*)*(filters->filter_count+1));
filters->filters[filters->filter_count]=filter;
filters->filter_count++;
+ return 1;
+
}
int clear_filters(tv_filters* filters)
{
free(filters->filters[ind]);
}
filters->filter_count=0;
+ return 1;
+
}
int union_filter(tv_filter* f1,tv_filter* f2)
{
+ return 1;
}
-int intersect_filter(tv_filter* f1,tv_filter* f2);
+int intersect_filter(tv_filter* f1,tv_filter* f2)
+{
+ return 1;
+
+}
#include "glexpose.h"
#include "draw.h"
#include "topview.h"
+#include "glutils.h"
+#include "topview.h"
/*
refreshes camera settings using view parameters such as pan zoom etc
params:ViewInfo , global view variable defined in viewport.c
{
if(view->graphCount)
{
- if(glCompSetClick(view->Topview->topviewmenu,event->x,event->y))
+ if(glCompSetClick(view->Topview->topviewmenu,(int)event->x,(int)event->y))
expose_event (view->drawing_area,NULL,NULL);
}
- begin_x = event->x;
- begin_y = event->y;
+ begin_x = (float)event->x;
+ begin_y = (float)event->y;
if(event->button==1) //left click
{
view->mouse.mouse_down=1;
- if(GetOGLPosRef(begin_x,begin_y,&(view->GLx),&(view->GLy),&(view->GLz)))
+ if(GetOGLPosRef((int)begin_x,(int)begin_y,&(view->GLx),&(view->GLy),&(view->GLz)))
{
if (view->mouse.mouse_mode == MM_SINGLE_SELECT) //single select
{
{
if(event->button==1) //left click release
{
- if(glCompSetRelease(view->Topview->topviewmenu,event->x_root,event->y_root))
+ if(glCompSetRelease(view->Topview->topviewmenu,(int)event->x_root,(int)event->y_root))
expose_event (view->drawing_area,NULL,NULL);
view->mouse.mouse_down=0;
*/
static gboolean motion_notify_event (GtkWidget* widget,GdkEventMotion *event,gpointer data)
{
- float w = widget->allocation.width;
- float h = widget->allocation.height;
- float x = event->x;
- float y = event->y;
+ float w = (float)widget->allocation.width;
+ float h = (float)widget->allocation.height;
+ float x = (float)event->x;
+ float y = (float)event->y;
char buf[50];
if ((event->state & GDK_BUTTON1_MASK) && (view->mouse.mouse_mode==MM_PAN))
{
float a,b;
- a=view->panx-dx*pow(view->zoom*-1,(1/1));
- b=(view->bdxRight-view->bdxLeft)/2.0;
+ a=view->panx-dx*(float)pow(view->zoom*-1,(1/1));
+ b=(view->bdxRight-view->bdxLeft)/(float)2.0;
if (ABS(a) < ABS(b))
view->panx=a;
else
- view->panx=(view->bdxRight-view->bdxLeft)/2.0*ABS(a)/a;
- a=view->pany+dy*pow(view->zoom*-1,(1/1));
- b=(view->bdyTop-view->bdyBottom)/2.0;
+ view->panx=(view->bdxRight-view->bdxLeft)/(float)2.0*ABS(a)/a;
+ a=view->pany+dy*(float)(pow(view->zoom*-1,(1/1)));
+ b=(view->bdyTop-view->bdyBottom)/(float)2.0;
if (ABS(a) < ABS(b))
view->pany=a;
else
- view->pany=(view->bdyTop-view->bdyBottom)/2.0*ABS(a)/a;
+ view->pany=(view->bdyTop-view->bdyBottom)/(float)2.0*ABS(a)/a;
redraw = TRUE;
}
/*zooming*/
float x;
view->zoom=view->zoom+dx/10*(view->zoom*-1/20);
if(view->zoom > MAX_ZOOM)
- view->zoom=MAX_ZOOM;
+ view->zoom=(float)MAX_ZOOM;
if(view->zoom < MIN_ZOOM)
- view->zoom=MIN_ZOOM;
+ view->zoom=(float)MIN_ZOOM;
/*set label to new zoom value*/
- x=(100.0-1.0)*(view->zoom-MIN_ZOOM)/(MAX_ZOOM-MIN_ZOOM)+1;
+ x=((float)100.0-(float)1.0)*(view->zoom-(float)MIN_ZOOM)/((float)MAX_ZOOM-(float)MIN_ZOOM)+(float)1.0;
sprintf(buf,"%i",(int)x);
glCompLabelSetText((glCompLabel*)view->Topview->customptr,buf);
redraw = TRUE;
if ((event->state & GDK_BUTTON1_MASK) && ((view->mouse.mouse_mode==MM_MAGNIFIER)
||(view->mouse.mouse_mode==MM_FISHEYE_MAGNIFIER) ))
{
- view->mouse.mouse_X=x;
- view->mouse.mouse_Y=y;
+ view->mouse.mouse_X=(int)x;
+ view->mouse.mouse_Y=(int)y;
redraw = TRUE;
}
#include <gtk/gtk.h>
#include "callbacks.h"
#include "viewport.h"
+#include "topview.h"
+#include "selection.h"
+
GTK_BUTTONS_YES_NO,
"This will change the graph layout\n all your position changes will be lost\n Are you sure?");
- respond=gtk_dialog_run (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
if (respond == GTK_RESPONSE_YES)
do_graph_layout(view->g[view->activeGraph],0,0);
- gtk_object_destroy (Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
cursor = gdk_cursor_new(GDK_HAND2);
- w=glade_xml_get_widget(xml, "frmMain");
+ w=(GdkWindow*)glade_xml_get_widget(xml, "frmMain");
// gdk_window_set_cursor(w, cursor);
gdk_window_set_cursor ((GTK_WIDGET(view->drawing_area)->window), cursor);
// gdk_window_set_title((GTK_WIDGET(widget)->window),"adasdasdasdassada");
gpointer user_data)
{
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*) gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
"This will change the graph layout\n all your position changes will be lost\n Are you sure?");
- respond=gtk_dialog_run (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
if (respond == GTK_RESPONSE_YES)
do_graph_layout(view->g[view->activeGraph],1,0);
- gtk_object_destroy (Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
gtk_button_set_image(GTK_BUTTON(glade_xml_get_widget(xml, "btn_neato")), gtk_image_new_from_file("c:\fonts.png"));
}
gpointer user_data)
{
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
"This will change the graph layout\n all your position changes will be lost\n Are you sure?");
- respond=gtk_dialog_run (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
if (respond == GTK_RESPONSE_YES)
do_graph_layout(view->g[view->activeGraph],2,0);
- gtk_object_destroy (Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
}
gpointer user_data)
{
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
"This will change the graph layout\n all your position changes will be lost\n Are you sure?");
- respond=gtk_dialog_run (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
if (respond == GTK_RESPONSE_YES)
do_graph_layout(view->g[view->activeGraph],3,0);
- gtk_object_destroy (Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
}
void
{
int ind=0;
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
"This will change the graph layout\n all your position changes will be lost\n Are you sure?");
- respond=gtk_dialog_run (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
if (respond == GTK_RESPONSE_YES)
do_graph_layout(view->g[view->activeGraph],4,0);
- gtk_object_destroy (Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
}
if(!view->SignalBlock)
{
- active_graph=gtk_combo_box_get_active(widget);
+ active_graph=gtk_combo_box_get_active((GtkComboBox*)widget);
if (active_graph > -1)
{
GTK_RESPONSE_HELP = -11 */
if(update_graph_properties(view->g[view->activeGraph]))
- gtk_dialog_response(glade_xml_get_widget(xml, "dlgOpenGraph"),GTK_RESPONSE_OK);
+ gtk_dialog_response((GtkDialog*)glade_xml_get_widget(xml, "dlgOpenGraph"),GTK_RESPONSE_OK);
}
//dlgOpenGraph btncancelclicked
void on_dlgOpenGraph_btncancel_clicked (GtkWidget *widget,
gpointer user_data)
{
- gtk_dialog_response(glade_xml_get_widget(xml, "dlgOpenGraph"),GTK_RESPONSE_CANCEL);
+ gtk_dialog_response((GtkDialog*)glade_xml_get_widget(xml, "dlgOpenGraph"),GTK_RESPONSE_CANCEL);
}
void btnTVFilter_clicked_cb (GtkWidget *widget,gpointer user_data)
{
int respond;
- int selected,visible,highlighted;
// gtk_dialog_set_response_sensitive (glade_xml_get_widget(xml, "dlgOpenGraph"),1,1);
// gtk_dialog_set_response_sensitive (glade_xml_get_widget(xml, "dlgOpenGraph"),2,1);
- respond=gtk_dialog_run (glade_xml_get_widget(xml, "dlgTVFilter"));
+ respond=gtk_dialog_run ((GtkDialog*)glade_xml_get_widget(xml, "dlgTVFilter"));
// respond=gtk_dialog_run (glade_xml_get_widget(xml, "dlgFilters"));
gtk_widget_hide(glade_xml_get_widget(xml, "dlgTVFilter"));
if(respond == 1)
{
GtkSpinButton* spn;
int p;
- spn=glade_xml_get_widget(xml, "spnTVGotopage");
+ spn=(GtkSpinButton*)glade_xml_get_widget(xml, "spnTVGotopage");
p=gtk_spin_button_get_value_as_int(spn);
tv_nodes_goto_page(p-1);
}
GTK_RESPONSE_APPLY = -10,
GTK_RESPONSE_HELP = -11 */
- gtk_dialog_response(glade_xml_get_widget(xml, "dlgTVFilter"),GTK_RESPONSE_OK);
+ gtk_dialog_response((GtkDialog*)glade_xml_get_widget(xml, "dlgTVFilter"),GTK_RESPONSE_OK);
}
void btnTVFilterClear_clicked_cb (GtkWidget *widget,gpointer user_data)
{
- gtk_entry_set_text (glade_xml_get_widget(xml,"edtTVFilterMinData1"),"" );
- gtk_entry_set_text ( glade_xml_get_widget(xml,"edtTVFilterMaxData1"),"" );
- gtk_entry_set_text ( glade_xml_get_widget(xml,"edtTVFilterMinData2"),"" );
- gtk_entry_set_text ( glade_xml_get_widget(xml,"edtTVFilterMaxData2"),"" );
- gtk_entry_set_text ( glade_xml_get_widget(xml,"edtTVFilterString"),"" );
+ gtk_entry_set_text ((GtkEntry*)glade_xml_get_widget(xml,"edtTVFilterMinData1"),"" );
+ gtk_entry_set_text ((GtkEntry*) glade_xml_get_widget(xml,"edtTVFilterMaxData1"),"" );
+ gtk_entry_set_text ((GtkEntry*) glade_xml_get_widget(xml,"edtTVFilterMinData2"),"" );
+ gtk_entry_set_text ((GtkEntry*) glade_xml_get_widget(xml,"edtTVFilterMaxData2"),"" );
+ gtk_entry_set_text ((GtkEntry*) glade_xml_get_widget(xml,"edtTVFilterString"),"" );
- gtk_toggle_button_set_active(glade_xml_get_widget(xml,"rbTVFilterHigh1"),1);
- gtk_toggle_button_set_active(glade_xml_get_widget(xml,"rbTVFilterSel1"),1);
- gtk_toggle_button_set_active(glade_xml_get_widget(xml,"rbTVFilterVisible1"),1);
+ gtk_toggle_button_set_active((GtkToggleButton*)glade_xml_get_widget(xml,"rbTVFilterHigh1"),1);
+ gtk_toggle_button_set_active((GtkToggleButton*)glade_xml_get_widget(xml,"rbTVFilterSel1"),1);
+ gtk_toggle_button_set_active((GtkToggleButton*)glade_xml_get_widget(xml,"rbTVFilterVisible1"),1);
apply_filter_from_gui();
}
xml = glade_xml_new(SMYRNA_GLADE, NULL, NULL);
widget = glade_xml_get_widget(xml, "listPoints");
- gtk_clist_set_column_title (widget,0,"Def");
- gtk_clist_set_column_title (widget,1,"x");
- gtk_clist_set_column_title (widget,2,"y");
- gtk_clist_set_column_title (widget,3,"z");
- gtk_clist_column_titles_show(widget);
+ gtk_clist_set_column_title ((GtkCList*)widget,0,"Def");
+ gtk_clist_set_column_title ((GtkCList*)widget,1,"x");
+ gtk_clist_set_column_title ((GtkCList*)widget,2,"y");
+ gtk_clist_set_column_title ((GtkCList*)widget,3,"z");
+ gtk_clist_column_titles_show((GtkCList*)widget);
gtk_widget_show (widget);
widget = glade_xml_get_widget(xml, "win");
gtk_widget_show (widget);
if(newgraph)
{
gladewidget = glade_xml_get_widget(xml, "entryGraphName");
- gtk_entry_set_text (gladewidget,"Untitled");
+ gtk_entry_set_text ((GtkEntry*)gladewidget,"Untitled");
gladewidget = glade_xml_get_widget(xml, "entryGraphFileName");
- gtk_entry_set_text (gladewidget,"Untitled.dot");
+ gtk_entry_set_text ((GtkEntry*)gladewidget,"Untitled.dot");
}
else
{
gladewidget = glade_xml_get_widget(xml, "entryGraphName");
- gtk_entry_set_text (gladewidget,"");
+ gtk_entry_set_text ((GtkEntry*)gladewidget,"");
gladewidget = glade_xml_get_widget(xml, "entryGraphFileName");
- gtk_entry_set_text (gladewidget,"");
+ gtk_entry_set_text ((GtkEntry*)gladewidget,"");
}
gladewidget = glade_xml_get_widget(xml, "dlgOpenGraph");
result = gtk_dialog_run (GTK_DIALOG (gladewidget));
if (!cbSelectGraph)
{
- cb=gtk_combo_box_new_text();
- gtk_widget_show (cb);
+ cb=(GtkComboBox*)gtk_combo_box_new_text();
+ gtk_widget_show ((GtkWidget*)cb);
gladewidget = glade_xml_get_widget(xml, "layout6");
- gtk_box_pack_start (GTK_BOX (gladewidget), cb, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (gladewidget),(GtkWidget*) cb, FALSE, FALSE, 0);
- gtk_layout_put (gladewidget,cb,780,3);
+ gtk_layout_put ((GtkLayout*)gladewidget,(GtkWidget*)cb,780,3);
//signal
g_signal_connect ((gpointer) cb, "changed", G_CALLBACK(graph_select_change),
NULL);
void load_graph_properties(Agraph_t* graph)
{
//dlgOpenGraph , GtkDialog
- gtk_entry_set_text(glade_xml_get_widget(xml, "entryGraphName"),((custom_graph_data*)AGDATA(graph))->GraphName);
- gtk_entry_set_text(glade_xml_get_widget(xml, "entryGraphFileName"),((custom_graph_data*)AGDATA(graph))->GraphFileName);
+ gtk_entry_set_text((GtkEntry*)glade_xml_get_widget(xml, "entryGraphName"),((custom_graph_data*)AGDATA(graph))->GraphName);
+ gtk_entry_set_text((GtkEntry*)glade_xml_get_widget(xml, "entryGraphFileName"),((custom_graph_data*)AGDATA(graph))->GraphFileName);
- gtk_combo_box_set_active (glade_xml_get_widget(xml, "cbLayout"),((custom_graph_data*)AGDATA(graph))->Engine);
- gtk_toggle_button_set_active(glade_xml_get_widget(xml, "chkVisible"),((custom_graph_data*)AGDATA(graph))->AlwaysShow);
- gtk_toggle_button_set_active(glade_xml_get_widget(xml, "chkLocked"),((custom_graph_data*)AGDATA(graph))->Locked);
- gtk_toggle_button_set_active(glade_xml_get_widget(xml, "chkTopView"),((custom_graph_data*)AGDATA(graph))->TopView);
+ gtk_combo_box_set_active ((GtkComboBox*)glade_xml_get_widget(xml, "cbLayout"),((custom_graph_data*)AGDATA(graph))->Engine);
+ gtk_toggle_button_set_active((GtkToggleButton*)glade_xml_get_widget(xml, "chkVisible"),((custom_graph_data*)AGDATA(graph))->AlwaysShow);
+ gtk_toggle_button_set_active((GtkToggleButton*)glade_xml_get_widget(xml, "chkLocked"),((custom_graph_data*)AGDATA(graph))->Locked);
+ gtk_toggle_button_set_active((GtkToggleButton*)glade_xml_get_widget(xml, "chkTopView"),((custom_graph_data*)AGDATA(graph))->TopView);
}
int update_graph_properties(Agraph_t* graph) //updates graph from gui
{
if (graph != view->g[id])
{
- if(strcasecmp (gtk_entry_get_text(glade_xml_get_widget(xml, "entryGraphName")),((custom_graph_data*)AGDATA(view->g[id]))->GraphName ) == 0)
+ if(strcasecmp (gtk_entry_get_text((GtkEntry*)glade_xml_get_widget(xml, "entryGraphName")),((custom_graph_data*)AGDATA(view->g[id]))->GraphName ) == 0)
{
- Dlg=gtk_message_dialog_new (NULL,
+ Dlg=(GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_OK,
"There is another graph with this name!");
- respond=gtk_dialog_run (Dlg);
- gtk_object_destroy (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
return 0;
}
}
//check if file is changed
- if (strcasecmp (gtk_entry_get_text(glade_xml_get_widget(xml, "entryGraphFileName")),((custom_graph_data*)AGDATA(graph))->GraphFileName ) != 0)
+ if (strcasecmp (gtk_entry_get_text((GtkEntry*)glade_xml_get_widget(xml, "entryGraphFileName")),((custom_graph_data*)AGDATA(graph))->GraphFileName ) != 0)
{
- if (file = fopen(gtk_entry_get_text(glade_xml_get_widget(xml, "entryGraphFileName")), "r"))
+ if (file = fopen(gtk_entry_get_text((GtkEntry*)glade_xml_get_widget(xml, "entryGraphFileName")), "r"))
{
fclose(file);
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
"File name you have entered already exists\n,this will cause overwriting on existing file.\nAre you sure?");
- respond=gtk_dialog_run (Dlg);
- gtk_object_destroy (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
if (respond==GTK_RESPONSE_NO)
return 0;
}
//now check if filename is legal, try to open it to write
- if (file = fopen(gtk_entry_get_text(glade_xml_get_widget(xml, "entryGraphFileName")), "w"))
+ if (file = fopen(gtk_entry_get_text((GtkEntry*)glade_xml_get_widget(xml, "entryGraphFileName")), "w"))
fclose(file);
else
{
- Dlg=gtk_message_dialog_new (NULL,
+ Dlg=(GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_OK,
"File name is invalid or I/O error!");
- respond=gtk_dialog_run (Dlg);
- gtk_object_destroy (Dlg);
+
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
+ GTK_DIALOG (Dlg);
return 0;
}
- ((custom_graph_data*)AGDATA(graph))->GraphName=gtk_entry_get_text(glade_xml_get_widget(xml, "entryGraphName"));
- ((custom_graph_data*)AGDATA(graph))->GraphFileName=gtk_entry_get_text(glade_xml_get_widget(xml, "entryGraphFileName"));
+ ((custom_graph_data*)AGDATA(graph))->GraphName=(char*)gtk_entry_get_text((GtkEntry*)glade_xml_get_widget(xml, "entryGraphName"));
+ ((custom_graph_data*)AGDATA(graph))->GraphFileName=(char*)gtk_entry_get_text((GtkEntry*)glade_xml_get_widget(xml, "entryGraphFileName"));
- ((custom_graph_data*)AGDATA(graph))->AlwaysShow=gtk_toggle_button_get_active(glade_xml_get_widget(xml, "chkVisible"));
- ((custom_graph_data*)AGDATA(graph))->Locked=gtk_toggle_button_get_active(glade_xml_get_widget(xml, "chkLocked"));
- ((custom_graph_data*)AGDATA(graph))->TopView=gtk_toggle_button_get_active(glade_xml_get_widget(xml, "chkTopView"));
+ ((custom_graph_data*)AGDATA(graph))->AlwaysShow=gtk_toggle_button_get_active((GtkToggleButton*)glade_xml_get_widget(xml, "chkVisible"));
+ ((custom_graph_data*)AGDATA(graph))->Locked=gtk_toggle_button_get_active((GtkToggleButton*)glade_xml_get_widget(xml, "chkLocked"));
+ ((custom_graph_data*)AGDATA(graph))->TopView=gtk_toggle_button_get_active((GtkToggleButton*)glade_xml_get_widget(xml, "chkTopView"));
//check if the engine has been changed, if so do new layout
- if( ((custom_graph_data*)AGDATA(graph))->Engine != gtk_combo_box_get_active (glade_xml_get_widget(xml, "cbLayout")) )
+ if( ((custom_graph_data*)AGDATA(graph))->Engine != gtk_combo_box_get_active ((GtkComboBox*)glade_xml_get_widget(xml, "cbLayout")) )
{
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
"You have changed the layout of the graph,this will change the graph layout\n all your position changes will be lost\n Are you sure?");
- respond=gtk_dialog_run (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
if (respond == GTK_RESPONSE_YES)
- do_graph_layout(graph,gtk_combo_box_get_active (glade_xml_get_widget(xml, "cbLayout")),0);
- gtk_object_destroy (Dlg);
+ do_graph_layout(graph,gtk_combo_box_get_active ((GtkComboBox*)glade_xml_get_widget(xml, "cbLayout")),0);
+ gtk_object_destroy ((GtkObject*)Dlg);
}
return 1;
}
char line [ 128 ];
float a,b;
char* pch;
- layout=glade_xml_get_widget(xml, "layout4");
+ layout=(GtkLayout*)glade_xml_get_widget(xml, "layout4");
frmObjectTypeIndex=typeIndex;
frmObjectg=g;
widgetcounter=0;
{
case 'F': //float
AttrWidgets[widgetcounter]=gtk_spin_button_new_with_range(0,100,0.001);
- g_signal_connect ((gpointer) AttrWidgets[widgetcounter], "value-changed", G_CALLBACK(attr_widgets_modifiedSlot),widgetcounter);
+ g_signal_connect ((gpointer) AttrWidgets[widgetcounter], "value-changed", G_CALLBACK(attr_widgets_modifiedSlot),(gpointer)widgetcounter);
break;
case 'C': //color box
AttrWidgets[widgetcounter]=gtk_color_button_new();
gtk_widget_set_size_request(AttrWidgets[widgetcounter],50,23);
- g_signal_connect ((gpointer) AttrWidgets[widgetcounter], "color-set", G_CALLBACK(attr_widgets_modifiedSlot),widgetcounter);
+ g_signal_connect ((gpointer) AttrWidgets[widgetcounter], "color-set", G_CALLBACK(attr_widgets_modifiedSlot),(gpointer)widgetcounter);
break;
default: //alphanumreric GTK Entry
AttrWidgets[widgetcounter]=gtk_entry_new();
gtk_widget_set_size_request(AttrWidgets[widgetcounter],130,23);
- g_signal_connect ((gpointer) AttrWidgets[widgetcounter], "changed", G_CALLBACK(attr_widgets_modifiedSlot),widgetcounter);
+ g_signal_connect ((gpointer) AttrWidgets[widgetcounter], "changed", G_CALLBACK(attr_widgets_modifiedSlot),(gpointer)widgetcounter);
break;
}
{
case 'F':
if (agget(obj, attr[widgetcounter].Name))
- gtk_spin_button_set_value (AttrWidgets[widgetcounter],atof(agget(obj, attr[widgetcounter].Name)) );
+ gtk_spin_button_set_value ((GtkSpinButton*)AttrWidgets[widgetcounter],atof(agget(obj, attr[widgetcounter].Name)) );
else
- gtk_spin_button_set_value (AttrWidgets[widgetcounter],atof(attr[widgetcounter].Default) );
+ gtk_spin_button_set_value ((GtkSpinButton*)AttrWidgets[widgetcounter],atof(attr[widgetcounter].Default) );
break;
case 'C':
if (agget(obj, attr[widgetcounter].Name))
else
SetGdkColor(&color,attr[widgetcounter].Default);
- gtk_color_button_set_color(AttrWidgets[widgetcounter],&color);
+ gtk_color_button_set_color((GtkColorButton*)AttrWidgets[widgetcounter],&color);
break;
default:
if (agget(obj, attr[widgetcounter].Name))
- gtk_entry_set_text(AttrWidgets[widgetcounter],agget(obj, attr[widgetcounter].Name));
+ gtk_entry_set_text((GtkEntry*)AttrWidgets[widgetcounter],agget(obj, attr[widgetcounter].Name));
else
- gtk_entry_set_text(AttrWidgets[widgetcounter],attr[widgetcounter].Default);
+ gtk_entry_set_text((GtkEntry*)AttrWidgets[widgetcounter],attr[widgetcounter].Default);
}
gtk_widget_show(AttrWidgets[widgetcounter]);
//first part, common attributes
sprintf (buf, "%i", ((custom_object_data*)AGDATA(obj))->ID);
- gtk_entry_set_text(glade_xml_get_widget(xml, "objEntryName"),((custom_object_data*)AGDATA(obj))->ObjName);
- gtk_entry_set_text(glade_xml_get_widget(xml, "objEntryLabel"),agnameof(obj));
+ gtk_entry_set_text((GtkEntry*)glade_xml_get_widget(xml, "objEntryName"),((custom_object_data*)AGDATA(obj))->ObjName);
+ gtk_entry_set_text((GtkEntry*)glade_xml_get_widget(xml, "objEntryLabel"),agnameof(obj));
- gtk_toggle_button_set_active(glade_xml_get_widget(xml, "frmObjectchkVisible"),((custom_object_data*)AGDATA(obj))->Visible);
- gtk_toggle_button_set_active(glade_xml_get_widget(xml, "frmObjectchkLocked"),((custom_object_data*)AGDATA(obj))->Locked);
- gtk_toggle_button_set_active(glade_xml_get_widget(xml, "frmObjectchkHighlighted"),((custom_object_data*)AGDATA(obj))->Highlighted);
+ gtk_toggle_button_set_active((GtkToggleButton*)glade_xml_get_widget(xml, "frmObjectchkVisible"),((custom_object_data*)AGDATA(obj))->Visible);
+ gtk_toggle_button_set_active((GtkToggleButton*)glade_xml_get_widget(xml, "frmObjectchkLocked"),((custom_object_data*)AGDATA(obj))->Locked);
+ gtk_toggle_button_set_active((GtkToggleButton*)glade_xml_get_widget(xml, "frmObjectchkHighlighted"),((custom_object_data*)AGDATA(obj))->Highlighted);
//get the position info // show only one item is selected
if (
( (((custom_graph_data*)AGDATA(g))->selectedNodesCount == 1) && (typeIndex==2) )
sprintf (line, "%s", agget(obj,"pos"));
a=atof(strtok (line,"," ));
b=atof(strtok (NULL,"," ));
- gtk_spin_button_set_value (glade_xml_get_widget(xml,"frmObjectPosX"), a );
- gtk_spin_button_set_value (glade_xml_get_widget(xml,"frmObjectPosY"), b );
- gtk_spin_button_set_value (glade_xml_get_widget(xml,"frmObjectPosZ"), 0 );
+ 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 );
gtk_widget_show (glade_xml_get_widget(xml,"frmObjectPosX"));
gtk_widget_show (glade_xml_get_widget(xml,"frmObjectPosY"));
gtk_widget_show (glade_xml_get_widget(xml,"frmObjectPosZ"));
gtk_widget_show (glade_xml_get_widget(xml,"frmObjectlabel3"));
- gtk_label_set_text( glade_xml_get_widget(xml,"frmObjectPosLabelX"),"X:");
+ gtk_label_set_text( (GtkLabel*)glade_xml_get_widget(xml,"frmObjectPosLabelX"),"X:");
}
else
switch (typeIndex) //typeindex 0 means new object
{
case 1: //graph sub graph (cluster)
- gtk_label_set_text(glade_xml_get_widget(xml,"frmObjectPosLabelX"),"Changes that you make will be applied to all selected Clusters1");
+ gtk_label_set_text((GtkLabel*)glade_xml_get_widget(xml,"frmObjectPosLabelX"),"Changes that you make will be applied to all selected Clusters1");
break;
case 2: //Node
- gtk_label_set_text(glade_xml_get_widget(xml,"frmObjectPosLabelX"),"Changes that you make will be applied to all selected Nodes!");
+ gtk_label_set_text((GtkLabel*)glade_xml_get_widget(xml,"frmObjectPosLabelX"),"Changes that you make will be applied to all selected Nodes!");
break;
case 3: //Edge
- gtk_label_set_text(glade_xml_get_widget(xml,"frmObjectPosLabelX"),"Changes that you make will be applied to all selected Edges!");
+ gtk_label_set_text((GtkLabel*)glade_xml_get_widget(xml,"frmObjectPosLabelX"),"Changes that you make will be applied to all selected Edges!");
break;
}
}
switch(att->Type)
{
case 'F':
- sprintf(guibuffer,"%f",gtk_spin_button_get_value(att->attrWidget));
+ sprintf(guibuffer,"%f",gtk_spin_button_get_value((GtkSpinButton*)att->attrWidget));
return guibuffer;
break;
case 'C':
- gtk_color_button_get_color(att->attrWidget,&color);
+ gtk_color_button_get_color((GtkColorButton*)att->attrWidget,&color);
sprintf(guibuffer,"#%x%x%x",color.red/255,color.green/255,color.blue/255);
return guibuffer;
break;
default:
- strcpy(guibuffer,gtk_entry_get_text(att->attrWidget));
+ strcpy(guibuffer,gtk_entry_get_text((GtkEntry*)att->attrWidget));
return guibuffer;
}
}
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
- gtk_file_chooser_set_filter(dialog,filter);
+ gtk_file_chooser_set_filter((GtkFileChooser*)dialog,filter);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
{
char *filename;
}
gtk_widget_destroy (dialog);
- gtk_widget_destroy (filter);
+ gtk_widget_destroy ((GtkWidget*)filter);
}
void mSaveSlot (GtkWidget *widget,gpointer user_data)
{
if(((custom_graph_data*)AGDATA(view->g[view->activeGraph]))->Modified)
{
sprintf(buf,"graph %s has been modified \n , would you like to save it before quitting the the program?",((custom_graph_data*)AGDATA(view->g[view->activeGraph]))->GraphName);
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
buf);
- gtk_dialog_add_button (Dlg,"YES",100);
- gtk_dialog_add_button (Dlg,"NO",101);
- gtk_dialog_add_button (Dlg,"Cancel",102);
+ gtk_dialog_add_button ((GtkDialog*)Dlg,"YES",100);
+ gtk_dialog_add_button ((GtkDialog*)Dlg,"NO",101);
+ gtk_dialog_add_button ((GtkDialog*)Dlg,"Cancel",102);
- respond=gtk_dialog_run (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
if (respond == 100) //save and continue
{
if(!save_graph())
gtk_widget_hide(glade_xml_get_widget(xml, "frmToolBox"));
gtk_widget_show(glade_xml_get_widget(xml, "frmToolBox"));
- gtk_window_set_keep_above (glade_xml_get_widget(xml, "frmToolBox"),1);
+ gtk_window_set_keep_above ((GtkWindow*)glade_xml_get_widget(xml, "frmToolBox"),1);
}
void mShowHostSelectionSlot(GtkWidget *widget,gpointer user_data)
gtk_widget_hide(glade_xml_get_widget(xml, "frmHostSelection"));
gtk_widget_show(glade_xml_get_widget(xml, "frmHostSelection"));
- gtk_window_set_keep_above (glade_xml_get_widget(xml, "frmHostSelection"),1);
+ gtk_window_set_keep_above ((GtkWindow*)glade_xml_get_widget(xml, "frmHostSelection"),1);
}
if(view->activeGraph > -1)
{
load_graph_properties(view->g[view->activeGraph]);//load from graph to gui
- gtk_dialog_set_response_sensitive (glade_xml_get_widget(xml, "dlgOpenGraph"),1,1);
- gtk_dialog_set_response_sensitive (glade_xml_get_widget(xml, "dlgOpenGraph"),2,1);
- respond=gtk_dialog_run (glade_xml_get_widget(xml, "dlgOpenGraph"));
+ gtk_dialog_set_response_sensitive ((GtkDialog*)glade_xml_get_widget(xml, "dlgOpenGraph"),1,1);
+ gtk_dialog_set_response_sensitive ((GtkDialog*)glade_xml_get_widget(xml, "dlgOpenGraph"),2,1);
+ respond=gtk_dialog_run ((GtkDialog*)glade_xml_get_widget(xml, "dlgOpenGraph"));
//need to hide the dialog , again freaking GTK!!!!
gtk_widget_hide(glade_xml_get_widget(xml, "dlgOpenGraph"));
}
}
else
{
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_OK,
"You need to select some clusters first!");
- respond=gtk_dialog_run (Dlg);
- gtk_widget_hide(Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
+ gtk_widget_hide((GtkWidget*)Dlg);
}
}
}
else
{
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_OK,
"You need to select some nodes first!");
- respond=gtk_dialog_run (Dlg);
- gtk_widget_hide(Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
+ gtk_widget_hide((GtkWidget*)Dlg);
}
}
}
else
{
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg =(GtkMessageDialog*) gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_OK,
"You need to select some Edges first!");
- respond=gtk_dialog_run (Dlg);
- gtk_widget_hide(Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
+ gtk_widget_hide((GtkWidget*)Dlg);
}
}
{
GdkCursor* cursor;
GdkWindow* w;
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
"This will change the graph layout\n all your position changes will be lost\n Are you sure?");
- respond=gtk_dialog_run (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
if (respond == GTK_RESPONSE_YES)
do_graph_layout(view->g[view->activeGraph],0,0);
- gtk_object_destroy (Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
cursor = gdk_cursor_new(GDK_HAND2);
- w=glade_xml_get_widget(xml, "frmMain");
- gdk_window_set_cursor ((GTK_WIDGET(view->drawing_area)->window), cursor);
+ w=(GdkWindow*)glade_xml_get_widget(xml, "frmMain");
+ gdk_window_set_cursor ((GdkWindow*)view->drawing_area->window, cursor);
gdk_cursor_destroy(cursor);
}
void mNeatoSlot (GtkWidget *widget,gpointer user_data)
{
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
"This will change the graph layout\n all your position changes will be lost\n Are you sure?");
- respond=gtk_dialog_run (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
if (respond == GTK_RESPONSE_YES)
do_graph_layout(view->g[view->activeGraph],1,0);
- gtk_object_destroy (Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
}
void mTwopiSlot (GtkWidget *widget,gpointer user_data)
{
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
"This will change the graph layout\n all your position changes will be lost\n Are you sure?");
- respond=gtk_dialog_run (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
if (respond == GTK_RESPONSE_YES)
do_graph_layout(view->g[view->activeGraph],2,0);
- gtk_object_destroy (Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
}
void mCircoSlot (GtkWidget *widget,gpointer user_data)
{
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
"This will change the graph layout\n all your position changes will be lost\n Are you sure?");
- respond=gtk_dialog_run (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
if (respond == GTK_RESPONSE_YES)
do_graph_layout(view->g[view->activeGraph],3,0);
- gtk_object_destroy (Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
}
void mFdpSlot (GtkWidget *widget,gpointer user_data)
{
int ind=0;
- Dlg = gtk_message_dialog_new (NULL,
+ Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
"This will change the graph layout\n all your position changes will be lost\n Are you sure?");
- respond=gtk_dialog_run (Dlg);
+ respond=gtk_dialog_run ((GtkDialog*)Dlg);
if (respond == GTK_RESPONSE_YES)
do_graph_layout(view->g[view->activeGraph],4,0);
- gtk_object_destroy (Dlg);
+ gtk_object_destroy ((GtkObject*)Dlg);
}
//select
#include "gui.h"
#include "viewport.h"
#include "menucallbacks.h"
+#include "gltemplate.h"
gchar *package_prefix ;
gchar *package_data_dir;
}
x=X1;
//iter
- iter=RW/SELECTION_SEGMENT_DIVIDER;
+ iter=RW/(float)SELECTION_SEGMENT_DIVIDER;
m=(Y2-Y1)/(X2-X1);
in=1;
default:
return 0;
}
+ return 1;
}
default:
return 0;
}
+ return 1;
}
int SelectPolyline(xdot_op* op)
return 0;
}
-
+ return 1;
}
int SelectEllipse(xdot_op* op)
default:
return 0;
}
+ return 1;
}
default:
return 0;
}
-
+ return 1;
}
default:
return 0;
}
-
+ return 1;
}
int spline_in_rect(xdot_op* op)
{
//JUST SEND ALL CONTROL POINTS IN 3D ARRAYS
- GLfloat tempX[4];
- GLfloat tempY[4];
- GLfloat tempZ[4];
+ float tempX[4];
+ float tempY[4];
+ float tempZ[4];
int temp=0;
int i=0;
for (i=0;i < op->u.bezier.cnt ; i= i + 1)
{
if(!within_bezier(tempX,tempY,tempZ,0))
return 0;
- tempX[0]=op->u.bezier.pts[i-1].x;
- tempY[0]=op->u.bezier.pts[i-1].y;
- tempZ[0]=op->u.bezier.pts[i-1].z;
+ tempX[0]=(float)op->u.bezier.pts[i-1].x;
+ tempY[0]=(float)op->u.bezier.pts[i-1].y;
+ tempZ[0]=(float)op->u.bezier.pts[i-1].z;
temp=1;
- tempX[temp]=op->u.bezier.pts[i].x;
- tempY[temp]=op->u.bezier.pts[i].y;
- tempZ[temp]=op->u.bezier.pts[i].z;
+ tempX[temp]=(float)op->u.bezier.pts[i].x;
+ tempY[temp]=(float)op->u.bezier.pts[i].y;
+ tempZ[temp]=(float)op->u.bezier.pts[i].z;
temp=temp+1;
}
else
{
- tempX[temp]=op->u.bezier.pts[i].x;
- tempY[temp]=op->u.bezier.pts[i].y;
- tempZ[temp]=op->u.bezier.pts[i].z;
+ tempX[temp]=(float)op->u.bezier.pts[i].x;
+ tempY[temp]=(float)op->u.bezier.pts[i].y;
+ tempZ[temp]=(float)op->u.bezier.pts[i].z;
temp=temp+1;
}
}
int spline_x_rect(xdot_op* op)
{
//JUST SEND ALL CONTROL POINTS IN 3D ARRAYS
- GLfloat tempX[4];
- GLfloat tempY[4];
- GLfloat tempZ[4];
+ float tempX[4];
+ float tempY[4];
+ float tempZ[4];
int temp=0;
int i=0;
for (i=0;i < op->u.bezier.cnt ; i= i + 1)
{
if(within_bezier(tempX,tempY,tempZ,1))
return 1;
- tempX[0]=op->u.bezier.pts[i-1].x;
- tempY[0]=op->u.bezier.pts[i-1].y;
- tempZ[0]=op->u.bezier.pts[i-1].z;
+ tempX[0]=(float)op->u.bezier.pts[i-1].x;
+ tempY[0]=(float)op->u.bezier.pts[i-1].y;
+ tempZ[0]=(float)op->u.bezier.pts[i-1].z;
temp=1;
- tempX[temp]=op->u.bezier.pts[i].x;
- tempY[temp]=op->u.bezier.pts[i].y;
- tempZ[temp]=op->u.bezier.pts[i].z;
+ tempX[temp]=(float)op->u.bezier.pts[i].x;
+ tempY[temp]=(float)op->u.bezier.pts[i].y;
+ tempZ[temp]=(float)op->u.bezier.pts[i].z;
temp=temp+1;
}
else
{
- tempX[temp]=op->u.bezier.pts[i].x;
- tempY[temp]=op->u.bezier.pts[i].y;
- tempZ[temp]=op->u.bezier.pts[i].z;
+ tempX[temp]=(float)op->u.bezier.pts[i].x;
+ tempY[temp]=(float)op->u.bezier.pts[i].y;
+ tempZ[temp]=(float)op->u.bezier.pts[i].z;
temp=temp+1;
}
}
int ind=0;
for (ind=0;ind < op->u.polygon.cnt-1;ind ++)
{
- if( lineintersects(op->u.polygon.pts[ind].x,op->u.polygon.pts[ind+1].x,op->u.polygon.pts[ind].y,op->u.polygon.pts[ind+1].y)!=1)
+ if( lineintersects((float)op->u.polygon.pts[ind].x,(float)op->u.polygon.pts[ind+1].x,(float)op->u.polygon.pts[ind].y,(float)op->u.polygon.pts[ind+1].y)!=1)
return 0;
};
return 1;
int ind=0;
for (ind=0;ind < op->u.polygon.cnt-1;ind ++)
{
- if( lineintersects(op->u.polygon.pts[ind].x,op->u.polygon.pts[ind+1].x,op->u.polygon.pts[ind].y,op->u.polygon.pts[ind+1].y)>=0)
+ if( lineintersects((float)op->u.polygon.pts[ind].x,(float)op->u.polygon.pts[ind+1].x,(float)op->u.polygon.pts[ind].y,(float)op->u.polygon.pts[ind+1].y)>=0)
return 1;
};
return 0;
int ind=0;
for (ind=0;ind < op->u.polygon.cnt-1;ind ++)
{
- if( lineintersects(op->u.polygon.pts[ind].x,op->u.polygon.pts[ind+1].x,op->u.polygon.pts[ind].y,op->u.polygon.pts[ind+1].y)!=1)
+ if( lineintersects((float)op->u.polygon.pts[ind].x,(float)op->u.polygon.pts[ind+1].x,(float)op->u.polygon.pts[ind].y,(float)op->u.polygon.pts[ind+1].y)!=1)
return 0;
};
return 1;
int ind=0;
for (ind=0;ind < op->u.polygon.cnt-1;ind ++)
{
- if( lineintersects(op->u.polygon.pts[ind].x,op->u.polygon.pts[ind+1].x,op->u.polygon.pts[ind].y,op->u.polygon.pts[ind+1].y)>=1)
+ if( lineintersects((float)op->u.polygon.pts[ind].x,(float)op->u.polygon.pts[ind+1].x,(float)op->u.polygon.pts[ind].y,(float)op->u.polygon.pts[ind+1].y)>=1)
return 1;
};
return 0;
}
int text_in_rect(xdot_op* op)
{
- if( rectintersects(op->u.text.x,op->u.text.y,op->u.text.x+op->u.text.width,op->u.text.y+op->u.text.size)==1 )
+ if( rectintersects((float)op->u.text.x,(float)op->u.text.y,(float)op->u.text.x+op->u.text.width,(float)op->u.text.y+(float)op->u.text.size)==1 )
return 1;
return 0;
}
int text_x_rect(xdot_op* op)
{
- if( rectintersects(op->u.text.x,op->u.text.y,op->u.text.x+op->u.text.width,op->u.text.y+op->u.text.size)>=1 )
+ if( rectintersects((float)op->u.text.x,(float)op->u.text.y,(float)op->u.text.x+op->u.text.width,(float)op->u.text.y+(float)op->u.text.size)>=1 )
return 1;
return 0;
}
int image_in_rect(xdot_op* op)
{
- if( rectintersects(op->u.image.pos.x ,op->u.image.pos.y,op->u.image.pos.w,op->u.image.pos.h)==1)
+ if( rectintersects((float)op->u.image.pos.x ,(float)op->u.image.pos.y,(float)op->u.image.pos.w,(float)op->u.image.pos.h)==1)
return 1;
return 0;
}
int image_x_rect(xdot_op* op)
{
- if( rectintersects(op->u.image.pos.x ,op->u.image.pos.y,op->u.image.pos.w,op->u.image.pos.h)>=0)
+ if( rectintersects((float)op->u.image.pos.x ,(float)op->u.image.pos.y,(float)op->u.image.pos.w,(float)op->u.image.pos.h)>=0)
return 1;
return 0;
}
Z = Az*a*a*a + Bz*3*a*a*b + Cz*3*a*b*b + Dz*b*b*b;
if (i>0)
{
- if(lineintersects(Xprev,X,Yprev,Y) >=0) //intersection
+ if(lineintersects((float)Xprev,(float)X,(float)Yprev,(float)Y) >=0) //intersection
{
if(isx)
return 1;
}
- if(!(lineintersects(Xprev,X,Yprev,Y)==1)) //withing the rect
+ if(!(lineintersects((float)Xprev,(float)X,(float)Yprev,(float)Y)==1)) //withing the rect
{
if(!isx)
return 0;
int ellipse_x_rect(xdot_op* op)
{
- GLfloat x,y,xradius,yradius;
+ float x,y,xradius,yradius;
double Xprev;
double Yprev;
double Zprev;
int i=0;
- x=op->u.ellipse.x;
- y=op->u.ellipse.y;
- xradius=(GLfloat)op->u.ellipse.w;
- yradius=(GLfloat)op->u.ellipse.h;
+ x=(float)op->u.ellipse.x;
+ y=(float)op->u.ellipse.y;
+ xradius=(float)op->u.ellipse.w;
+ yradius=(float)op->u.ellipse.h;
for (i=0; i < 360; i=i+1)
{
//convert degrees into radians
- float degInRad = i*DEG2RAD;
+ float degInRad = i*(float)DEG2RAD;
if (i>0)
{
- if(lineintersects(Xprev,x+cos(degInRad)*xradius,Yprev,y+sin(degInRad)*yradius) >=0) //intersection
+ if(lineintersects((float)Xprev,x+(float)cos(degInRad)*xradius,(float)Yprev,y+(float)sin(degInRad)*yradius) >=0) //intersection
return 1;
}
int ellipse_in_rect(xdot_op* op)
{
- GLfloat x,y,xradius,yradius;
+ float x,y,xradius,yradius;
double Xprev;
double Yprev;
double Zprev;
int i=0;
- x=op->u.ellipse.x;
- y=op->u.ellipse.y;
- xradius=(GLfloat)op->u.ellipse.w;
- yradius=(GLfloat)op->u.ellipse.h;
+ x=(float)op->u.ellipse.x;
+ y=(float)op->u.ellipse.y;
+ xradius=(float)op->u.ellipse.w;
+ yradius=(float)op->u.ellipse.h;
for (i=0; i < 360; i=i+1)
{
//convert degrees into radians
- float degInRad = i*DEG2RAD;
+ float degInRad = (float)i*(float)DEG2RAD;
if (i>0)
{
- if(!(lineintersects(Xprev,x+cos(degInRad)*xradius,Yprev,y+sin(degInRad)*yradius)==1)) //withing the rect
+ if(!(lineintersects((float)Xprev,(float)x+(float)cos(degInRad)*xradius,(float)Yprev,y+(float)sin(degInRad)*yradius)==1)) //withing the rect
return 0;
}
float dx,dy,ex,ey,ea,eb,px,py ;
float a;
- ex=op->u.ellipse.x;
- ey=op->u.ellipse.y;
- ea=op->u.ellipse.w;
- eb=op->u.ellipse.h;
- px=view->Selection.X+SINGLE_SELECTION_WIDTH/2;
- py=view->Selection.Y+SINGLE_SELECTION_WIDTH/2;
+ ex=(float)op->u.ellipse.x;
+ ey=(float)op->u.ellipse.y;
+ ea=(float)op->u.ellipse.w;
+ eb=(float)op->u.ellipse.h;
+ px=view->Selection.X+(float)SINGLE_SELECTION_WIDTH/(float)2;
+ py=view->Selection.Y+(float)SINGLE_SELECTION_WIDTH/(float)2;
dx = px - ex;
dy = py - ey;
a=(dx*dx)/(ea*ea) + (dy*dy)/(eb*eb);
((custom_graph_data*)AGDATA(g))->selectedNodes[((custom_graph_data*)AGDATA(g))->selectedNodesCount]=N;
((custom_graph_data*)AGDATA(g))->selectedNodesCount++;
((custom_object_data*)AGDATA(N))->Selected=1;
- printf("Node Selecteed \n");
+ return 1;
}
int select_edge(Agraph_t* g,Agedge_t* E)
{
((custom_graph_data*)AGDATA(g))->selectedEdges[((custom_graph_data*)AGDATA(g))->selectedEdgesCount]=E;
((custom_graph_data*)AGDATA(g))->selectedEdgesCount++;
((custom_object_data*)AGDATA(E))->Selected=1;
+ return 1;
}
int select_object (Agraph_t* g,void* obj)
default:
break;
}
+ return 1;
}
int deselect_object (Agraph_t* g,void* obj)
{
default:
break;
}
+ return 1;
}
//select functions
((custom_graph_data*)AGDATA(g))->selectedGraphs[((custom_graph_data*)AGDATA(g))->selectedGraphsCount]=G;
((custom_graph_data*)AGDATA(g))->selectedGraphsCount++;
((custom_object_data*)AGDATA(G))->Selected=1;
+ return 1;
}
int deselect_node(Agraph_t* g,Agnode_t* N)
{
((custom_object_data*)AGDATA(N))->Selected=0;
((custom_object_data*)AGDATA(N))->selectionflag=0;
}
-
+ return 1;
}
int deselect_edge(Agraph_t* g,Agedge_t* E)
((custom_object_data*)AGDATA(E))->selectionflag=0;
}
+ return 1;
}
int deselect_graph(Agraph_t* g,Agraph_t* G)
{
((custom_object_data*)AGDATA(G))->selectionflag=0;
}
+ return 1;
}
int select_all_nodes(Agraph_t* g)
if(intersect (pA, pB, pC, pD, &pX))
{
- *X=pX.x;
- *Y=pX.y;
+ *X=(float)pX.x;
+ *Y=(float)pX.y;
if ( (pX.x >=x[2]-0.01) && (pX.x <x[3]+0.01) &&
(pX.y >=y[2]-0.01) && (pX.x <y[3]+0.01))
{
int polyline_in_rect(xdot_op* op);
int polyline_x_rect(xdot_op* op);
+
int text_in_rect(xdot_op* op);
int text_x_rect(xdot_op* op);
#include "viewport.h"
#include "draw.h"
#include "selection.h"
+#include "topviewdata.h"
static float dx=0.0;
static float dy=0.0;
char* d_attr1;
char* d_attr2;
float a,b,c;
- char* pch;
Agnode_t *v;
Agedge_t *e;
Agsym_t *sym;
- GtkTreeIter iter;
int ind,ind2,data_type_count; //number of columns for custom view->Topview data ,IP ,HOST, etc
char buf[256];
ind=0;ind2=0;
strcpy(buf,agget(v, "pos"));
if(strlen(buf))
{
- a=atof(strtok (buf,"," ));
- b=atof(strtok (NULL,"," ));
+ a=(float)atof(strtok (buf,"," ));
+ b=(float)atof(strtok (NULL,"," ));
str=strtok (NULL,"," );
if(str)
- c=atof(str);
+ c=(float)atof(str);
else
- c=0.0;
+ c=(float)0.0;
}
/*initialize group index, -1 means no group*/
t->Nodes[ind].GroupIndex=-1;
t->Nodes[ind].distorted_y=b;
t->Nodes[ind].zoom_factor=1;
t->Nodes[ind].degree=agdegree(g,v,1,1);
- t->Nodes[ind].node_alpha=log((float)t->Nodes[ind].degree+0.3);
+ t->Nodes[ind].node_alpha=(float)log((double)t->Nodes[ind].degree+(double)0.3);
if(d_attr1)
{
if (sym)
strcpy(buf,agget(aghead(e), "pos"));
if(strlen(buf))
{
- a=atof(strtok (buf,"," ));
- b=atof(strtok (NULL,"," ));
+ a=(float)atof(strtok (buf,"," ));
+ b=(float)atof(strtok (NULL,"," ));
str=strtok (NULL,"," );
if(str)
- c=atof(str);
+ c=(float)atof(str);
else
- c=0.0;
+ c=(float)0.0;
t->Edges[ind2].x1=a;
t->Edges[ind2].y1=b;
strcpy(buf,agget(agtail(e), "pos"));
if(strlen(buf))
{
- a=atof(strtok (buf,"," ));
- b=atof(strtok (NULL,"," ));
+ a=(float)atof(strtok (buf,"," ));
+ b=(float)atof(strtok (NULL,"," ));
str=strtok (NULL,"," );
if(str)
- c=atof(str);
+ c=(float)atof(str);
else
- c=0.0;
+ c=(float)0.0;
t->Edges[ind2].x2=a;
t->Edges[ind2].y2=b;
t->Edges[ind2].z2=c;
}
void drawTopViewGraph(Agraph_t *g)
{
- RGBColor c;
// DWORD t1,t2;
topview_node *v;
topview_edge *e;
float ddx,ddy;
float dddx,dddy;
int ind=0;
- char buf[50];
- GLfloat a,b;
if(view->zoom > NODE_ZOOM_LIMIT)
{
glPointSize(15/view->zoom*-1);
}
if (v->distorted_x!=v->x)
- zdepth=Z_FORWARD_PLANE;
+ zdepth=(float)Z_FORWARD_PLANE;
else
- zdepth=Z_BACK_PLANE;
+ zdepth=(float)Z_BACK_PLANE;
if(view->zoom < NODE_CIRCLE_LIMIT)
glVertex3f(v->distorted_x-ddx,v->distorted_y-ddy,zdepth);
else
//zdepth
if (e->Node1->distorted_x!=e->Node1->x)
- zdepth1=Z_FORWARD_PLANE;
+ zdepth1=(float)Z_FORWARD_PLANE;
else
- zdepth1=Z_BACK_PLANE;
+ zdepth1=(float)Z_BACK_PLANE;
if (e->Node2->distorted_x!=e->Node2->x)
- zdepth2=Z_FORWARD_PLANE;
+ zdepth2=(float)Z_FORWARD_PLANE;
else
- zdepth2=Z_BACK_PLANE;
+ zdepth2=(float)Z_BACK_PLANE;
if(get_color_from_edge(e))
view->Selection.Active=0;
drawTopViewGraph(g);
view->SignalBlock=1;
- expose_event (view->drawing_area,NULL,NULL);
+ glexpose();
view->SignalBlock=0;
}
}
}
+ return 1;
}
int select_topview_edge(topview_edge *e)
{
}
break;
-/* case 1:
- case 2:
- if(view->Selection.Anti==0)
- {
- select_object (view->g[view->activeGraph],n->Node);
- view->Selection.AlreadySelected=1;
- }
- else
- {
- deselect_object (view->g[view->activeGraph],n->Node);
- view->Selection.AlreadySelected=1;
- }
- break;*/
-
}
}
+ return 1;
-
-/* else if (view->Selection.Type==0)
- {
- deselect_object (view->g[view->activeGraph],n->Node);
- view->Selection.AlreadySelected=1;
- } */
}
int update_topview_node_from_cgraph(topview_node* Node)
{
Node->Color.A=view->penColor.A;
}*/
Node->update_required=0;
+ return 1;
}
int update_topview_edge_from_cgraph(topview_edge* Edge)
{
Edge->Color.A=view->penColor.A;
}
Edge->update_required=0;
+ return 1;
}
int set_update_required(topview* t)
{
int i=0;
- char buf[124];
int ilimit;
ilimit= (t->Nodecount > t->Edgecount) ? t->Nodecount : t->Edgecount;
if( t->Edgecount > i)
t->Edges[i].update_required=1;
}
+ return 1;
}
if((v->distorted_x > view->clipX1) && (v->distorted_x < view->clipX2) &&(v->distorted_y > view->clipY1)&&(v->distorted_y < view->clipY2))
{
- fs=(v->degree==1) ?log((double)v->degree+1)*7:log((double)v->degree+0.5)*7;
+ fs=(v->degree==1) ?(float)(log((double)v->degree+1)*(double)7):(float)(log((double)v->degree+(double)0.5)*(double)7);
fs=fs*v->zoom_factor;
/* if(fs > 12)
fs=24;*/
ddx=dx;ddy=dy;
}
- fontSize (fs);
+ fontSize ((int)fs);
if ((log((float)v->degree)*-0.6*view->zoom) >0)
- fontColorA (log((double)v->degree+1),view->penColor.G,view->penColor.B,view->penColor.A/log((float)v->degree)*-0.6*view->zoom);
+ fontColorA ((float)log((double)v->degree+(double)1),view->penColor.G,view->penColor.B,view->penColor.A/(float)log((double)v->degree)*(float)-0.6*(float)view->zoom);
else
- fontColorA (log((double)v->degree+1),view->penColor.G,view->penColor.B,1);
+ 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 (v->distorted_x-ddx,v->distorted_y-ddy,v->Label,fs*5);
+ fontDrawString ((int)(v->distorted_x-ddx),(int)(v->distorted_y-ddy),v->Label,(int)(fs*5));
return 1;
}
char* color_string;
int return_value=0;
float Alpha=0;
- GtkHScale* AlphaScale=glade_xml_get_widget(xml, "frmHostAlphaScale");
- Alpha=gtk_range_get_value((GtkRange*) AlphaScale);
+ GtkHScale* AlphaScale=(GtkHScale*)glade_xml_get_widget(xml, "frmHostAlphaScale");
+ Alpha=(float)gtk_range_get_value((GtkRange*) AlphaScale);
//check visibility;
if( (node_visible(e->Node1->Node))
if (view->Topview->TopviewData->hostactive[e->Node1->GroupIndex]==1)
{
gtk_color_button_get_color(view->Topview->TopviewData->gtkhostcolor[e->Node1->GroupIndex],&color);
- glColor4f(color.red/65535.0,color.green/65535.0,color.blue/65535.0,1);
+ glColor4f((GLfloat)color.red/(GLfloat)65535.0,(GLfloat)color.green/(GLfloat)65535.0,(GLfloat)color.blue/(GLfloat)65535.0,(GLfloat)1);
return return_value;
}else
{
if (view->Topview->TopviewData->hostactive[e->Node2->GroupIndex]==1)
{
gtk_color_button_get_color(view->Topview->TopviewData->gtkhostcolor[e->Node2->GroupIndex],&color);
- glColor4f(color.red/65535.0,color.green/65535.0,color.blue/65535.0,1);
+ glColor4f((GLfloat)color.red/(GLfloat)65535.0,(GLfloat)color.green/(GLfloat)65535.0,(GLfloat)color.blue/(GLfloat)65535.0,(GLfloat)1);
return return_value;
}
}
v->y=v->y-dy;
}
}
+ return 1;
}
int validate_group_node(tv_node* TV_Node,char* regex_string)
{
btree_node* n=0;
- char* data_attr1;
- char* data_attr2;
- char* data1;
- char* data2;
// n=tree_from_filter_string("([IP=\"^10.*\",min=\"0\",max=\"0\"])");
int valid=0;
n=tree_from_filter_string(regex_string);
void
on_host_alpha_change (GtkWidget *widget,gpointer user_data)
{
- expose_event (view->drawing_area,NULL,NULL);
+ glexpose();
}
void local_zoom(topview* t)
dely=t->Nodes[i].y-view->mg.y;
tempx=view->mg.x+delx*view->mg.kts;
tempy=view->mg.y+dely*view->mg.kts;
- if(is_point_in_rectangle(tempx,tempy,view->mg.x-view->mg.GLwidth,view->mg.y-view->mg.GLheight,
- view->mg.GLwidth*2,view->mg.GLheight*2))
+ if(is_point_in_rectangle((GLfloat)tempx,(GLfloat)tempy,view->mg.x-view->mg.GLwidth,view->mg.y-view->mg.GLheight,
+ view->mg.GLwidth*(GLfloat)2,view->mg.GLheight*(GLfloat)2))
{
- t->Nodes[i].distorted_x=view->mg.x+delx*view->mg.kts;
- t->Nodes[i].distorted_y=view->mg.y+dely*view->mg.kts;
+ t->Nodes[i].distorted_x=view->mg.x+(GLfloat)delx*view->mg.kts;
+ t->Nodes[i].distorted_y=view->mg.y+(GLfloat)dely*view->mg.kts;
t->Nodes[i].zoom_factor=view->mg.kts;
}
else//get intersections and move nodes to edges of magnifier box
range=0;
for (i=1; i< t->Nodecount; i++)
{
- if(point_within_ellips_with_coords(x_focus,y_focus,view->fmg.R,view->fmg.R,t->Nodes[i].x,t->Nodes[i].y))
+ if(point_within_ellips_with_coords((float)x_focus,(float)y_focus,(float)view->fmg.R,(float)view->fmg.R,t->Nodes[i].x,t->Nodes[i].y))
{
range = MAX(range,dist(t->Nodes[i].x,t->Nodes[i].y, x_focus, y_focus));
}
for (i=1; i< t->Nodecount; i++)
{
- if(point_within_ellips_with_coords(x_focus,y_focus,view->fmg.R,view->fmg.R,t->Nodes[i].x,t->Nodes[i].y))
+ if(point_within_ellips_with_coords((float)x_focus,(float)y_focus,(float)view->fmg.R,(float)view->fmg.R,t->Nodes[i].x,t->Nodes[i].y))
{
distance = dist(t->Nodes[i].x, t->Nodes[i].y, x_focus, y_focus);
distorted_distance = G(distance/range)*range;
else {
ratio = 0;
}
- t->Nodes[i].distorted_x = x_focus +(t->Nodes[i].x-x_focus)*ratio;
- t->Nodes[i].distorted_y = y_focus + (t->Nodes[i].y-y_focus)*ratio;
- t->Nodes[i].zoom_factor=1*distorted_distance/distance;
+ t->Nodes[i].distorted_x = (float)x_focus +(t->Nodes[i].x-(float)x_focus)*(float)ratio;
+ t->Nodes[i].distorted_y = (float)y_focus + (t->Nodes[i].y-(float)y_focus)*(float)ratio;
+ t->Nodes[i].zoom_factor=(float)1*(float)distorted_distance/(float)distance;
}
else
{
if((view->zoom + ZOOM_STEP) < MAX_ZOOM)
view->zoom=view->zoom+ZOOM_STEP;
else
- view->zoom=MAX_ZOOM;
+ view->zoom=(float)MAX_ZOOM;
}
void menu_click_alpha_plus(void* p)
if((view->zoom + ZOOM_STEP) < MAX_ZOOM)
view->zoom=view->zoom+ZOOM_STEP;
else
- view->zoom=MAX_ZOOM;
+ view->zoom=(float)MAX_ZOOM;
}
b=glCompButtonNew(5,7,75,25,"NORMAL",'\0',0,0);
b->color.R=0;
b->color.G=1;
- b->color.B=0.1;
+ b->color.B=(float)0.1;
b->customptr=view;
b->panel=p;
b->groupid=2;
b=glCompButtonNew(85,7,75,25,"FISHEYE",'\0',0,0);
b->color.R=0;
b->color.G=1;
- b->color.B=0.1;
+ b->color.B=(float)0.1;
b->customptr=view;
b->panel=p;
b->groupid=2;
//zoom percantage label
l=glCompLabelNew(100,45,24,"100");
l->panel=p;
- l->fontsizefactor=0.4;
+ l->fontsizefactor=(float)0.4;
glCompSetAddLabel(s,l);
view->Topview->customptr=l;
l=glCompLabelNew(93,65,20,"zoom");
l->panel=p;
- l->fontsizefactor=0.4;
+ l->fontsizefactor=(float)0.4;
glCompSetAddLabel(s,l);
glCompPanelHide(p);
void cleartopview(topview* t);
void preparetopview(Agraph_t *g,topview* t);
+void drawTopViewGraph(Agraph_t *g);
int select_topview_node(topview_node *n);
int select_topview_edge(topview_edge *e);
int update_topview_node_from_cgraph(topview_node* Node);
int get_color_from_edge(topview_edge *e);
int node_visible(Agnode_t* n);
int move_TVnodes();
+void local_zoom(topview* t);
void originate_distorded_coordinates(topview* t);
_BB void on_host_alpha_change (GtkWidget *widget,gpointer user_data);
double dist(double x1, double y1, double x2, double y2);
count ++;
gtk_color_button_get_color(td->gtkhostcolor[groupindex],&color);
t->Nodes[i].GroupIndex=groupindex;
- t->Nodes[i].GroupColor.R=color.red/65535.0;
- t->Nodes[i].GroupColor.G=color.green/65535.0;
- t->Nodes[i].GroupColor.B=color.blue/65535.0;
+ t->Nodes[i].GroupColor.R=(float)color.red/(float)65535.0;
+ t->Nodes[i].GroupColor.G=(float)color.green/(float)65535.0;
+ t->Nodes[i].GroupColor.B=(float)color.blue/(float)65535.0;
}
}
+ return 1;
}
int load_host_buttons(topview* t,Agraph_t *g,glCompSet* s)
GtkLayout* layout;
int btncount=0;
int i=0;
- char buf[255];
char *str;
char hostbtncaption[50];
char hostbtnregex[50];
glCompPanel* p;
glCompButton* b;
- layout=glade_xml_get_widget(xml, "frmHostSelectionFixed");
+ layout=(GtkLayout*)glade_xml_get_widget(xml, "frmHostSelectionFixed");
str='\0';
str=agget(g, "hostbtncount");
if (str)
{
p=glCompPanelNew(25,75,165,400);
p->data=2; //data panel
- p->color.R=0.80;
- p->color.B=0,2;
+ p->color.R=(float)0.80;
+ p->color.B=(float)0.2;
glCompSetAddPanel(s,p);
}
else return 0;
agget(g,hostbtncolorA));
t->TopviewData->hostregex[i]=agget(g,hostbtnregex);
- b=glCompButtonNew(5,7+(i+1)*36,150,35,agget(g,hostbtncaption ),'\0',0,0);
- b->color.R=atof(agget(g,hostbtncolorR));
- b->color.G=atof(agget(g,hostbtncolorG));
- b->color.B=atof(agget(g,hostbtncolorB));
- b->color.A=1;
+ b=glCompButtonNew((GLfloat)5,(GLfloat)7+((GLfloat)i+(GLfloat)1)*(GLfloat)36,(GLfloat)150,(GLfloat)35,agget(g,hostbtncaption ),'\0',0,0);
+ b->color.R=(float)atof(agget(g,hostbtncolorR));
+ b->color.G=(float)atof(agget(g,hostbtncolorG));
+ b->color.B=(float)atof(agget(g,hostbtncolorB));
+ b->color.A=(float)1;
b->panel=p;
b->groupid=-1;
b->callbackfunc=glhost_button_clicked_Slot;
b->data=i;
glCompSetAddButton(s,b);
- t->TopviewData->gtkhostbtn[i]=gtk_button_new_with_label(agget(g,hostbtncaption ));
- g_signal_connect ((gpointer) t->TopviewData->gtkhostbtn[i], "clicked", G_CALLBACK(host_button_clicked_Slot),i);
+ t->TopviewData->gtkhostbtn[i]=(GtkButton*)gtk_button_new_with_label(agget(g,hostbtncaption ));
+ g_signal_connect ((gpointer) t->TopviewData->gtkhostbtn[i], "clicked", G_CALLBACK(host_button_clicked_Slot),(gpointer)i);
- color.blue=65535*atof(agget(g,hostbtncolorB));
- color.red=65535*atof(agget(g,hostbtncolorR));
- color.green=65535*atof(agget(g,hostbtncolorG));
+ color.blue=65535*atoi(agget(g,hostbtncolorB));
+ color.red=65535*atoi(agget(g,hostbtncolorR));
+ color.green=65535*atoi(agget(g,hostbtncolorG));
- t->TopviewData->gtkhostcolor[i]=gtk_color_button_new_with_color(&color);
+ t->TopviewData->gtkhostcolor[i]=(GtkColorButton*)gtk_color_button_new_with_color(&color);
- gtk_color_button_set_alpha(t->TopviewData->gtkhostbtn[i],65535*atof(agget(g,hostbtncolorA)));
+ gtk_color_button_set_alpha((GtkColorButton*)t->TopviewData->gtkhostbtn[i],65535*atoi(agget(g,hostbtncolorA)));
- gtk_layout_put (layout,t->TopviewData->gtkhostbtn[i],X,Y);
- gtk_widget_set_size_request(t->TopviewData->gtkhostbtn[i],200,35);
+ gtk_layout_put (layout,(GtkWidget*)t->TopviewData->gtkhostbtn[i],X,Y);
+ gtk_widget_set_size_request((GtkWidget*)t->TopviewData->gtkhostbtn[i],200,35);
- gtk_layout_put (layout,t->TopviewData->gtkhostcolor[i],X+225,Y);
- gtk_widget_set_size_request(t->TopviewData->gtkhostcolor[i],40,35);
+ gtk_layout_put (layout,(GtkWidget*)t->TopviewData->gtkhostcolor[i],X+225,Y);
+ gtk_widget_set_size_request((GtkWidget*)t->TopviewData->gtkhostcolor[i],40,35);
- gtk_widget_show(t->TopviewData->gtkhostbtn[i]);
- gtk_widget_show(t->TopviewData->gtkhostcolor[i]);
+ gtk_widget_show((GtkWidget*)t->TopviewData->gtkhostbtn[i]);
+ gtk_widget_show((GtkWidget*)t->TopviewData->gtkhostcolor[i]);
Y=Y+40;
t->TopviewData->hostactive[i]=0;
}
- p->height=15+(btncount+1)*36;
+ p->height=(GLfloat)15+(GLfloat)(btncount+1)*(GLfloat)36;
for (i=0;i < btncount ; i++)
{
prepare_nodes_for_groups(t,t->TopviewData,i);
}
+ return 1;
}
void glhost_button_clicked_Slot(void* p)
{
//negative active
- int i,user_data;
+ int user_data;
user_data=((glCompButton*)p)->data;
if(view->Topview->TopviewData->hostactive[user_data]==0)
view->Topview->TopviewData->hostactive[user_data]=1;
void host_button_clicked_Slot(GtkWidget *widget,gpointer user_data)
{
//negative active
- int i;
if(view->Topview->TopviewData->hostactive[(int)user_data]==0)
view->Topview->TopviewData->hostactive[(int)user_data]=1;
else
#include "tvnodes.h"
#include "btree.h"
#include "viewport.h"
+#include "selection.h"
tv_nodes TV_Nodes;
static char buf [255];
int MP_Flag=0;
+
tv_filter* create_tv_filter()
{
tv_filter* f;
TV_Filter->max_data2=MaxData2;
TV_Filter->filter_string=Filter_String;
TV_Nodes.filtered=1;
+ return 1;
}
int reverse_selection()
{
static btree_node* n=0;
char* data_attr1;
char* data_attr2;
- char* data1;
- char* data2;
char* buf;
// n=tree_from_filter_string("([IP=\"^10.*\",min=\"0\",max=\"0\"])");
// get attributes from graph
data_attr2=agget(view->g[view->activeGraph],"DataAttribute2");
//create if objects are null
- layout=glade_xml_get_widget(xml, "layoutTVData");
+ layout=(GtkLayout*)glade_xml_get_widget(xml, "layoutTVData");
//select box
if (!TV_Node->chkSelected)
{
- TV_Node->chkSelected=gtk_check_button_new();
- gtk_layout_put (layout,TV_Node->chkSelected,LOCATION_X_CHKSELECTED,TV_Nodes.Y);
+ TV_Node->chkSelected=(GtkCheckButton*)gtk_check_button_new();
+ gtk_layout_put (layout,(GtkWidget*)TV_Node->chkSelected,LOCATION_X_CHKSELECTED,TV_Nodes.Y);
}
- gtk_widget_show(TV_Node->chkSelected);
- gtk_toggle_button_set_active(TV_Node->chkSelected,((custom_object_data*)AGDATA(view->Topview->Nodes[TV_Node->index].Node))->Selected);
+ gtk_widget_show((GtkWidget*)TV_Node->chkSelected);
+ gtk_toggle_button_set_active((GtkToggleButton*)TV_Node->chkSelected,((custom_object_data*)AGDATA(view->Topview->Nodes[TV_Node->index].Node))->Selected);
//Id Label
if (!TV_Node->IDLabel)
{
- TV_Node->IDLabel=gtk_label_new("");
- gtk_layout_put (layout,TV_Node->IDLabel,LOCATION_X_IDLABEL,TV_Nodes.Y);
+ TV_Node->IDLabel=(GtkLabel*)gtk_label_new("");
+ gtk_layout_put (layout,(GtkWidget*)TV_Node->IDLabel,LOCATION_X_IDLABEL,TV_Nodes.Y);
}
sprintf(buf, "%d", TV_Node->index);
gtk_label_set_text (TV_Node->IDLabel,buf);
- gtk_widget_show(TV_Node->IDLabel);
+ gtk_widget_show((GtkWidget*)TV_Node->IDLabel);
//visible
if (!TV_Node->chkVisible)
{
- TV_Node->chkVisible=gtk_check_button_new();
- gtk_layout_put (layout,TV_Node->chkVisible,LOCATION_X_CHKVISIBLE,TV_Nodes.Y);
+ TV_Node->chkVisible=(GtkCheckButton*)gtk_check_button_new();
+ gtk_layout_put (layout,(GtkWidget*)TV_Node->chkVisible,LOCATION_X_CHKVISIBLE,TV_Nodes.Y);
}
- gtk_widget_show(TV_Node->chkVisible);
- gtk_toggle_button_set_active(TV_Node->chkVisible,((custom_object_data*)AGDATA(view->Topview->Nodes[TV_Node->index].Node))->Visible);
+ gtk_widget_show((GtkWidget*)TV_Node->chkVisible);
+ gtk_toggle_button_set_active((GtkToggleButton*)TV_Node->chkVisible,((custom_object_data*)AGDATA(view->Topview->Nodes[TV_Node->index].Node))->Visible);
//highlighted
if (!TV_Node->chkHighlighted)
{
- TV_Node->chkHighlighted=gtk_check_button_new();
- gtk_layout_put (layout,TV_Node->chkHighlighted,LOCATION_X_CHKHIGHLIGHTED,TV_Nodes.Y);
+ TV_Node->chkHighlighted=(GtkCheckButton*)gtk_check_button_new();
+ gtk_layout_put (layout,(GtkWidget*)TV_Node->chkHighlighted,LOCATION_X_CHKHIGHLIGHTED,TV_Nodes.Y);
}
- gtk_widget_show(TV_Node->chkHighlighted);
- gtk_toggle_button_set_active(TV_Node->chkHighlighted,((custom_object_data*)AGDATA(view->Topview->Nodes[TV_Node->index].Node))->Highlighted);
+ gtk_widget_show((GtkWidget*)TV_Node->chkHighlighted);
+ gtk_toggle_button_set_active((GtkToggleButton*)TV_Node->chkHighlighted,((custom_object_data*)AGDATA(view->Topview->Nodes[TV_Node->index].Node))->Highlighted);
//DATA 1
if (!TV_Node->Data1)
{
- TV_Node->Data1=gtk_entry_new();
- gtk_layout_put (layout,TV_Node->Data1,LOCATION_X_DATA1,TV_Nodes.Y);
- gtk_widget_set_size_request(TV_Node->Data1,300,23);
+ TV_Node->Data1=(GtkEntry*)gtk_entry_new();
+ gtk_layout_put (layout,(GtkWidget*)TV_Node->Data1,LOCATION_X_DATA1,TV_Nodes.Y);
+ gtk_widget_set_size_request((GtkWidget*)TV_Node->Data1,300,23);
}
if(data_attr1)
}
else
gtk_entry_set_text (TV_Node->Data1,"");
- gtk_widget_show(TV_Node->Data1);
+ gtk_widget_show((GtkWidget*)TV_Node->Data1);
//DATA 2
if (!TV_Node->Data2)
{
- TV_Node->Data2=gtk_entry_new();
- gtk_layout_put (layout,TV_Node->Data2,LOCATION_X_DATA2,TV_Nodes.Y);
- gtk_widget_set_size_request(TV_Node->Data2,300,23);
+ TV_Node->Data2=(GtkEntry*)gtk_entry_new();
+ gtk_layout_put (layout,(GtkWidget*)TV_Node->Data2,LOCATION_X_DATA2,TV_Nodes.Y);
+ gtk_widget_set_size_request((GtkWidget*)TV_Node->Data2,300,23);
}
if(data_attr2)
{
}
else
gtk_entry_set_text (TV_Node->Data2,"");
- gtk_widget_show(TV_Node->Data2);
+ gtk_widget_show((GtkWidget*)TV_Node->Data2);
+ return 1;
+
}
}
TV_Nodes.page_data_node_index++;
}
- lblTVPage=glade_xml_get_widget(xml, "lblTVPage");
+ lblTVPage=(GtkLabel*)glade_xml_get_widget(xml, "lblTVPage");
sprintf(buf,"(%i / %i)", TV_Nodes.activepage+1,TV_Nodes.pagecount+1);
gtk_label_set_text(lblTVPage,buf);
- spn=glade_xml_get_widget(xml, "spnTVGotopage");
+ spn=(GtkSpinButton*)glade_xml_get_widget(xml, "spnTVGotopage");
gtk_spin_button_set_value(spn,page+1);
extern int tv_nodes_prior_page()
{
- tv_node* tvn;
- GtkLabel* lblTVPage;
if (TV_Nodes.activepage >0)
{
return tv_nodes_goto_page(TV_Nodes.activepage -1);
extern int tv_nodes_next_page()
{
- tv_node* tvn;
- GtkLabel* lblTVPage;
if (TV_Nodes.activepage < TV_Nodes.pagecount)
{
return tv_nodes_goto_page(TV_Nodes.activepage +1);
{
if (TV_Nodes.TV_Node[i].chkHighlighted)
{
- gtk_widget_hide(TV_Nodes.TV_Node[i].chkHighlighted);
- gtk_widget_hide(TV_Nodes.TV_Node[i].chkSelected);
- gtk_widget_hide(TV_Nodes.TV_Node[i].chkVisible);
- gtk_widget_hide(TV_Nodes.TV_Node[i].Data1);
- gtk_widget_hide(TV_Nodes.TV_Node[i].Data2);
- gtk_widget_hide(TV_Nodes.TV_Node[i].IDLabel);
+ gtk_widget_hide((GtkWidget*)TV_Nodes.TV_Node[i].chkHighlighted);
+ gtk_widget_hide((GtkWidget*)TV_Nodes.TV_Node[i].chkSelected);
+ gtk_widget_hide((GtkWidget*)TV_Nodes.TV_Node[i].chkVisible);
+ gtk_widget_hide((GtkWidget*)TV_Nodes.TV_Node[i].Data1);
+ gtk_widget_hide((GtkWidget*)TV_Nodes.TV_Node[i].Data2);
+ gtk_widget_hide((GtkWidget*)TV_Nodes.TV_Node[i].IDLabel);
}
}
+ return 1;
}
}*/
TV_Nodes.page_history_count=0;
TV_Nodes.page_history=realloc(TV_Nodes.page_history,sizeof(int) * TV_Nodes.page_history_count);
+ return 1;
+
}
static int push_to_page_history(int index)
count=0;
}
}
- spn=glade_xml_get_widget(xml, "spnTVGotopage");
+ spn=(GtkSpinButton*)glade_xml_get_widget(xml, "spnTVGotopage");
gtk_spin_button_set_value(spn,0);
gtk_spin_button_set_range(spn,0,TV_Nodes.pagecount+1);
- lblTVPage=glade_xml_get_widget(xml, "lblTVPage");
+ lblTVPage=(GtkLabel*)glade_xml_get_widget(xml, "lblTVPage");
sprintf(buf,"(%i / %i)", 1,TV_Nodes.pagecount+1);
gtk_label_set_text(lblTVPage,buf);
set_data_attributes();
+ return 1;
+
}
static int set_data_attributes()
{
GtkLabel* lblData2;
char* data_attr1;
char* data_attr2;
- char buf[255];
// get attributes from graph
data_attr1=agget(view->g[view->activeGraph],"DataAttribute1");
data_attr2=agget(view->g[view->activeGraph],"DataAttribute2");
data_attr1=agget(view->g[view->activeGraph],"DataAttribute1");
data_attr2=agget(view->g[view->activeGraph],"DataAttribute2");
- lblData1=glade_xml_get_widget(xml, "lblTVData1");
- lblData2=glade_xml_get_widget(xml, "lblTVData2");
+ lblData1=(GtkLabel*)glade_xml_get_widget(xml, "lblTVData1");
+ lblData2=(GtkLabel*)glade_xml_get_widget(xml, "lblTVData2");
gtk_label_set_text (lblData1,data_attr1);
gtk_label_set_text (lblData2,data_attr2);
return 1;
if (index < view->Topview->Nodecount)
{
// apply if selected
- if(gtk_toggle_button_get_active(TV_Nodes.TV_Node[i].chkSelected))
+ if(gtk_toggle_button_get_active((GtkToggleButton*)TV_Nodes.TV_Node[i].chkSelected))
{
if (!((custom_object_data*)AGDATA(view->Topview->Nodes[index].Node))->Selected)
select_node(view->g[view->activeGraph],view->Topview->Nodes[index].Node);
deselect_node(view->g[view->activeGraph],view->Topview->Nodes[index].Node);
}
// apply if Visible
- if(gtk_toggle_button_get_active(TV_Nodes.TV_Node[i].chkVisible))
+ if(gtk_toggle_button_get_active((GtkToggleButton*)TV_Nodes.TV_Node[i].chkVisible))
{
if (!((custom_object_data*)AGDATA(view->Topview->Nodes[index].Node))->Visible)
((custom_object_data*)AGDATA(view->Topview->Nodes[index].Node))->Visible=1;
((custom_object_data*)AGDATA(view->Topview->Nodes[index].Node))->Visible=0;
}
// apply if Highlighted
- if(gtk_toggle_button_get_active(TV_Nodes.TV_Node[i].chkHighlighted))
+ if(gtk_toggle_button_get_active((GtkToggleButton*)TV_Nodes.TV_Node[i].chkHighlighted))
{
if (!((custom_object_data*)AGDATA(view->Topview->Nodes[index].Node))->Highlighted)
((custom_object_data*)AGDATA(view->Topview->Nodes[index].Node))->Highlighted=1;
((custom_object_data*)AGDATA(view->Topview->Nodes[index].Node))->Highlighted=0;
}
//Data1
- agset(view->Topview->Nodes[index].Node,data_attr1,gtk_entry_get_text (TV_Nodes.TV_Node[i].Data1));
+ agset((void*)view->Topview->Nodes[index].Node,data_attr1,(char*)gtk_entry_get_text (TV_Nodes.TV_Node[i].Data1));
//Data2
- agset(view->Topview->Nodes[index].Node,data_attr2,gtk_entry_get_text (TV_Nodes.TV_Node[i].Data2));
+ agset(view->Topview->Nodes[index].Node,data_attr2,(char*)gtk_entry_get_text (TV_Nodes.TV_Node[i].Data2));
}
}
+ return 1;
+
}
int visible;
int highlighted;
- if(gtk_toggle_button_get_active(glade_xml_get_widget(xml,"rbTVFilterSel1")))
+ if(gtk_toggle_button_get_active((GtkToggleButton*)glade_xml_get_widget(xml,"rbTVFilterSel1")))
selected=-1;
- if(gtk_toggle_button_get_active(glade_xml_get_widget(xml,"rbTVFilterSel2")))
+ if(gtk_toggle_button_get_active((GtkToggleButton*)glade_xml_get_widget(xml,"rbTVFilterSel2")))
selected=1;
- if(gtk_toggle_button_get_active(glade_xml_get_widget(xml,"rbTVFilterSel3")))
+ if(gtk_toggle_button_get_active((GtkToggleButton*)glade_xml_get_widget(xml,"rbTVFilterSel3")))
selected=0;
- if(gtk_toggle_button_get_active(glade_xml_get_widget(xml,"rbTVFilterVisible1")))
+ if(gtk_toggle_button_get_active((GtkToggleButton*)glade_xml_get_widget(xml,"rbTVFilterVisible1")))
visible=-1;
- if(gtk_toggle_button_get_active(glade_xml_get_widget(xml,"rbTVFilterVisible2")))
+ if(gtk_toggle_button_get_active((GtkToggleButton*)glade_xml_get_widget(xml,"rbTVFilterVisible2")))
visible=1;
- if(gtk_toggle_button_get_active(glade_xml_get_widget(xml,"rbTVFilterVisible3")))
+ if(gtk_toggle_button_get_active((GtkToggleButton*)glade_xml_get_widget(xml,"rbTVFilterVisible3")))
visible=0;
- if(gtk_toggle_button_get_active(glade_xml_get_widget(xml,"rbTVFilterHigh1")))
+ if(gtk_toggle_button_get_active((GtkToggleButton*)glade_xml_get_widget(xml,"rbTVFilterHigh1")))
highlighted=-1;
- if(gtk_toggle_button_get_active(glade_xml_get_widget(xml,"rbTVFilterHigh2")))
+ if(gtk_toggle_button_get_active((GtkToggleButton*)glade_xml_get_widget(xml,"rbTVFilterHigh2")))
highlighted=1;
- if(gtk_toggle_button_get_active(glade_xml_get_widget(xml,"rbTVFilterHigh3")))
+ if(gtk_toggle_button_get_active((GtkToggleButton*)glade_xml_get_widget(xml,"rbTVFilterHigh3")))
highlighted=0;
set_filter(&TV_Nodes.filter,
- gtk_entry_get_text ( glade_xml_get_widget(xml,"edtTVFilterMinData1") ),
- gtk_entry_get_text ( glade_xml_get_widget(xml,"edtTVFilterMaxData1") ),
- gtk_entry_get_text ( glade_xml_get_widget(xml,"edtTVFilterMinData2") ),
- gtk_entry_get_text ( glade_xml_get_widget(xml,"edtTVFilterMaxData2") ),
- gtk_entry_get_text ( glade_xml_get_widget(xml,"edtTVFilterString") ),
+ (char*)gtk_entry_get_text ((GtkEntry*)glade_xml_get_widget(xml,"edtTVFilterMinData1") ),
+ (char*)gtk_entry_get_text ((GtkEntry*)glade_xml_get_widget(xml,"edtTVFilterMaxData1") ),
+ (char*)gtk_entry_get_text ((GtkEntry*)glade_xml_get_widget(xml,"edtTVFilterMinData2") ),
+ (char*)gtk_entry_get_text ((GtkEntry*)glade_xml_get_widget(xml,"edtTVFilterMaxData2") ),
+ (char*)gtk_entry_get_text ((GtkEntry*)glade_xml_get_widget(xml,"edtTVFilterString") ),
selected,visible,highlighted);
MP_Flag=1;
prepare_page_history();
}
}
apply_filter_from_gui();
+ return 1;
+
}
extern int tv_unselect_all()
{
}
}
apply_filter_from_gui();
+ return 1;
+
}
extern int tv_highligh_all()
{
projects / graphviz / commitdiff