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 2352d7db1776eed09e26e8bd567a35bb97665c50..c7b172691e901a52576c797d71d7be8d22e2bcfa 100644 (file)
--- 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\r
 Public Const NEATO As Integer = &H2\r
 Public Const TWOPI As Integer = &H4\r
-Public Const ALL_ENGINES As Integer = DOT Or NEATO Or TWOPI\r
+Public Const CIRCO As Integer = &H8\r
+Public Const FDP As Integer = &H16\r
+Public Const ALL_ENGINES As Integer = DOT Or NEATO Or TWOPI or CIRCO or FDP\r

diff --git a/windows/cmd/gvui/frmLayoutControl.frm b/windows/cmd/gvui/frmLayoutControl.frm
index 8550ce5bfc68ae8084d54e816aa733bf0f739040..672ff0171c89872d9c84155bf01883529e75d722 100644 (file)
--- 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, _\r
                 optLayoutEngine.Text = "neato", NEATO, _\r
                 optLayoutEngine.Text = "twopi", TWOPI, _\r
+                optLayoutEngine.Text = "circo", CIRCO, _\r
+                optLayoutEngine.Text = "fdp", FDP, _\r
                 True, ALL_ENGINES)\r
         \r
     s = Switch(optPropScope.Text = "Graph", GRAPH, _\r
@@ -536,7 +538,9 @@ Private Sub Form_Load()
     Set engineHelp = New Collection\r
     engineHelp.Add "Hierarchical drawing of directed graphs", "dot"\r
     engineHelp.Add "Force layout of undirected graphs", "neato"\r
-    engineHelp.Add "Circular layout", "twopi"\r
+    engineHelp.Add "Radial layout", "twopi"\r
+    engineHelp.Add "Circular layout", "circo"\r
+    engineHelp.Add "Force layout of undirected graphs", "fdp"\r
     \r
     optPropScope.AddItem "Graph"\r
     optPropScope.AddItem "Node"\r
@@ -547,6 +551,8 @@ Private Sub Form_Load()
     optLayoutEngine.AddItem "dot"\r
     optLayoutEngine.AddItem "neato"\r
     optLayoutEngine.AddItem "twopi"\r
+    optLayoutEngine.AddItem "circo"\r
+    optLayoutEngine.AddItem "fdp"\r
     \r
     optOutputType.AddItem "ps"\r
     optOutputType.AddItem "ps2"\r