Fix code to remove compiler warnings;

increase default node size (node size should be controlled by user)

diff --git a/cmd/smyrna/topfisheyeview.c b/cmd/smyrna/topfisheyeview.c
index db49de216c28b47d8660f39e205907b17cf43ae9..162c7463b06e4d82a43759be4a88960df9202db8 100644 (file)
--- a/cmd/smyrna/topfisheyeview.c
+++ b/cmd/smyrna/topfisheyeview.c
@@ -272,7 +272,7 @@ void drawtopologicalfisheye2(topview * t)
                for (v = 0; v < hp->nvtxs[level]; v++)
                {
                        {
-                               ex_vtx_data *gg = hp->geom_graphs[level];
+                               /* ex_vtx_data *gg = hp->geom_graphs[level]; */
                                        double x0,y0;
                                        if(get_temp_coords(t,level,v,&x0,&y0,&R,&G,&B))
                                        {
@@ -332,7 +332,7 @@ int get_temp_coords(topview* t,int level,int v,double* coord_x,double* coord_y,f
 {
     Hierarchy *hp = t->h;
        ex_vtx_data *gg = hp->geom_graphs[level];
-       v_data *g = hp->graphs[level];
+       /* v_data *g = hp->graphs[level]; */
        int OAL,AL;
        OAL=gg[v].old_active_level;
        AL=gg[v].active_level;
@@ -533,8 +533,8 @@ void refresh_old_values(topview* t)
                for (v = 0; v < hp->nvtxs[level]; v++)
                {
                    ex_vtx_data *gg = hp->geom_graphs[level];
-                   v_data *g = hp->graphs[level];
-                       double x0,y0;
+                   /* v_data *g = hp->graphs[level]; */
+                       /* double x0,y0; */
                        gg[v].old_physical_x_coord=gg[v].physical_x_coord;
                        gg[v].old_physical_y_coord=gg[v].physical_y_coord;
                        gg[v].old_active_level=gg[v].active_level;

diff --git a/cmd/smyrna/topfisheyeview.h b/cmd/smyrna/topfisheyeview.h
index 29f8ad3ac57bc60f9afdd6dd1bf21ce0d5935cef..a7f26a2555543c0a94272d2ad8328622e3300b97 100644 (file)
--- a/cmd/smyrna/topfisheyeview.h
+++ b/cmd/smyrna/topfisheyeview.h
@@ -23,6 +23,7 @@ void fisheye_spherical(double x_focus, double y_focus, double z_focus,
                       topview * t);
 void prepare_topological_fisheye(topview*);
 void drawtopologicalfisheye(topview * t);
+void drawtopologicalfisheye2(topview * t);
 void changetopfishfocus(topview * t, float *x, float *y,
                                   float *z, int num_foci);
 void refresh_old_values(topview* t);

diff --git a/cmd/smyrna/topview.c b/cmd/smyrna/topview.c
index 38dc0fcbb97a663313a4156f2ef0d74d6b8f0c65..bc097af70ee06be73689795eaf643367e4910081 100755 (executable)
--- a/cmd/smyrna/topview.c
+++ b/cmd/smyrna/topview.c
@@ -214,7 +214,7 @@ static int drawtopviewnodes(Agraph_t * g)
     int ind = 0;
     float dotsize = 0;
     if (view->zoom > NODE_ZOOM_LIMIT) {
-       dotsize = 5 / view->zoom * -1;
+       dotsize = 50 / view->zoom * -1;
        if (dotsize > 1)
            glPointSize(dotsize);
        else
@@ -1119,7 +1119,7 @@ static glCompSet *glcreate_gl_topview_menu()
     glCompPanel *p;
     glCompButton *b;
     glCompLabel *l;
-       GtkRequisition requisition;
+       /* GtkRequisition requisition; */
 
     if (!smyrna_icon_pan) {
 #ifdef _WIN32

diff --git a/cmd/smyrna/topviewdata.c b/cmd/smyrna/topviewdata.c
index 9ab5c4891ea65b9f6349fa5c7f1a73b415122384..9dfddb9f99cebee6512e53adee58328f08d656c1 100644 (file)
--- a/cmd/smyrna/topviewdata.c
+++ b/cmd/smyrna/topviewdata.c
@@ -14,6 +14,7 @@
 **********************************************************/
 
 #include "topviewdata.h"
+#include "btree.h"
 #include <memory.h>
 
 static int validate_group_node(tv_node * TV_Node, char *regex_string)