Add FileType Support in TEst01

Author: caigen

GraphLayout/Samples/LoadingDgmlGraph/Program.cs

@@ -1,12 +1,14 @@
 
 
+using System;
 using Microsoft.Msagl.Drawing;
 using Microsoft.Msagl.Layout.Incremental;
 using Microsoft.Msagl.Layout.Layered;
 using Microsoft.Msagl.Layout.MDS;
 
 namespace LoadingDgmlGraph {
     class Program {
+        [STAThread]
         static void Main(string[] args) {
             Microsoft.Msagl.GraphViewerGdi.DisplayGeometryGraph.SetShowFunctions();
             //create a form

GraphLayout/Test/TestFormForGViewer/FormStuff.cs

@@ -26,10 +26,11 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
+using DgmlParser;
 using Dot2Graph;
 using Microsoft.Msagl.Drawing;
 using Microsoft.Msagl.GraphViewerGdi;
@@ -41,7 +42,7 @@ public class FormStuff {
         protected static GViewer GViewer;
 
         public static Form CreateOrAttachForm(GViewer gviewer, Form form) {
-            GViewer=gviewer;
+            GViewer = gviewer;
             if (form == null)
                 form = new Form();
             form.SuspendLayout();
@@ -58,13 +59,13 @@ public static Form CreateOrAttachForm(GViewer gviewer, Form form) {
             return form;
         }
 
-        static void form_Load(object sender,EventArgs e) {
-            ((Form) sender).Focus();
+        static void form_Load(object sender, EventArgs e) {
+            ((Form)sender).Focus();
         }
 
 
         static MenuStrip GetMainMenuStrip() {
-            var menu=new MenuStrip();
+            var menu = new MenuStrip();
             menu.Items.Add(FileStripItem());
 
             return menu;
@@ -73,7 +74,7 @@ static MenuStrip GetMainMenuStrip() {
 
         static ToolStripItem FileStripItem() {
             var item = new ToolStripMenuItem("File");
-            item.DropDownItems.Add((ToolStripItem) OpenDotFileItem());
+            item.DropDownItems.Add((ToolStripItem)OpenDotFileItem());
             item.DropDownItems.Add(ReloadDotFileItem());
             return item;
         }
@@ -86,8 +87,8 @@ static ToolStripItem ReloadDotFileItem() {
         }
 
         static void ReloadFileClick(object sender, EventArgs e) {
-          if(lastFileName!=null)
-              ReadGraphFromFile(lastFileName, GViewer, false);
+            if (lastFileName != null)
+                ReadGraphFromFile(lastFileName, GViewer, false);
         }
 
         static ToolStripItem OpenDotFileItem() {
@@ -101,7 +102,7 @@ static void OpenFileClick(object sender, EventArgs e) {
 
             var openFileDialog = new OpenFileDialog {
                 RestoreDirectory = true,
-                Filter = "DOT (*.dot,*.gv)|*.dot;*.gv| All(*.*)|*.*"
+                Filter = "MSAGL Files(*.msagl)|*.msagl|DOT (*.dot,*.gv)|*.dot;*.gv|DGML Files(*.dgml)|*.dgml|All(*.*)|*.*"
             };
 
             if (openFileDialog.ShowDialog() == DialogResult.OK)
@@ -110,24 +111,46 @@ static void OpenFileClick(object sender, EventArgs e) {
 
         internal static Graph CreateDrawingGraphFromFile(string fileName, out int line, out int column, out bool msaglFile) {
             string msg;
-            var graph = Parser.Parse(fileName, out line, out column, out msg);
-            if (graph != null) {
-                msaglFile = false;
-                return graph;
+            Graph graph = null;
+            msaglFile = false;
+            line = column = 0;
+
+            // Get extension
+            string ext = Path.GetExtension(fileName);
+            switch (ext.ToLower()) {
+                case ".dgml":
+                    try {
+                        graph = DgmlParser.DgmlParser.Parse(fileName);
+                        line = column = 0;
+                        return graph;
+                    }
+                    catch (Exception) {
+                        System.Diagnostics.Debug.WriteLine("cannot read " + fileName);
+                    }
+                    break;
+                case ".dot":
+                case ".gv":
+                    graph = Parser.Parse(fileName, out line, out column, out msg);
+                    if (graph != null) {
+                        return graph;
+                    }
+                    break;
+                case ".msagl":
+                default:
+                    try {
+                        graph = Graph.Read(fileName);
+                        msaglFile = true;
+                        return graph;
+                    }
+                    catch (Exception) {
+                        System.Diagnostics.Debug.WriteLine("cannot read " + fileName);
+                    }
+                    break;
             }
 
-            try {
-                graph = Graph.Read(fileName);
-                msaglFile = true;
-                return graph;
-            } catch (Exception) {
-                System.Diagnostics.Debug.WriteLine("cannot read " + fileName);
-            }
-            msaglFile = false;
-            return null;
+            return graph;
         }
 
-
         public static void ReadGraphFromFile(string fileName, GViewer gViewer, bool verbose) {
             int eLine, eColumn;
             bool msaglFile;

GraphLayout/Test/TestFormForGViewer/TestFormForGViewer.csproj

@@ -13,6 +13,7 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\Drawing\AutomaticGraphLayout.Drawing.csproj" />
+		<ProjectReference Include="..\..\tools\DgmlParser\DgmlParser.csproj" />
 		<ProjectReference Include="..\..\tools\GraphViewerGDI\GraphViewerGDI.csproj" />
 		<ProjectReference Include="..\..\MSAGL\AutomaticGraphLayout.csproj" />
 		<ProjectReference Include="..\..\tools\Dot2Graph\Dot2Graph.csproj" />