Merge branch 'dim_limits'

Author: RoyThomsonMonash

LoopProjectFile/DataCollection.py

@@ -70,6 +70,11 @@ def GetDrillholesGroup(rootGroup, verbose=False):
 
 def CreateObservationGroup(dataCollectionGroup):
     obGroup = dataCollectionGroup.createGroup("Observations")
+    obGroup.setncattr("faultObservationIndex_MaxValid", -1)
+    obGroup.setncattr("foldObservationIndex_MaxValid", -1)
+    obGroup.setncattr("foliationObservationIndex_MaxValid", -1)
+    obGroup.setncattr("discontinuityObservationIndex_MaxValid", -1)
+    obGroup.setncattr("stratigraphicObservationIndex_MaxValid", -1)
     obGroup.createDimension("faultObservationIndex", None)
     obGroup.createDimension("foldObservationIndex", None)
     obGroup.createDimension("foliationObservationIndex", None)
@@ -90,6 +95,9 @@ def CreateObservationGroup(dataCollectionGroup):
 
 def CreateDrillholeGroup(dataCollectionGroup):
     dhGroup = dataCollectionGroup.createGroup("Drillholes")
+    dhGroup.setncattr("drillholeObservationIndex_MaxValid", -1)
+    dhGroup.setncattr("drillholeSurveyIndex_MaxValid", -1)
+    dhGroup.setncattr("drillholePropertyIndex_MaxValid", -1)
     dhGroup.createDimension("drillholeObservationIndex", None)
     dhGroup.createDimension("drillholeSurveyIndex", None)
     dhGroup.createDimension("drillholePropertyIndex", None)
