user interface handling of multi-part, null geometries

Riverscapes · Nov 6, 2018 · f360279 · f360279
1 parent 16ddd46
commit f360279
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 25 deletions.
diff --git a/GCDAddIn/Project/btnOpenProject.cs b/GCDAddIn/Project/btnOpenProject.cs
@@ -31,15 +31,14 @@ protected override void OnClick()
                 {
                     try
                     {
-                        GCDCore.Project.ProjectManager.OpenProject(new System.IO.FileInfo(f.FileName));
-                        GCDCore.Properties.Settings.Default.LastUsedProjectFolder = System.IO.Path.GetDirectoryName(f.FileName);
-                        GCDCore.Properties.Settings.Default.Save();
-
-                        btnProjectExplorer.ShowProjectExplorer(true);
+                        if (GCDCore.Project.ProjectManager.OpenProject(new System.IO.FileInfo(f.FileName)))
+                        {
+                            btnProjectExplorer.ShowProjectExplorer(true);
+                        }
                     }
                     catch (Exception ex)
                     {
-                        MessageBox.Show(string.Format("Error reading the GCD project file '{0}'. Ensure that the file is a valid GCD project file with valid and complete XML contents.\n\n{1}", f.FileName, ex.Message), GCDCore.Properties.Resources.ApplicationNameLong, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        GCDCore.GCDException.HandleException(ex);
                     }
                 }
             }

diff --git a/GCDConsoleLib/Vector.cs b/GCDConsoleLib/Vector.cs
@@ -150,7 +150,6 @@ public override void Open(bool write = false)
                 {
                     Exception ex = new Exception("Could not open shapefile. Null dataset detected.");
                     ex.Data["File Path"] = GISFileInfo.FullName;
-                    ex.Data["MultiPart"] = "true";
                     throw ex;
                 }
                 _drv = _ds.GetDriver();
@@ -451,7 +450,7 @@ private void _load(bool leaveopen = false)
                         {
                             Exception ex = new Exception("Multi-part geometries are detected in this file. This is not allowed.");
                             ex.Data["File Path"] = GISFileInfo.FullName;
-                            ex.Data["MultiPart"] = "true";
+                            ex.Data["Solution"] = "Remove all multipart features from this ShapeFile.";
                             throw ex;
                         }
                         else

diff --git a/GCDCore/Project/ProjectManager.cs b/GCDCore/Project/ProjectManager.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Windows.Forms;
 
 namespace GCDCore.Project
 {
@@ -93,21 +94,40 @@ public static void CreateProject(GCDProject project)
             Project = project;
         }
 
-        public static void OpenProject(FileInfo projectFile)
+        public static bool OpenProject(FileInfo projectFile)
         {
-            Project = GCDProject.Load(projectFile);
-        }
+            bool success = false;
 
-        public static void RefreshProject()
-        {
-            Project = GCDProject.Load(Project.ProjectFile);
-        }
+            try
+            {
+                Project = GCDProject.Load(projectFile);
+                Properties.Settings.Default.LastUsedProjectFolder = Path.GetDirectoryName(projectFile.FullName);
+                Properties.Settings.Default.Save();
+                success = true;
+            }
+            catch (Exception ex)
+            {
+                success = false;
 
-        public static void OpenProject(GCDProject project)
-        {
-            Project = project;
+                string msg = string.Format("Failed to open the GCD project file:\n\n{0}", projectFile.FullName);
+
+                if (ex.Data.Contains("File Path"))
+                {
+                    msg += string.Format("\n\n{0}\n\n{1}", ex.Message, ex.Data["File Path"]);
+                }
+
+                if (ex.Data.Contains("Solution"))
+                {
+                    msg += string.Format("\n\n{0}",ex.Data["Solution"]);
+                }
+
+                MessageBox.Show(msg, Properties.Resources.ApplicationNameLong, MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+
+            return success;
         }
 
+
         public static void CloseCurrentProject()
         {
             Project = null;

diff --git a/GCDCore/UserInterface/Project/TreeNodeTypes/GCDProjectGroup.cs b/GCDCore/UserInterface/Project/TreeNodeTypes/GCDProjectGroup.cs
@@ -106,7 +106,7 @@ public void OnRefresh(object sender, EventArgs e)
             }
             catch (Exception ex)
             {
-                GCDException.HandleException(ex, "Error Editing GCD Project Item");
+                GCDException.HandleException(ex, "Error refreshing GCD project explorer tree.");
             }
         }
 

diff --git a/GCDCore/UserInterface/SurveyLibrary/GISDatasetValidation.cs b/GCDCore/UserInterface/SurveyLibrary/GISDatasetValidation.cs
@@ -134,5 +134,26 @@ public static bool DSHorizUnitsMatchProject(GISDataset gisDS, string sTypeSingle
             return true;
         }
 
+        public static bool DSGeometryTypeMatches(Vector vectorDS, GDalGeometryType.SimpleTypes eGeometryType)
+        {
+            if (vectorDS.GeometryType.SimpleType != eGeometryType)
+            {
+                string requiredTypeName = string.Empty;
+                switch(eGeometryType)
+                {
+                    case GDalGeometryType.SimpleTypes.Point: requiredTypeName = "point"; break;
+                    case GDalGeometryType.SimpleTypes.LineString: requiredTypeName = "line";break;
+                    case GDalGeometryType.SimpleTypes.Polygon: requiredTypeName = "polygon"; break;
+                    default:
+                        throw new Exception("Unhandled geometry type");
+                }
+
+                MessageBox.Show(string.Format("The selected feature class does not contain {0} geometry features. Please choose a {0} ShapeFile.", requiredTypeName),
+                    "Geometry Type Mismatch", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                return false;
+            }
+
+            return true;
+        }
     }
 }
