From: erg <devnull@localhost>
Date: Sat, 19 Apr 2008 05:20:42 +0000 (+0000)
Subject: Remove the test case from the prepare_topfish code
X-Git-Tag: LAST_LIBGRAPH~32^2~4261
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e710ddde444accd0ad48eaf82260602a757b13d;p=graphviz

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 b824781c6..b32237f27 100644
--- 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 27afac81a..5b1140516 100755
--- 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';;