replacing agraph with cgraph

convince smyrna to at least compile

diff --git a/cmd/smyrna/glexpose.c b/cmd/smyrna/glexpose.c
index dd136633ecaf4dad134083a116ec059c7634ba78..04539f889c41a1816b3429e6761e09f9aa965525 100644 (file)
--- a/cmd/smyrna/glexpose.c
+++ b/cmd/smyrna/glexpose.c
@@ -146,7 +146,7 @@ int glexpose_drawgraph(ViewInfo * view)
            if(!view->Topview->is_top_fisheye)
                drawTopViewGraph(view->g[view->activeGraph]);   //view->Topview style dots and straight lines
            else {
-                       drawtopologicalfisheye(view->Topview);
+                       drawtopologicalfisheye2(view->Topview);
            }
            glCompSetDraw(view->Topview->topviewmenu);
        }

diff --git a/cmd/smyrna/gui/gui.h b/cmd/smyrna/gui/gui.h
index cd526f96610011733ec149b4fae3297ad5c89d33..85f8396c709685f8f6046dbfe81afd6b8504eb38 100644 (file)
--- a/cmd/smyrna/gui/gui.h
+++ b/cmd/smyrna/gui/gui.h
@@ -23,11 +23,7 @@
 #include <gtk/gtkgl.h>
 #include <glade/glade.h>
 #include "callbacks.h"
-#include "agraph.h"
-
-
-
-
+#include "cgraph.h"
 
 
 #define MAXIMUM_WIDGET_COUNT   97

diff --git a/cmd/smyrna/topfisheyeview.c b/cmd/smyrna/topfisheyeview.c
index 36e978f8e8079231224f0cac28fe167fbd4e15b8..68466e70b1d3a44f9f24cba2dd0703e967234e3a 100644 (file)
--- a/cmd/smyrna/topfisheyeview.c
+++ b/cmd/smyrna/topfisheyeview.c
@@ -419,9 +419,6 @@ int get_temp_coords(topview* t,int level,int v,double* coord_x,double* coord_y,f
 }
 
 
-
-
-`2
 /*  In loop,
  *  update fs.
  *    For example, if user clicks mouse at (p.x,p.y) to pick a single new focus,