Frame V13 support added for imagery.

halmaia · Aug 7, 2023 · 71a4140 · 71a4140
1 parent 7129a6a
commit 71a4140
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/BitmapCompressionMode.cs b/BitmapCompressionMode.cs
@@ -8,5 +8,5 @@ internal enum BitmapCompressionMode : uint
         BI_BITFIELDS = 3,
         BI_JPEG = 4,
         BI_PNG = 5
-    }
+    };
 }
diff --git a/Frame.cs b/Frame.cs
@@ -7,6 +7,8 @@
 
 namespace SL3Reader
 {
+    // We might need a refactoring. Seemingly it is not a single frame, but one long header,
+    // and extra information panel and the data itself.
     [StructLayout(LayoutKind.Explicit, Size = ExtendedSizeV10)]
     [DebuggerDisplay($"{{{nameof(GetDebuggerDisplay)}(),nq}}")]
     public readonly struct Frame

diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "SL3Reader": {
       "commandName": "Project",
-      "commandLineArgs": "\"C:\\Users\\halmaia\\Downloads\\Sonar_2023-08-06_12.43.36.sl3\"  F:\\3D.csv -3dg"
+      "commandLineArgs": "\"C:\\Users\\halmaia\\Downloads\\Sonar_2023-08-06_12.43.36.sl3\"  F:\\DS\\ -DS"
     }
   }
 }
diff --git a/SL3Reader.cs b/SL3Reader.cs
@@ -275,7 +275,7 @@ public unsafe void ExportImagery(string path, SurveyType surveyType = SurveyType
                     out Span<byte> fileBuffer,
                     out Span<byte> pixelData);
 
-                byte* offset = ((Frame*)imageFrames[0])->FrameType is FrameType.Basic ? (byte*)Frame.BasicSize : (byte*)Frame.ExtendedSizeV10;
+                byte* offset = (byte*)((Frame*)imageFrames[0])->RelativeDataOffset;
 
                 fixed (byte* pixelPtr = pixelData)
                     for (int j = first, k = 0; j < final; j++)
@@ -290,9 +290,9 @@ public unsafe void ExportImagery(string path, SurveyType surveyType = SurveyType
                 // World file
 
                 // TODO: Remove intermediate solution:
-                var firstStrip = AugmentedCoordinates[Frames.IndexOf(imageFrames[first])];
-                var lastStrip = AugmentedCoordinates[Frames.IndexOf(imageFrames[final - 1])];
-                var lastFrame = (Frame*)imageFrames[final - 1];
+                GeoPoint firstStrip = AugmentedCoordinates[Frames.IndexOf(imageFrames[first])];
+                GeoPoint lastStrip = AugmentedCoordinates[Frames.IndexOf(imageFrames[final - 1])];
+                Frame* lastFrame = (Frame*)imageFrames[final - 1];
 
                 // TODO: Nem jó!
                 double XSize = -(lastStrip.Distance - firstStrip.Distance) / (final - first);