From: ellson <devnull@localhost>
Date: Tue, 18 Oct 2005 18:48:52 +0000 (+0000)
Subject: Add fdp and circo to gvui;
X-Git-Tag: LAST_LIBGRAPH~32^2~7258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d3ae842bfc07944eb3311d5002cb372a86bd302;p=graphviz

Add fdp and circo to gvui;
fix dotneato_basename() to remove possible .exe in Windows version.
---

diff --git a/windows/cmd/gvui/Main.bas b/windows/cmd/gvui/Main.bas
index 2352d7db1..c7b172691 100644
--- a/windows/cmd/gvui/Main.bas
+++ b/windows/cmd/gvui/Main.bas
@@ -12,4 +12,6 @@ Public Const ANY_ELEMENT As Integer = GRAPH Or NODE Or EDGE Or SUBGRAPH Or CLUST
 Public Const DOT As Integer = &H1
 Public Const NEATO As Integer = &H2
 Public Const TWOPI As Integer = &H4
-Public Const ALL_ENGINES As Integer = DOT Or NEATO Or TWOPI
+Public Const CIRCO As Integer = &H8
+Public Const FDP As Integer = &H16
+Public Const ALL_ENGINES As Integer = DOT Or NEATO Or TWOPI or CIRCO or FDP
diff --git a/windows/cmd/gvui/frmLayoutControl.frm b/windows/cmd/gvui/frmLayoutControl.frm
index 8550ce5bf..672ff0171 100644
--- a/windows/cmd/gvui/frmLayoutControl.frm
+++ b/windows/cmd/gvui/frmLayoutControl.frm
@@ -468,6 +468,8 @@ Private Sub optPropScope_LostFocus()
     e = Switch(optLayoutEngine.Text = "dot", DOT, _
                 optLayoutEngine.Text = "neato", NEATO, _
                 optLayoutEngine.Text = "twopi", TWOPI, _
+                optLayoutEngine.Text = "circo", CIRCO, _
+                optLayoutEngine.Text = "fdp", FDP, _
                 True, ALL_ENGINES)
         
     s = Switch(optPropScope.Text = "Graph", GRAPH, _
@@ -536,7 +538,9 @@ Private Sub Form_Load()
     Set engineHelp = New Collection
     engineHelp.Add "Hierarchical drawing of directed graphs", "dot"
     engineHelp.Add "Force layout of undirected graphs", "neato"
-    engineHelp.Add "Circular layout", "twopi"
+    engineHelp.Add "Radial layout", "twopi"
+    engineHelp.Add "Circular layout", "circo"
+    engineHelp.Add "Force layout of undirected graphs", "fdp"
     
     optPropScope.AddItem "Graph"
     optPropScope.AddItem "Node"
@@ -547,6 +551,8 @@ Private Sub Form_Load()
     optLayoutEngine.AddItem "dot"
     optLayoutEngine.AddItem "neato"
     optLayoutEngine.AddItem "twopi"
+    optLayoutEngine.AddItem "circo"
+    optLayoutEngine.AddItem "fdp"
     
     optOutputType.AddItem "ps"
     optOutputType.AddItem "ps2"