PySimultan 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

{PySimultan-0.2.5.dist-info → PySimultan-0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySimultan
-Version: 0.2.5
+Version: 0.2.7
 Home-page: 
 Author: Max Buehler
 Author-email: Max Bühler <maximilian.buehler@tuwien.ac.at>

{PySimultan-0.2.5.dist-info → PySimultan-0.2.7.dist-info}/RECORD

@@ -3,13 +3,13 @@ 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=3uTNbw_acTj_4_ZVE8n5D0zLxuSnSH58tDfgrxOBs-Y,15206
 PySimultan2/taxonomy_maps.py,sha256=qgKM0CdwwgLCFj-ivzY38VaCpE_eCPKyCiBaTBazpBk,7509
 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/geometry_base.py,sha256=IQQPVxkgIdBsFJp8rPSCNiCiKO7TxkVWy-XmE8GjDbE,23367
 PySimultan2/geometry/utils.py,sha256=K_3HnqPMAlJkOh01oqjspeqsLrooG9NwIQKWf14IJ48,8513
 PySimultan2/resources/AssimpNet.dll,sha256=x8uwMHPRmEH9fDQihfEQLUdblM1u7RP-CCnUjOpXcLo,205312
 PySimultan2/resources/AvalonDock.dll,sha256=9tCcw7cpaVq0bh1H2sfcxb8EWhySmgujPs89lAqIPZs,500224
@@ -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.5.dist-info/LICENSE.txt,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
-PySimultan-0.2.5.dist-info/METADATA,sha256=tBYnPWk-05KRdrhN4wfz9HrkTHeTZ47PR00qDVUyc_s,1990
-PySimultan-0.2.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-PySimultan-0.2.5.dist-info/top_level.txt,sha256=pbE6SbdKIEEK4vaDNmmdRTj0vesrjgRXGow8QWMTXvk,12
-PySimultan-0.2.5.dist-info/RECORD,,
+PySimultan-0.2.7.dist-info/LICENSE.txt,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
+PySimultan-0.2.7.dist-info/METADATA,sha256=aEPSP8Hy6yP3_csBZR-uZHk5q6FygFNh00CLKLYiJf0,1990
+PySimultan-0.2.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+PySimultan-0.2.7.dist-info/top_level.txt,sha256=pbE6SbdKIEEK4vaDNmmdRTj0vesrjgRXGow8QWMTXvk,12
+PySimultan-0.2.7.dist-info/RECORD,,

PySimultan2/geometry/geometry_base.py

@@ -89,7 +89,7 @@ class BaseGeometry(object, metaclass=MetaMock):
 
     def disassociate(self, component: Union[SimComponent, 'SimultanObject']):
         wrapped_obj = component if isinstance(component, SimComponent) else component._wrapped_obj
-        self._geometry_model.Exchange.Disassociate(self._wrapped_object, wrapped_obj)
+        self._geometry_model.Exchange.Disassociate(wrapped_obj, self._wrapped_object)
 
 
 class classproperty(object):

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,