Add storage for raw data into project file. Version bump

Author: RoyThomsonMonash

LoopProjectFile/DataCollection.py

@@ -683,7 +683,7 @@ def SetDefaultConfiguration(root, verbose=False):
     return response
 
 
-# Extract data collection (map2loop) sources settings
+# Extract data collection (map2loop) source urls
 def GetSources(root, verbose=False):
     response = {"errorFlag": False}
     resp = GetDataCollectionGroup(root)
@@ -710,7 +710,7 @@ def GetSources(root, verbose=False):
     return response
 
 
-# Set data collection (map2loop) configuration settings
+# Set data collection (map2loop) source urls
 def SetSources(root, data, verbose=False):
     """
     **SetConfiguration** - Saves the settings for the data collection step
@@ -756,7 +756,7 @@ def SetSources(root, data, verbose=False):
     return response
 
 
-# Create Default data collection (map2loop) source settings
+# Create Default data collection (map2loop) source urls
 def SetDefaultSources(root, verbose=False):
     response = {"errorFlag": False}
     resp = GetDataCollectionGroup(root)
@@ -774,3 +774,81 @@ def SetDefaultSources(root, verbose=False):
     dcGroup.metadataUrl = ""
     dcGroup.sourceTags = ""
     return response
+
+
+# Extract data collection (map2loop) raw data
+def GetRawSourceData(root, verbose=False):
+    response = {"errorFlag": False}
+    resp = GetDataCollectionGroup(root)
+    if resp["errorFlag"]:
+        response = resp
+    else:
+        dcGroup = resp["value"]
+        data = {}
+        if "structureRawData" in dcGroup.ncattrs():
+            data["structureRawData"] = dcGroup.structureRawData
+        if "geologyRawData" in dcGroup.ncattrs():
+            data["geologyRawData"] = dcGroup.geologyRawData
+        if "faultRawData" in dcGroup.ncattrs():
+            data["faultRawData"] = dcGroup.faultRawData
+        if "foldRawData" in dcGroup.ncattrs():
+            data["foldRawData"] = dcGroup.foldRawData
+        response["value"] = data
+    return response
+
+
+# Set data collection raw data
+def SetRawSourceData(root, data, verbose=False):
+    """
+    **SetConfiguration** - Saves the settings for the data collection step
+
+    Parameters
+    ----------
+    rootGroup: netCDF4.Group
+        The root group node of a Loop Project File
+    data: dictionary {str: str,...}
+        A dictionary with the data colletion settings
+    verbose: bool
+        A flag to indicate a higher level of console logging (more if True)
+
+    Returns
+    -------
+       dict {"errorFlag", "errorString"}
+        errorString exist and contains error message only when errorFlag is
+        True
+
+    """
+    response = {"errorFlag": False}
+    resp = GetDataCollectionGroup(root)
+    if resp["errorFlag"]:
+        # Create Structural Models Group and add data shape based on project extents
+        dcGroup = root.createGroup("DataCollection")
+    else:
+        dcGroup = resp["value"]
+
+    if (data.contains("structureRawData")):
+        dcGroup.structureRawData = data.structureRawData
+    if (data.contains("geologyRawData")):
+        dcGroup.geologyRawData = data.geologyRawData
+    if (data.contains("faultRawData")):
+        dcGroup.faultRawData = data.faultRawData
+    if (data.contains("foldRawData")):
+        dcGroup.foldRawData = data.foldRawData
+    return response
+
+
+# Create blank data collection data
+def SetDefaultRawSourceData(root, verbose=False):
+    response = {"errorFlag": False}
+    resp = GetDataCollectionGroup(root)
+    if resp["errorFlag"]:
+        dcGroup = root.createGroup("DataCollection")
+    else:
+        dcGroup = resp["value"]
+
+    dcGroup.structureRawData = ""
+    dcGroup.geologyRawData = ""
+    dcGroup.faultRawData = ""
+    dcGroup.foldRawData = ""
+
+    return response

LoopProjectFile/LoopProjectFile.py

@@ -92,6 +92,8 @@ def CreateBasic(filename):
         response = Version.SetVersion(rootGroup, version=Version.LoopVersion())
         if not response['errorFlag']:
             response = DataCollection.SetDefaultSources(rootGroup)
+        if not response['errorFlag']:
+            response = DataCollection.SetDefaultRawSourceData(rootGroup)
         if not response['errorFlag']:
             response = DataCollection.SetDefaultConfiguration(rootGroup)
         if not response['errorFlag']:
@@ -279,6 +281,8 @@ def Set(filename, element, **kwargs):
             response = DataCollection.SetConfiguration(root, **kwargs)
         elif element == "dataCollectionSources":
             response = DataCollection.SetSources(root, **kwargs)
+        elif element == "dataCollectionRawSourceData":
+            response = DataCollection.SetRawSourceData(root, **kwargs)
         elif element == "eventRelationships":
             response = ExtractedInformation.SetEventRelationships(root, **kwargs)
         elif element == "structuralModelsConfig":
@@ -390,6 +394,8 @@ def Get(filename, element, **kwargs):
             response = DataCollection.GetConfiguration(root, **kwargs)
         elif element == "dataCollectionSources":
             response = DataCollection.GetSources(root, **kwargs)
+        elif element == "dataCollectionRawSourceData":
+            response = DataCollection.GetRawSourceData(root, **kwargs)
         elif element == "eventRelationships":
             response = ExtractedInformation.GetEventRelationships(root, **kwargs)
         elif element == "structuralModelsConfig":

LoopProjectFile/Version.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.22"
+__version__ = "0.0.23"
 
 
 # Current Loop Project File Version
@@ -68,8 +68,8 @@ def GetVersion(rootGroup):
         value is a [int,int,int] of the version of this project file
 
     """
-    if CheckVersionValid(rootGroup, True):
-        return {"errorFlag": False, "value": [rootGroup.loopMajorVersion, rootGroup.loopMinorVersion, rootGroup.loopSubVersion]}
+    if CheckVersionValid(rootGroup):
+        return {"errorFlag": False, "value": list(map(int, [rootGroup.loopMajorVersion, rootGroup.loopMinorVersion, rootGroup.loopSubVersion]))}
     else:
         return {"errorFlag": True, "errorString": "No valid Version in Loop Project File"}