From f292fb06b04f702882afd3cbee7ec2f24b4c20c9 Mon Sep 17 00:00:00 2001
From: RoyThomsonMonash <roy.thomson@monash.edu>
Date: Thu, 30 May 2024 15:06:53 +1000
Subject: [PATCH 1/3] fix: Add multiple thicknesses to stratigraphic layers

---
 LoopProjectFile/LoopProjectFile.py      | 12 +++++++++---
 LoopProjectFile/LoopProjectFileUtils.py |  4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/LoopProjectFile/LoopProjectFile.py b/LoopProjectFile/LoopProjectFile.py
index 126b6bc..9a045e1 100644
--- a/LoopProjectFile/LoopProjectFile.py
+++ b/LoopProjectFile/LoopProjectFile.py
@@ -63,6 +63,12 @@ class EventRelationshipType(enum.IntEnum):
     FAULT_FAULT_ABUT = 3
     FAULT_FAULT_OVERPRINT = 4
 
+class ThickenessCalculatorType(enum.IntEnum):
+    ALPHA = 0
+    INTERPOLATED_STRUCTURE = 1
+    STRUCTURAL_POINT = 2
+    PLACEHOLDER_1 = 3
+    PLACEHOLDER_2 = 4
 
 # ###  External Accessors ### #
 
@@ -733,9 +739,9 @@ def CheckFileValid(filename, verbose=False):
         ("group", "S120"),
         ("supergroup", "S120"),
         ("enabled", "u1"),
-        ("ThicknessMean", "<f8"),
-        ("ThicknessMedian", "<f8"),
-        ("ThicknessStdDev", "<f8"),
+        ("ThicknessMean", "<f8", len(ThickenessCalculatorType)),
+        ("ThicknessMedian", "<f8", len(ThickenessCalculatorType)),
+        ("ThicknessStdDev", "<f8", len(ThickenessCalculatorType)),
         ("colour1Red", "u1"),
         ("colour1Green", "u1"),
         ("colour1Blue", "u1"),
diff --git a/LoopProjectFile/LoopProjectFileUtils.py b/LoopProjectFile/LoopProjectFileUtils.py
index bd5a327..8fe1f41 100644
--- a/LoopProjectFile/LoopProjectFileUtils.py
+++ b/LoopProjectFile/LoopProjectFileUtils.py
@@ -2,6 +2,7 @@
 import pandas
 import os
 import sys
+import numpy
 import LoopProjectFile
 
 
@@ -305,7 +306,8 @@ def ElementToDataframe(loopFilename, element, loopCompoundType):
         columns = list(loopCompoundType.names)
         df = pandas.DataFrame.from_records(resp["value"], columns=columns)
         for name in columns:
-            df[name] = df[name].astype(loopCompoundType[name])
+            if type(loopCompoundType[name]) != numpy.dtypes.VoidDType:
+                df[name] = df[name].astype(loopCompoundType[name])
         df = df.map(lambda x: x.decode() if isinstance(x, bytes) else x)
         # df.set_index(columns[0], inplace=True)
         return df  # .to_csv(outputFilename)

From 2fde957a4c759cdbee3ccefb6cb9d7ee065344a2 Mon Sep 17 00:00:00 2001
From: AngRodrigues <angela.rodrigues@monash.edu>
Date: Thu, 20 Jun 2024 11:18:11 +1000
Subject: [PATCH 2/3] fix: add appropriate shape

---
 LoopProjectFile/LoopProjectFile.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/LoopProjectFile/LoopProjectFile.py b/LoopProjectFile/LoopProjectFile.py
index 9a045e1..c54bef3 100644
--- a/LoopProjectFile/LoopProjectFile.py
+++ b/LoopProjectFile/LoopProjectFile.py
@@ -739,9 +739,9 @@ def CheckFileValid(filename, verbose=False):
         ("group", "S120"),
         ("supergroup", "S120"),
         ("enabled", "u1"),
-        ("ThicknessMean", "<f8", len(ThickenessCalculatorType)),
-        ("ThicknessMedian", "<f8", len(ThickenessCalculatorType)),
-        ("ThicknessStdDev", "<f8", len(ThickenessCalculatorType)),
+        ("ThicknessMean", "<f8", (len(ThickenessCalculatorType)), ),
+        ("ThicknessMedian", "<f8", (len(ThickenessCalculatorType)), ),
+        ("ThicknessStdDev", "<f8", (len(ThickenessCalculatorType)), ),
         ("colour1Red", "u1"),
         ("colour1Green", "u1"),
         ("colour1Blue", "u1"),

From 53df818c7bd05e672f41a81a19b8da8e244e3c22 Mon Sep 17 00:00:00 2001
From: AngRodrigues <angela.rodrigues@monash.edu>
Date: Thu, 20 Jun 2024 11:24:05 +1000
Subject: [PATCH 3/3] fix: change the versions

---
 LoopProjectFile/Version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LoopProjectFile/Version.py b/LoopProjectFile/Version.py
index 4b773c6..f6a5190 100644
--- a/LoopProjectFile/Version.py
+++ b/LoopProjectFile/Version.py
@@ -1,4 +1,4 @@
-__version__ = "0.1.0"
+__version__ = "0.1.4"
 
 
 # Current Loop Project File Version