*** empty log message ***

diff --git a/cmd/smyrna/glmotion.c b/cmd/smyrna/glmotion.c
index 1d8dfc064a0af5593af8300e46f46f581056cc89..05e5599330253adb6ebfd0c3a182b5b458d74412 100644 (file)
--- a/cmd/smyrna/glmotion.c
+++ b/cmd/smyrna/glmotion.c
@@ -133,7 +133,8 @@ int glmotion_zoom(ViewInfo * v)
        xx = ((float) 100.0 - (float) 1.0) * (v->zoom -
                     (float) MIN_ZOOM) / ((float) MAX_ZOOM - (float) MIN_ZOOM) + (float) 1.0;
        sprintf(buf, "%i", (int) xx);
-       glCompLabelSetText((glCompLabel *) v->Topview->customptr, buf);
+/*     if (v->Topview->customptr)
+               glCompLabelSetText((glCompLabel *) v->Topview->customptr, buf);*/
        return 1;
 }
 int glmotion_pan(ViewInfo * v)

diff --git a/cmd/smyrna/gui/menucallbacks.c b/cmd/smyrna/gui/menucallbacks.c
index 6923fabf01f9ec320ac1c9b1dc0169ee9cdb5517..e58feff22f3adde2f103eb463fa90ce1bfa50d97 100755 (executable)
--- a/cmd/smyrna/gui/menucallbacks.c
+++ b/cmd/smyrna/gui/menucallbacks.c
@@ -156,14 +156,15 @@ void mShowHostSelectionSlot(GtkWidget * widget, gpointer user_data)
 
 }
 
-void mMenuZoom(GtkWidget * widget, gpointer user_data)
+void mMenuPan(GtkWidget * widget, gpointer user_data)
 {
-    view->mouse.mouse_mode = MM_ZOOM;
-}
+       view->mouse.mouse_mode = MM_PAN;
 
-void mMenuPan(GtkWidget * widget, gpointer user_data)
+}
+void mMenuZoom(GtkWidget * widget, gpointer user_data)
 {
-    view->mouse.mouse_mode = MM_PAN;
+       view->mouse.mouse_mode = MM_ZOOM;
+
 }
 
 

diff --git a/cmd/smyrna/gui/menucallbacks.h b/cmd/smyrna/gui/menucallbacks.h
index 09ac50c6441a70aa5e8850f39b2532a9442db3e3..283c096dee7329cf16f33e735472c88c24624950 100755 (executable)
--- a/cmd/smyrna/gui/menucallbacks.h
+++ b/cmd/smyrna/gui/menucallbacks.h
@@ -38,6 +38,10 @@ _BB void mTopviewSettingsSlot(GtkWidget * widget, gpointer user_data);
 //view
 _BB void mShowToolBoxSlot(GtkWidget * widget, gpointer user_data);
 _BB void mShowHostSelectionSlot(GtkWidget * widget, gpointer user_data);
+_BB void mMenuPan(GtkWidget * widget, gpointer user_data);
+_BB void mMenuZoom(GtkWidget * widget, gpointer user_data);
+
+
 //Graph
 _BB void mNodeListSlot(GtkWidget * widget, gpointer user_data);
 _BB void mNewNodeSlot(GtkWidget * widget, gpointer user_data);

diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c
index b21a78b1c55f50216602ca326672fe6fa1893675..b24037961866f0d7d16fb145eeb5aaf193b91b50 100755 (executable)
--- a/cmd/smyrna/viewport.c
+++ b/cmd/smyrna/viewport.c
@@ -763,7 +763,8 @@ static Agraph_t *loadGraph(char *filename)
        }
     }
 #endif
-    preparetopview(g, view->Topview);
+       if(strcasecmp(agget(g, "TopView"),"1")==0)
+               preparetopview(g, view->Topview);
     return g;
 }
 
@@ -1003,7 +1004,7 @@ static int init_object_custom_data(Agraph_t * graph, void *obj)
 
 /* move_node:
  */ 
-void move_node(void *obj, float dx, float dy)
+void movenode(void *obj, float dx, float dy)
 {
     char buf[512];
     double x, y;
@@ -1013,7 +1014,7 @@ void move_node(void *obj, float dx, float dy)
        sscanf (agxget (obj, pos), "%lf,%lf", &x, &y);
        sprintf (buf, "%lf,%lf", x - dx, y - dy);
        agxset(obj, pos, buf);
-    }
+       }
 }
 
 static char *move_xdot(void *obj, xdot * x, int dx, int dy, int dz)
@@ -1129,7 +1130,7 @@ void move_nodes(Agraph_t * g)
            agset(obj, "_ldraw_",
                  move_xdot(obj, bf, (int) dx, (int) dy, 0));
            free(bf);
-           move_node(obj, dx, dy);
+           movenode(obj, dx, dy);
            //iterate edges
            /*for (e = agfstout(g,obj) ; e ; e = agnxtout (g,e))
               {

diff --git a/cmd/smyrna/viewport.h b/cmd/smyrna/viewport.h
index 3cc542171029fc2a59da0aeb7d74867152a34526..4bedde7c38ed58b54c4f2ba51e66fa63ffb628cf 100755 (executable)
--- a/cmd/smyrna/viewport.h
+++ b/cmd/smyrna/viewport.h
@@ -33,7 +33,7 @@ int save_as_graph();
 int do_graph_layout(Agraph_t * graph, int Engine, int keeppos);
 void refreshControls(ViewInfo * v);
 
-void move_node(void *n, float dx, float dy);
+void movenode(void *n, float dx, float dy);
 void glexpose();
 int gl_main_expose();
 void move_nodes(Agraph_t * g);