diff --git a/GCDCore/UserInterface/SurveyLibrary/frmPointDensity.cs b/GCDCore/UserInterface/SurveyLibrary/frmPointDensity.cs
@@ -90,9 +90,10 @@ private bool ValidateForm()
 
             if (ucPointCloud.SelectedItem is GCDConsoleLib.Vector)
             {
-                if (!UserInterface.SurveyLibrary.GISDatasetValidation.DSHasSpatialRef(ucPointCloud.SelectedItem, "feature class", "feature classes") ||
-                    !UserInterface.SurveyLibrary.GISDatasetValidation.DSSpatialRefMatchesProjectWithMsgbox(ucPointCloud.SelectedItem, "feature class", "feature classes") ||
-                    !UserInterface.SurveyLibrary.GISDatasetValidation.DSHorizUnitsMatchProject(ucPointCloud.SelectedItem, "feature class", "feature classes"))
+                if (!GISDatasetValidation.DSHasSpatialRef(ucPointCloud.SelectedItem, "feature class", "feature classes") ||
+                    !GISDatasetValidation.DSSpatialRefMatchesProjectWithMsgbox(ucPointCloud.SelectedItem, "feature class", "feature classes") ||
+                    !GISDatasetValidation.DSHorizUnitsMatchProject(ucPointCloud.SelectedItem, "feature class", "feature classes") ||
+                    !GISDatasetValidation.DSGeometryTypeMatches((Vector) ucPointCloud.SelectedItem, GDalGeometryType.SimpleTypes.Point))
                 {
                     ucPointCloud.Select();
                     return false;

diff --git a/GCDStandalone/frmMain.cs b/GCDStandalone/frmMain.cs
@@ -206,7 +206,7 @@ private void openGCDProjectToolStripMenuItem_Click(object sender, EventArgs e)
                 }
                 catch (Exception ex)
                 {
-                    MessageBox.Show(string.Format("Error reading the GCD project file '{0}'. Ensure that the file is a valid GCD project file with valid and complete XML contents.\n\n{1}", f.FileName, ex.Message), GCDCore.Properties.Resources.ApplicationNameLong, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    GCDCore.GCDException.HandleException(ex);
                 }
             }
 
@@ -217,8 +217,8 @@ private void OpenGCDProject(string gcdProject)
         {
             // Set the project file path first (which will attempt to read the XML file and throw an error if anything goes wrong)
             // Then set the settings if the read was successful.
-            ProjectManager.OpenProject(new System.IO.FileInfo(gcdProject));
-            GCDCore.Properties.Settings.Default.LastUsedProjectFolder = System.IO.Path.GetDirectoryName(gcdProject);
+            if (!ProjectManager.OpenProject(new System.IO.FileInfo(gcdProject)))
+                return;
 
             try
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,7 +106,7 @@ public void OnRefresh(object sender, EventArgs e) @@
                 }
                 catch (Exception ex)
                 {
-                    GCDException.HandleException(ex, "Error Editing GCD Project Item");
+                    GCDException.HandleException(ex, "Error refreshing GCD project explorer tree.");
                 }
             }
@@ Expand Down @@