@@ -113,30 +121,31 @@ def GetObservations(root, indexName, variableName, indexList=[], indexRange=(0,
             print("Getting variable " + variableName)
         oGroup = resp["value"]
         data = []
+        maxValidIndex = min(oGroup.dimensions[indexName].size, oGroup.getncattr(indexName + "_MaxValid"))
         # Select all option
         if (indexList == [] and len(indexRange) == 2 and indexRange[0] == 0
                 and indexRange[1] == 0 and keyword == ""):
             if verbose:
                 print("Getting all")
             # Create list of observations as:
             # ((easting, northing, altitude), dipdir, dip, formation, layer)
-            for i in range(0, oGroup.dimensions[indexName].size):
+            for i in range(0, maxValidIndex):
                 data.append((oGroup.variables.get(variableName)[i]))
             response["value"] = data
         # Select based on keyword and list of indices option
         elif keyword != "" and indexList != []:
             if verbose:
                 print("Getting keyword and index list")
             for i in indexList:
-                if (int(i) >= 0 and int(i) < oGroup.dimensions[indexName].size
+                if (int(i) >= 0 and int(i) < maxValidIndex
                         and oGroup.variables.get(variableName)[i] == keyword):
                     data.append((oGroup.variables.get(variableName)[i]))
             response["value"] = data
         # Select based on keyword option
         elif keyword != "":
             if verbose:
                 print("Getting keyword")
-            for i in range(0, oGroup.dimensions[indexName].size):
+            for i in range(0, maxValidIndex):
                 if oGroup.variables.get(variableName)[i] == keyword:
                     data.append((oGroup.variables.get(variableName)[i]))
             response["value"] = data
@@ -145,15 +154,15 @@ def GetObservations(root, indexName, variableName, indexList=[], indexRange=(0,
             if verbose:
                 print("Getting index list")
             for i in indexList:
-                if int(i) >= 0 and int(i) < oGroup.dimensions[indexName].size:
+                if int(i) >= 0 and int(i) < maxValidIndex:
                     data.append((oGroup.variables.get(variableName)[i]))
             response["value"] = data
         # Select based on indices range option
         elif len(indexRange) == 2 and indexRange[0] >= 0 and indexRange[1] >= indexRange[0]:
             if verbose:
                 print("Getting index range")
             for i in range(indexRange[0], indexRange[1]):
-                if int(i) >= 0 and int(i) < oGroup.dimensions[indexName].size:
+                if int(i) >= 0 and int(i) < maxValidIndex:
                     data.append((oGroup.variables.get(variableName)[i]))
             response["value"] = data
         else:
@@ -224,13 +233,13 @@ def SetObservations(root, data, indexName, variableName, append=False, verbose=F
 
     if oGroup:
         observationLocation = oGroup.variables[variableName]
+        index = 0
         if append:
             index = oGroup.dimensions[indexName].size
-        else:
-            index = 0
         for i in data:
             observationLocation[index] = i
             index += 1
+        oGroup.setncattr(indexName + "_MaxValid", index)
     else:
         errStr = "(ERROR) Failed to Create observations group for observations setting"
         if verbose:
@@ -269,37 +278,38 @@ def GetContacts(root, indexList=[], indexRange=(0, 0), keyword="", verbose=False
     else:
         group = resp["value"]
         data = []
+        maxValidIndex = min(group.dimensions['index'].size, group.getncattr("index_MaxValid"))
         # Select all option
         if (indexList == [] and len(indexRange) == 2 and indexRange[0] == 0
                 and indexRange[1] == 0 and keyword == ""):
             # Create list of observations as:
             # ((easting, northing, altitude), dipdir, dip, formation, layer)
-            for i in range(0, group.dimensions['index'].size):
+            for i in range(0, maxValidIndex):
                 data.append((group.variables.get('contacts')[i]))
             response["value"] = data
         # Select based on keyword and list of indices option
         elif keyword != "" and indexList != []:
             for i in indexList:
-                if (int(i) >= 0 and int(i) < group.dimensions['index'].size
+                if (int(i) >= 0 and int(i) < maxValidIndex
                         and group.variables.get('layer')[i] == keyword):
                     data.append((group.variables.get('contacts')[i]))
             response["value"] = data
         # Select based on keyword option
         elif keyword != "":
-            for i in range(0, group.dimensions['index'].size):
+            for i in range(0, maxValidIndex):
                 if group.variables.get('layer')[i] == keyword:
                     data.append((group.variables.get('contacts')[i]))
             response["value"] = data
         # Select based on list of indices option
         elif indexList != []:
             for i in indexList:
-                if int(i) >= 0 and int(i) < group.dimensions['index'].size:
+                if int(i) >= 0 and int(i) < maxValidIndex:
                     data.append((group.variables.get('contacts')[i]))
             response["value"] = data
         # Select based on indices range option
         elif len(indexRange) == 2 and indexRange[0] >= 0 and indexRange[1] >= indexRange[0]:
             for i in range(indexRange[0], indexRange[1]):
-                if int(i) >= 0 and int(i) < group.dimensions['index'].size:
+                if int(i) >= 0 and int(i) < maxValidIndex:
                     data.append((group.variables.get('contacts')[i]))
             response["value"] = data
         else:
@@ -346,6 +356,7 @@ def SetContacts(root, data, append=False, verbose=False):
     resp = GetContactsGroup(root)
     if resp["errorFlag"]:
         group = dcGroup.createGroup("Contacts")
+        group.setncattr("index_MaxValid", -1)
         group.createDimension("index", None)
         contactObservationType_t = group.createCompoundType(LoopProjectFile.contactObservationType, 'contactObservation')
         group.createVariable('contacts', contactObservationType_t, ('index'), zlib=True, complevel=9)
@@ -354,13 +365,13 @@ def SetContacts(root, data, append=False, verbose=False):
 
     if group:
         contactsLocation = group.variables['contacts']
+        index = 0
         if append:
             index = group.dimensions['index'].size
-        else:
-            index = 0
         for i in data:
             contactsLocation[index] = i
             index += 1
+        group.setncattr("index_MaxValid", index)
     else:
         errStr = "(ERROR) Failed to Create contacts group for contact setting"
         if verbose:
@@ -379,37 +390,38 @@ def GetDrillholeData(root, indexName, variableName, indexList=[], indexRange=(0,
     else:
         group = resp["value"]
         data = []
+        maxValidIndex = min(group.dimensions[indexName].size, group.getncattr(indexName + "_MaxValid"))
         # Select all option
         if (indexList == [] and len(indexRange) == 2 and indexRange[0] == 0
                 and indexRange[1] == 0 and keyword == ""):
             # Create list of observations as:
             # ((easting, northing, altitude), dipdir, dip, formation, layer)
-            for i in range(0, group.dimensions[indexName].size):
+            for i in range(0, maxValidIndex):
                 data.append((group.variables.get(variableName)[i]))
             response["value"] = data
         # Select based on keyword and list of indices option
         elif keyword != "" and indexList != []:
             for i in indexList:
-                if (int(i) >= 0 and int(i) < group.dimensions[indexName].size
+                if (int(i) >= 0 and int(i) < maxValidIndex
                         and group.variables.get('layer')[i] == keyword):
                     data.append((group.variables.get(variableName)[i]))
             response["value"] = data
         # Select based on keyword option
         elif keyword != "":
-            for i in range(0, group.dimensions[indexName].size):
+            for i in range(0, maxValidIndex):
                 if group.variables.get('layer')[i] == keyword:
                     data.append((group.variables.get(variableName)[i]))
             response["value"] = data
         # Select based on list of indices option
         elif indexList != []:
             for i in indexList:
-                if int(i) >= 0 and int(i) < group.dimensions[indexName].size:
+                if int(i) >= 0 and int(i) < maxValidIndex:
                     data.append((group.variables.get(variableName)[i]))
             response["value"] = data
         # Select based on indices range option
         elif len(indexRange) == 2 and indexRange[0] >= 0 and indexRange[1] >= indexRange[0]:
             for i in range(indexRange[0], indexRange[1]):
-                if int(i) >= 0 and int(i) < group.dimensions[indexName].size:
+                if int(i) >= 0 and int(i) < maxValidIndex:
                     data.append((group.variables.get(variableName)[i]))
             response["value"] = data
         else:
@@ -473,13 +485,13 @@ def SetDrillholeData(root, data, indexName, variableName, append=False, verbose=
 
     if group:
         drillholeObservationsLocation = group.variables[variableName]
+        index = 0
         if append:
             index = group.dimensions[indexName].size
-        else:
-            index = 0
         for i in data:
             drillholeObservationsLocation[index] = i
             index += 1
+        group.setncattr(indexName + "_MaxValid", index)
     else:
         errStr = "(ERROR) Failed to Create drillhole group for drillhole setting"
         if verbose: