Remove the test case from the prepare_topfish code

and initialize all of the repositioning parameters at the beginning.

diff --git a/cmd/smyrna/topfisheyeview.c b/cmd/smyrna/topfisheyeview.c
index b824781c698b638e82fc068058bd198a112e8a98..b32237f274ff55037eda53143079753b5256e905 100644 (file)
--- a/cmd/smyrna/topfisheyeview.c
+++ b/cmd/smyrna/topfisheyeview.c
@@ -217,7 +217,6 @@ void prepare_topological_fisheye(topview* t)
     Hierarchy *hp;
     ex_vtx_data *gg;
     topview_node *np;
-    reposition_t parms;
 
     vtx_data *graph = makeGraph(t, &ne);
 
@@ -242,14 +241,7 @@ void prepare_topological_fisheye(topview* t)
 
     set_active_levels(hp, fs->foci_nodes, fs->num_foci, &(t->parms.level));
 
-    parms.rescale = Polar;
-    parms.width=view->bdxRight-view->bdxLeft;
-    parms.height=view->bdyTop-view->bdyBottom;
-    parms.margin=0;
-    parms.graphSize=100;
-    parms.distortion=1.0;
-    positionAllItems(hp, fs, &parms);
-    /* positionAllItems(hp, fs, &(t->parms.repos)); */
+    positionAllItems(hp, fs, &(t->parms.repos));
 /* fprintf (stderr, "No. of active nodes = %d\n", count_active_nodes(hp)); */
 
 }

diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c
index 27afac81a40aed9d813b7cdcd4054fe0c1f1aa1e..5b114051694d7b3b996e19a0535103b00e7a1860 100755 (executable)
--- a/cmd/smyrna/viewport.c
+++ b/cmd/smyrna/viewport.c
@@ -344,7 +344,12 @@ void init_viewport(ViewInfo * view)
     view->Topview->parms.level.coarsening_rate = 2.5;
     view->Topview->parms.hier.dist2_limit = 1;
     view->Topview->parms.hier.min_nvtxs = 20;
-    view->Topview->parms.repos.rescale = NoRescale;
+    view->Topview->parms.repos.rescale = Polar;
+    view->Topview->parms.repos.width = view->bdxRight-view->bdxLeft;
+    view->Topview->parms.repos.height = view->bdyTop-view->bdyBottom;
+    view->Topview->parms.repos.margin = 0;
+    view->Topview->parms.repos.graphSize = 100;
+    view->Topview->parms.repos.distortion = 1.0;
 
     view->Topview->topviewmenu = '\0';
        view->cameras='\0';;