PySimultan 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

{PySimultan-0.2.4.dist-info → PySimultan-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySimultan
-Version: 0.2.4
+Version: 0.2.6
 Home-page: 
 Author: Max Buehler
 Author-email: Max Bühler <maximilian.buehler@tuwien.ac.at>
@@ -28,6 +28,14 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: six
+Requires-Dist: numpy
+Requires-Dist: pythonnet
+Requires-Dist: colorlog
+Requires-Dist: ruamel.yaml
+Requires-Dist: tqdm
+Requires-Dist: pandas
+Requires-Dist: pyarrow
 
 ===================================================
 geometry_utils: Several tools to work with geometry

{PySimultan-0.2.4.dist-info → PySimultan-0.2.6.dist-info}/RECORD

@@ -3,11 +3,11 @@ PySimultan2/config.py,sha256=Bazt2vDSEga_cFEIPWcAYBsj3TUN5jgtob8TtUvGm5E,1523
 PySimultan2/data_model.py,sha256=2Qq_JyUxtDgsIt3p5hIXIqNy7eAtvn-6Of_Wzb9AWoE,28004
 PySimultan2/default_types.py,sha256=1HJ6IZt3Lm3Hhq3A9dDmvIO46Fk9bGqDng6yTtYKmO4,22585
 PySimultan2/files.py,sha256=q6A5KTqU1nCwh0W0Qf3Se7qcvhGiDAWza2v-X-rt6E4,12473
-PySimultan2/multi_values.py,sha256=w8fy0Is5Eqr4dQ0De0ikWH__qtWtvC6NGEYreIW7VUw,12961
+PySimultan2/multi_values.py,sha256=ZFXlTLuZo32x7_7diYAp2XEjp5uwgHLgNOzN7v74-5I,13650
 PySimultan2/object_mapper.py,sha256=fpr8HsnMfhzCNSLenWHDyUtkKQdeCjaSdjIV5ofmed8,8720
-PySimultan2/simultan_object.py,sha256=Kv6UziARvvYmTcuagA8k3HrAUwWVNO3BrvUqeA3LpzE,15067
+PySimultan2/simultan_object.py,sha256=3uTNbw_acTj_4_ZVE8n5D0zLxuSnSH58tDfgrxOBs-Y,15206
 PySimultan2/taxonomy_maps.py,sha256=qgKM0CdwwgLCFj-ivzY38VaCpE_eCPKyCiBaTBazpBk,7509
-PySimultan2/utils.py,sha256=uxnvqa6JYo28h8eDg1hbxXithVNUImn9JkbW6TtGdFE,61861
+PySimultan2/utils.py,sha256=eCClnI1UpAOACiCMu5BmoVZ8oeR_FEWUugzsbaw41Yk,62038
 PySimultan2/geometry/__init__.py,sha256=nJolTD1i5J8qUkOQa-r3D20aq3Co3sN31Xc0n4wJpJo,248
 PySimultan2/geometry/geometry_base.py,sha256=9qePzRroQ4vDckTT9L7vI4KMydpYO8Rsj5OvbU4ZRSo,23367
 PySimultan2/geometry/utils.py,sha256=K_3HnqPMAlJkOh01oqjspeqsLrooG9NwIQKWf14IJ48,8513
@@ -75,8 +75,8 @@ PySimultan2/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 PySimultan2/resources/assimp.dll,sha256=HwfDwXqoPDTFRyoQpA3qmgZoUdFtziJkV5fNtktEZEU,6081536
 PySimultan2/resources/defaultsettings.xml,sha256=s6Tk1tubLz5UYqXZWpD42EDHzedemRY1nEneoIVcUfg,392
 PySimultan2/resources/setup.bat,sha256=fjvvYfVM6TalS-QTSiKAbAId5nTsk8kGGo06ba-wWaY,32
-PySimultan-0.2.4.dist-info/LICENSE.txt,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
-PySimultan-0.2.4.dist-info/METADATA,sha256=xShPfKbqMDA-N_l9VH0D7zjayN8IlAlEj4ENWxeGggw,1801
-PySimultan-0.2.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-PySimultan-0.2.4.dist-info/top_level.txt,sha256=pbE6SbdKIEEK4vaDNmmdRTj0vesrjgRXGow8QWMTXvk,12
-PySimultan-0.2.4.dist-info/RECORD,,
+PySimultan-0.2.6.dist-info/LICENSE.txt,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
+PySimultan-0.2.6.dist-info/METADATA,sha256=8LCTrU6vtdI0JX_l09VZEUTBVdwKCNuL0haSyNj7maw,1990
+PySimultan-0.2.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+PySimultan-0.2.6.dist-info/top_level.txt,sha256=pbE6SbdKIEEK4vaDNmmdRTj0vesrjgRXGow8QWMTXvk,12
+PySimultan-0.2.6.dist-info/RECORD,,

PySimultan2/multi_values.py

@@ -189,11 +189,23 @@ def set_parameter_to_value_field(parameter: SimDoubleParameter,
     :return: SimDoubleParameter
     """
 
+    _ = x_ax_val
+
+    def default_value_source(val_field: SimMultiValueField3D,
+                             x_ax: float = None,
+                             y_ax: float = None,
+                             z_ax: float = None):
+        x_ax = x_ax if x_ax is not None else val_field.XAxis[0]
+        y_ax = y_ax if y_ax is not None else val_field.YAxis[0]
+        z_ax = z_ax if z_ax is not None else val_field.ZAxis[0]
+        return SimMultiValueField3DParameterSource(val_field, x_ax, y_ax, z_ax)
+
     if not isinstance(parameter, SimDoubleParameter):
         raise ValueError('The input parameter must be a SimDoubleParameter object.')
 
     if isinstance(value, SimMultiValueField3D):
-        source = value
+        # source = value
+        source = default_value_source(value, x_ax_val, y_ax_val, z_ax_val)
     elif isinstance(value, np.ndarray):
         value_field = numpy_to_simultan_multi_value_field_3d(value,
                                                              name=field_name if field_name is not None else str(
@@ -201,11 +213,12 @@ def set_parameter_to_value_field(parameter: SimDoubleParameter,
         if data_model is not None:
             data_model.add_field(value_field)
 
-        x_ax_val = x_ax_val if x_ax_val is not None else value_field.XAxis[0]
-        y_ax_val = y_ax_val if y_ax_val is not None else value_field.YAxis[0]
-        z_ax_val = z_ax_val if z_ax_val is not None else value_field.ZAxis[0]
-
-        source = SimMultiValueField3DParameterSource(value_field, x_ax_val, y_ax_val, z_ax_val)
+        # x_ax_val = x_ax_val if x_ax_val is not None else value_field.XAxis[0]
+        # y_ax_val = y_ax_val if y_ax_val is not None else value_field.YAxis[0]
+        # z_ax_val = z_ax_val if z_ax_val is not None else value_field.ZAxis[0]
+        #
+        # source = SimMultiValueField3DParameterSource(value_field, x_ax_val, y_ax_val, z_ax_val)
+        source = default_value_source(value_field, x_ax_val, y_ax_val, z_ax_val)
 
     elif isinstance(value, pd.DataFrame):
         value_field = pandas_to_simultan_multi_value_big_table(value,

PySimultan2/simultan_object.py

@@ -102,6 +102,10 @@ class SimultanObject(object, metaclass=MetaMock):
     _cls_instances_dict_cache = None
     __type_view__ = None      # ui view cls
 
+    @classmethod
+    def get_instance_by_id(cls, id: SimId) -> 'SimultanObject':
+        return cls._cls_instances_dict.get(id, None)
+
     @classproperty
     def _cls_instances_dict(cls) -> dict[SimId, 'SimultanObject']:
         return dict(zip([x.id for x in cls._cls_instances], [x for x in cls._cls_instances]))

PySimultan2/utils.py

@@ -1143,6 +1143,7 @@ def set_property_to_value_field(value: Union[np.ndarray, pd.DataFrame],
                                          data_model=component._data_model)
 
     if parameter_idx is None:
+
         param = create_field_parameter(field_name=str(component.id) + '_' + prop_name,
                                        value=value,
                                        slot=taxonomy_entry,
@@ -1264,6 +1265,8 @@ def add_properties(prop_name: str,
                                    SimStringParameter: set_property_to_parameter,
                                    SimBoolParameter: set_property_to_parameter,
                                    SimEnumParameter: set_property_to_parameter,
+                                   SimMultiValueField3D: set_property_to_value_field,
+                                   SimMultiValueBigTable: set_property_to_value_field,
                                    int: set_property_to_parameter,
                                    float: set_property_to_parameter,
                                    str: set_property_to_parameter,