Merge pull request #13 from nasa-jpl/bugfixes-2026-03

Bugfixes 2026 03

Author: martyvona

RockCollect/Form1.Designer.cs

@@ -15,6 +15,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <IsWebBootstrapper>false</IsWebBootstrapper>
+    <ApplicationIcon>rosco.ico</ApplicationIcon>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -271,7 +272,9 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="GdalConfiguration.vb" />
-    <Content Include="rosco.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="rosco.ico" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
@@ -293,4 +296,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('packages\GDAL.Native.2.4.4\build\net40\GDAL.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\GDAL.Native.2.4.4\build\net40\GDAL.Native.targets'))" />
   </Target>
-</Project>
+</Project>

RockCollect/Form1.resx

@@ -16,7 +16,7 @@ public class RockDetector
         static public readonly float SHADOW_SPLIT_RATIO = 0.5f;
         public const int TILESIZE = 550;
 
-        static public readonly float MIN_VALID_GSD = 0;
+        static public readonly float MIN_VALID_GSD = 0.001f;
         static public readonly float MAX_VALID_GSD = 100;
 
         static public readonly float MIN_VALID_AZIMUTH = 0;

RockCollect/RockCollect.csproj

@@ -67,16 +67,32 @@ public void SetGroundSamplingDistance(float metersPerPixel)
         {
             GroundSamplingDistance = metersPerPixel;
         }
+
+        public float GetGroundSamplingDistance()
+        {
+            return GroundSamplingDistance;
+        }
+
         public void SetSubSolarAzimuth(float subsolarAzimuthDegrees)
         {
             SubSolarAzimuthDegrees = subsolarAzimuthDegrees;
         }
 
+        public float GetSubSolarAzimuth()
+        {
+            return SubSolarAzimuthDegrees;
+        }
+
         public void SetSolarIncidence(float solarIncidenceDegrees)
         {
             SolarIncidenceDegrees = solarIncidenceDegrees;
         }
 
+        public float GetSolarIncidence()
+        {
+            return SolarIncidenceDegrees;
+        }
+
         public void SetComparisonRocklist(string rocklistPath)
         {
             ComparisonRocklistPath = rocklistPath;
@@ -91,5 +107,52 @@ public void SetShapeFile(string path)
         {
             ShapeFilePath = path;
         }
+
+        public override bool Deactivate(bool forward)
+        {
+            string msg = null;
+            if (string.IsNullOrEmpty(ImagePath))
+            {
+                msg = "No image file selected.";
+            }
+            else if (!File.Exists(ImagePath))
+            {
+                msg = string.Format("Image \"{0}\" not found.", ImagePath); 
+            }
+            else if (!string.IsNullOrEmpty(ShapeFilePath) && !File.Exists(ShapeFilePath))
+            {
+                msg = string.Format("Shape file \"{0}\" not found.", ShapeFilePath); 
+            }
+            else if (!string.IsNullOrEmpty(ComparisonRocklistPath) && !File.Exists(ComparisonRocklistPath))
+            {
+                msg = string.Format("Comparison rock list \"{0}\" not found.", ComparisonRocklistPath); 
+            }
+            else if (GroundSamplingDistance < RockDetector.MIN_VALID_GSD ||
+                     GroundSamplingDistance > RockDetector.MAX_VALID_GSD)
+            {
+                msg = string.Format("Ground sampling distance {0} not in range {1} to {2}.", GroundSamplingDistance,
+                                    RockDetector.MIN_VALID_GSD, RockDetector.MAX_VALID_GSD);
+            }
+            else if (SubSolarAzimuthDegrees < RockDetector.MIN_VALID_AZIMUTH ||
+                     SubSolarAzimuthDegrees > RockDetector.MAX_VALID_AZIMUTH)
+            {
+                msg = string.Format("Sub-solar azimuth angle {0} not in range {1} to {2}.", SubSolarAzimuthDegrees,
+                                    RockDetector.MIN_VALID_AZIMUTH, RockDetector.MAX_VALID_AZIMUTH);
+            }
+            else if (SolarIncidenceDegrees < RockDetector.MIN_VALID_INCIDENCE ||
+                     SolarIncidenceDegrees > RockDetector.MAX_VALID_INCIDENCE)
+            {
+                msg = string.Format("Solar incidence angle {0} not in range {1} to {2}.", SolarIncidenceDegrees,
+                                    RockDetector.MIN_VALID_INCIDENCE, RockDetector.MAX_VALID_INCIDENCE);
+            }
+
+            if (msg != null)
+            {
+                MessageBox.Show(msg, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return false;
+            }
+
+            return base.Deactivate(forward);
+        }
     }
 }

RockCollect/RockDetector.cs

@@ -144,6 +144,9 @@ private void buttonAutoFillFromComparisonRocklist_Click(object sender, EventArgs
                 numericGSD.Value = (decimal)rocklist.paramList.GSD_resolution;
                 numericIncidence.Value = (decimal)rocklist.paramList.sun_incidence_angle;
                 numericAzimuth.Value = (decimal)rocklist.paramList.sun_azimuth_angle;
+                Stage.SetGroundSamplingDistance(rocklist.paramList.GSD_resolution);
+                Stage.SetSolarIncidence(rocklist.paramList.sun_incidence_angle);
+                Stage.SetSubSolarAzimuth(rocklist.paramList.sun_azimuth_angle);
             }
             catch
             {
@@ -288,6 +291,10 @@ private void buttonAutoFillFromEDRIndex_Click(object sender, EventArgs e)
             numericGSD.Value = (decimal)gsd;
             numericIncidence.Value = (decimal)incidence;
             numericAzimuth.Value = (decimal)azimuth;
+
+            Stage.SetGroundSamplingDistance(gsd);
+            Stage.SetSolarIncidence(incidence);
+            Stage.SetSubSolarAzimuth(azimuth);
         }
 
         private void buttonShapeFile_Click(object sender, EventArgs e)