TraceWin.project new data type int:list

ess/TraceWin.py

@@ -1598,6 +1598,16 @@ class project:
                 if vals.count(True) != 1:
                     raise ValueError(f"Did not find {key} to be set correctly")
                 self._dict[key] = o[-1][vals.index(True)]
+            elif o[1] == "int:list":
+                current = "".join(hexlist[o[0] : o[0] + o[2]])
+                value = struct.unpack("i", b"".fromhex(current))[0]
+                found = False
+                for k, v in o[3].items():
+                    if v == value:
+                        self._dict[key] = k
+                        found = True
+                if not found:
+                    raise ValueError("Unknown setting {value} for {key}")
             elif o[1] == "str":
                 string = self._find_string(hexlist, o[0], o[2])
                 self._dict[key] = bytes.fromhex(string).decode("utf-8")
@@ -1642,6 +1652,14 @@ class project:
         """
         Get the type of parameter
         as specified in the reference file
+
+        d : double value
+        i : integer value,
+        int:list : integer representing a list selection
+        bool:list : booleans representing a list selection
+
+        For int:list and bool:list, recommend to use get_options()
+        to figure out how to set as a user.
         """
         return self._refdict[parameter][1]
 
@@ -1650,7 +1668,10 @@ class project:
         Get the possible options for parameter
         as specified in the reference file
         """
-        return self._refdict[parameter][-1]
+        if isinstance(self._refdict[parameter][-1], dict):
+            return list(self._refdict[parameter][-1].keys())
+        else:
+            return self._refdict[parameter][-1]
 
     def set(self, parameter, value):
         """
@@ -1663,7 +1684,7 @@ class project:
         elif isinstance(current, (float, int)):
             if not isinstance(value, (float, int)):
                 raise ValueError(f"{parameter} should be a number")
-        elif self.get_type(parameter) == "bool:list":
+        elif self.get_type(parameter) in ["bool:list", "int:list"]:
             opts = self.get_options(parameter)
             if value not in opts:
                 raise ValueError(f"{parameter} should be one of {opts}")
@@ -1750,6 +1771,11 @@ class project:
                     else:
                         t = False
                     hexlist[i] = struct.pack("?", t).hex()
+            elif o[1] == "int:list":
+                v = o[-1][v]
+                v = wrap(struct.pack("i", v).hex(), 2)
+                for i in range(len(v)):
+                    hexlist[o[0] + i] = v[i]
             elif o[1] == "str":
                 v = self._unset_string_rules(key, v)
                 h = wrap(v.encode(encoding="utf_8").hex(), 2)

ess/data/tw_project_file_reverse_engineered.json

@@ -168,8 +168,17 @@
     ],
     "mp:input_distr": [
       8732,
-      "i",
-      4
+      "int:list",
+      4,
+      {
+        "4Dellipse": 1,
+        "2phaseplane": 2,
+        "kv": 3,
+        "4DtransvHyp": 4,
+        "realspace": 5,
+        "parmila": 7,
+        "inputfile": 9
+      }
     ],
     "mp:input_distr_mask_transv": [
       8728,