*** empty log message ***

diff --git a/cmd/smyrna/draw.c b/cmd/smyrna/draw.c
index ecf2f433db8b47e6c8975676f4466109484382c6..7a96db3cd66e778a5a1cdb11c0d26e83ca1b23fb 100755 (executable)
--- a/cmd/smyrna/draw.c
+++ b/cmd/smyrna/draw.c
@@ -580,8 +580,9 @@ void draw_fisheye_magnifier(ViewInfo * view)
     if ((view->mouse.mouse_mode == 21) && (view->mouse.mouse_down)) {
        float a;
        GLfloat mg_x, mg_y, mg_z;
-       a = GetOGLDistance((int) 250);
+       a = GetOGLDistance((int) view->fmg.constantR);
        view->fmg.R = (int) a;
+       printf("fmg->constantR:%i   fmg->R:%i    fmg->factor:%i\n ",view->fmg.constantR,view->fmg.R,view->fmg.fisheye_distortion_fac);
        GetOGLPosRef(view->mouse.mouse_X, view->mouse.mouse_Y, &mg_x,
                     &mg_y, &mg_z);
        glColor4f((GLfloat) 0.3, (GLfloat) 0.1, (GLfloat) 0.8,

diff --git a/cmd/smyrna/gui/topviewsettings.c b/cmd/smyrna/gui/topviewsettings.c
index 258bc3d6d02dea03a1a3f298ff8f20d86bb3e6d7..01f58574b2d85f727b76e1d0361727eab0c9d1a1 100644 (file)
--- a/cmd/smyrna/gui/topviewsettings.c
+++ b/cmd/smyrna/gui/topviewsettings.c
@@ -92,13 +92,36 @@ static int get_checkbox_widget_to_attribute(char* attribute,char* widget_name,Ag
        agattr(g, AGRAPH,attribute,itoa(value,buf,10));
        return 1;
 }
-
+static int set_spinbtn_widget(char* attribute,char* widget_name)
+{
+       char* buf;
+       float value;
+       buf=agget(view->g[view->activeGraph],attribute);
+       if ((!buf)||(strcmp(buf,"")==0))
+               buf=agget(view->default_attributes,attribute);
+       if (buf)
+       {
+               value=(float)atof(buf);
+               gtk_spin_button_set_value((GtkSpinButton*)glade_xml_get_widget(xml, widget_name),value);
+               return 1;
+       }
+       return 0;
+}
+static int get_spinbtn_widget_to_attribute(char* attribute,char* widget_name,Agraph_t * g)
+{
+       float value;
+       char buf[25];
+       value=(float)gtk_spin_button_get_value ((GtkSpinButton*)glade_xml_get_widget(xml, widget_name));
+       sprintf(buf,"%f",value);
+       //      agattr(
+       agattr(g, AGRAPH,attribute,buf);
+       return 1;
+}
 
 
 int load_settings_from_graph(Agraph_t * g)
 {
        char* buf;
-       int value;
 
        set_color_button_widget("bgcolor","settingsColorBtn1");
        set_color_button_widget("bordercolor","settingsColorBtn2");
@@ -107,6 +130,13 @@ int load_settings_from_graph(Agraph_t * g)
        set_color_button_widget("highlightededgecolor","settingsColorBtn7");
        set_color_button_widget("selectednodecolor","settingsColorBtn8");
        set_color_button_widget("selectededgecolor","settingsColorBtn9");
+       get_color_button_widget_to_attribute("topologicaltopviewfinestcolor","settingsColorBtn9",g);
+       get_color_button_widget_to_attribute("topologicaltopviewcoarsestcolor","settingsColorBtn9",g);
+
+       set_color_button_widget("topologicaltopviewfinestcolor","settingsColorBtn10");
+       set_color_button_widget("topologicaltopviewcoarsestcolor","settingsColorBtn11");
+
+
        set_checkbox_widget("bordervisible","settingsChkBox2");
        set_checkbox_widget("gridvisible","settingsChkBox3");
        set_checkbox_widget("randomizenodecolors","settingsChkBox4");
@@ -115,6 +145,23 @@ int load_settings_from_graph(Agraph_t * g)
        set_checkbox_widget("nodesizewithdegree","settingsChkBox11");
        set_checkbox_widget("antialiasing","settingsChkBox12");
 
+       set_checkbox_widget("topologicalfisheyedist2limit","settingsChkBox13");
+       set_checkbox_widget("topologicalfisheyeanimate","settingsChkBox14");
+       set_checkbox_widget("topologicalfisheyelabelfinenodes","settingsChkBox15");
+       set_checkbox_widget("topologicalfisheyecolornodes","settingsChkBox16");
+       set_checkbox_widget("topologicalfisheyecoloredges","settingsChkBox17");
+       set_checkbox_widget("topologicalfisheyelabelfocus","settingsChkBox18");
+
+       set_spinbtn_widget("defaultmagnifierwidth","settingsspinbutton1");
+       set_spinbtn_widget("defaultmagnifierheight","settingsspinbutton2");
+       set_spinbtn_widget("defaultmagnifierkts","settingsspinbutton3");
+       set_spinbtn_widget("defaultfisheyemagnifierradius","settingsspinbutton4");
+       set_spinbtn_widget("defaultfisheyemagnifierdistort","settingsspinbutton5");
+       set_spinbtn_widget("topologicalfisheyefinenodes","settingsspinbutton6");
+       set_spinbtn_widget("topologicalfisheyecoarseningfactor","settingsspinbutton7");
+       set_spinbtn_widget("topologicalfisheyedistortionfactor","settingsspinbutton8");
+
+               
        /*font selection box*/
        buf=agget(view->g[view->activeGraph],"defaultfontname");
        if (!buf)
@@ -133,7 +180,8 @@ int load_settings_from_graph(Agraph_t * g)
        return 1;
 }
 
-
+/*burak
+917 749 6080*/
 
 
 int update_graph_from_settings(Agraph_t * g)
@@ -154,6 +202,31 @@ int update_graph_from_settings(Agraph_t * g)
        get_color_button_widget_to_attribute("highlightededgecolor","settingsColorBtn7",g);
        get_color_button_widget_to_attribute("selectednodecolor","settingsColorBtn8",g);
        get_color_button_widget_to_attribute("selectededgecolor","settingsColorBtn9",g);
+
+               /*
+               defaultmagnifierwidth="300",
+               defaultmagnifierheight="200",
+               defaultmagnifierkts="5",
+               defaultfisheyemagnifierradius="250"
+               defaultfisheyemagnifierdistort="5",
+
+               topologicalfisheyefinenodes="50",
+               topologicalfisheyecoarseningfactor="2.5",
+               topologicalfisheyedistortionfactor="1",
+
+               topologicalfisheyedist2limit="1",
+               topologicalfisheyeanimate="1",
+               topologicalfisheyelabelfinenodes="1",
+               topologicalfisheyecolornodes="1",
+               topologicalfisheyecoloredges="1",
+               topologicalfisheyelabelfocus="1",
+
+               topologicalfisheyefinestcolor="red",
+               topologicalfisheyecoarsestcolor="green"*/
+
+       get_color_button_widget_to_attribute("topologicalfisheyefinestcolor","settingsColorBtn10",g);
+       get_color_button_widget_to_attribute("topologicalfisheyecoarsestcolor","settingsColorBtn11",g);
+
        get_checkbox_widget_to_attribute("bordervisible","settingsChkBox2",g);
        get_checkbox_widget_to_attribute("gridvisible","settingsChkBox3",g);
        get_checkbox_widget_to_attribute("randomizenodecolors","settingsChkBox4",g);
@@ -162,7 +235,22 @@ int update_graph_from_settings(Agraph_t * g)
        get_checkbox_widget_to_attribute("nodesizewithdegree","settingsChkBox11",g);
        get_checkbox_widget_to_attribute("antialiasing","settingsChkBox12",g);
 
-//     free (buf);
+       get_checkbox_widget_to_attribute("topologicalfisheyedist2limit","settingsChkBox13",g);
+       get_checkbox_widget_to_attribute("topologicalfisheyeanimate","settingsChkBox14",g);
+       get_checkbox_widget_to_attribute("topologicalfisheyelabelfinenodes","settingsChkBox15",g);
+       get_checkbox_widget_to_attribute("topologicalfisheyecolornodes","settingsChkBox16",g);
+       get_checkbox_widget_to_attribute("topologicalfisheyecoloredges","settingsChkBox17",g);
+       get_checkbox_widget_to_attribute("topologicalfisheyelabelfocus","settingsChkBox18",g);
+
+       get_spinbtn_widget_to_attribute("defaultmagnifierwidth","settingsspinbutton1",g);
+       get_spinbtn_widget_to_attribute("defaultmagnifierheight","settingsspinbutton2",g);
+       get_spinbtn_widget_to_attribute("defaultmagnifierkts","settingsspinbutton3",g);
+       get_spinbtn_widget_to_attribute("defaultfisheyemagnifierradius","settingsspinbutton4",g);
+       get_spinbtn_widget_to_attribute("defaultfisheyemagnifierdistort","settingsspinbutton5",g);
+       get_spinbtn_widget_to_attribute("topologicalfisheyefinenodes","settingsspinbutton6",g);
+       get_spinbtn_widget_to_attribute("topologicalfisheyecoarseningfactor","settingsspinbutton7",g);
+       get_spinbtn_widget_to_attribute("topologicalfisheyedistortionfactor","settingsspinbutton8",g);
+
        return 1;
 }
 

diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h
index e94831c742391f0097080b283217043bc116c8e3..2b18f347a411c42a188622fedac8a2fc51855e55 100644 (file)
--- a/cmd/smyrna/smyrnadefs.h
+++ b/cmd/smyrna/smyrnadefs.h
@@ -244,7 +244,8 @@ typedef struct _magnifier {
 typedef struct _fisheye_magnifier {
     float x, y;                        //center coords of active circle
     float distortion_factor;   //distortion factor ,default 1
-    int R;                     //radius of  the magnifier referenced from windows
+    int R;                     //radius of  the magnifier 
+       int constantR;  //radius of  the magnifier referenced from windows
     int active;
     int fisheye_distortion_fac;
 } fisheye_magnifier;

diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c
index 4984222f27481ea67fba9342ac1fbfa22b7069cf..44f0bc2d2e70590146b7300b1d0b8952fc4973c3 100755 (executable)
--- a/cmd/smyrna/viewport.c
+++ b/cmd/smyrna/viewport.c
@@ -147,7 +147,7 @@ void init_viewport(ViewInfo * view)
     view->mg.width = DEFAULT_MAGNIFIER_WIDTH;
     view->mg.height = DEFAULT_MAGNIFIER_HEIGHT;
     view->mg.kts = DEFAULT_MAGNIFIER_KTS;
-    view->fmg.R = DEFAULT_FISHEYE_MAGNIFIER_RADIUS;
+    view->fmg.constantR = DEFAULT_FISHEYE_MAGNIFIER_RADIUS;
     view->fmg.active = 0;
     view->mouse.mouse_down = 0;
     view->activeGraph = -1;
@@ -176,35 +176,49 @@ void set_viewport_settings_from_template  (ViewInfo * view,Agraph_t *g)
 {
     gvcolor_t cl;
        char* buf;
-       /*graph [antialiasing=1,
+       /*
+       graph [antialiasing=1,
                bgcolor="#ffffff",
                bordercolor="#38eb29",
                bordercoloralpha="1",
-               bordervisible=1,
-               defaultfontname=1,
-               defaultfontsize=52,
+               bordervisible="1",
+               defaultfontname="1",
+               defaultfontsize="52",
                gridcolor="#6033d8",
                gridcoloralpha="1",
-               gridvisible=1,
+               gridvisible="1",
                highlightededgecolor="#c41b50",
                highlightededgecoloralpha="1",
                highlightednodecolor="#d1cd24",
                highlightednodecoloralpha="1",
-               defaultlinewidth=1
-               nodesizewithdegree=1,
-               randomizeedgecolors=1,
-               randomizenodecolors=1,
+               defaultlinewidth="1"
+               nodesizewithdegree="1",
+               randomizeedgecolors="1",
+               randomizenodecolors="1",
                selectededgecolor="#ffc0cb",
                selectededgecoloralpha="1",
                selectednodecolor="#8ce61d",
-               selectednodecoloralpha
+               selectednodecoloralpha="1",
                gridcoloralpha="1",
                defaultmagnifierwidth="300",
                defaultmagnifierheight="200",
                defaultmagnifierkts="5",
                defaultfisheyemagnifierradius="250"
-               usermode=1
+               defaultfisheyemagnifierdistort="5",
+               usermode="1",
+               topologicalfisheyefinenodes="50",
+               topologicalfisheyecoarseningfactor="2.5",
+               topologicalfisheyedistortionfactor="1",
+               topologicalfisheyedist2limit="1",
+               topologicalfisheyeanimate="1",
+               topologicalfisheyelabelfinenodes="1",
+               topologicalfisheyecolornodes="1",
+               topologicalfisheyecoloredges="1",
+               topologicalfisheyelabelfocus="1",
+               topologicalfisheyefinestcolor="red",
+               topologicalfisheyecoarsestcolor="green"
        ];
+
        border color*/
        colorxlate(get_attribute_value("bordercolor",view,g), &cl, RGBA_DOUBLE);
        view->borderColor.R = (float)cl.u.RGBA[0];
@@ -290,7 +304,11 @@ there i go, turn the page
 
        view->mg.kts = (float)atof(get_attribute_value("defaultmagnifierkts",view,g));
 
-       view->fmg.R = atoi(get_attribute_value("defaultfisheyemagnifierradius",view,g));
+       view->fmg.constantR = atoi(get_attribute_value("defaultfisheyemagnifierradius",view,g));
+
+       view->fmg.fisheye_distortion_fac=atoi(get_attribute_value("defaultfisheyemagnifierdistort",view,g));
+
+
 
        glClearColor(view->bgColor.R, view->bgColor.G, view->bgColor.B, view->bgColor.A);       //background color