PySimultan 0.2.10__py3-none-any.whl → 0.3.0__py3-none-any.whl

{PySimultan-0.2.10.dist-info → PySimultan-0.3.0.dist-info}/LICENSE.txt

@@ -1,17 +1,17 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.

{PySimultan-0.2.10.dist-info → PySimultan-0.3.0.dist-info}/METADATA

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

{PySimultan-0.2.10.dist-info → PySimultan-0.3.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 PySimultan2/__init__.py,sha256=X10eSCNtac3CG28w7Ogo1csNalhapO9V4oVSIucc0Kw,1121
 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/default_types.py,sha256=yMcnk1ZxpbIyQAWjhcvxSD2Mejrlv19HRVvnmDUu6MI,22832
 PySimultan2/files.py,sha256=q6A5KTqU1nCwh0W0Qf3Se7qcvhGiDAWza2v-X-rt6E4,12473
 PySimultan2/multi_values.py,sha256=ZFXlTLuZo32x7_7diYAp2XEjp5uwgHLgNOzN7v74-5I,13650
 PySimultan2/object_mapper.py,sha256=Dsr05gdZxcECr14TVzswHNuE4HQhxyhjQwNWlgDrzwc,9010
 PySimultan2/simultan_object.py,sha256=EpmerK5vtPa87MZtetN8fBAXtET9vRGai5ODKPAW86c,15864
 PySimultan2/taxonomy_maps.py,sha256=qgKM0CdwwgLCFj-ivzY38VaCpE_eCPKyCiBaTBazpBk,7509
-PySimultan2/utils.py,sha256=a_2BA2P5lVZ6gVBNad43bYg-VL5WtHjm2nrFiyY39Fc,62067
+PySimultan2/utils.py,sha256=XEJTW811oOYoDfXlhe2kdSyEPZiQ1_8z1fHthVYcfk0,62261
 PySimultan2/geometry/__init__.py,sha256=nJolTD1i5J8qUkOQa-r3D20aq3Co3sN31Xc0n4wJpJo,248
 PySimultan2/geometry/geometry_base.py,sha256=IQQPVxkgIdBsFJp8rPSCNiCiKO7TxkVWy-XmE8GjDbE,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.10.dist-info/LICENSE.txt,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
-PySimultan-0.2.10.dist-info/METADATA,sha256=GOU8tqXM6DijHdbhz_XhuVhyUuAoxvQEqF_19sVqcog,1991
-PySimultan-0.2.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-PySimultan-0.2.10.dist-info/top_level.txt,sha256=pbE6SbdKIEEK4vaDNmmdRTj0vesrjgRXGow8QWMTXvk,12
-PySimultan-0.2.10.dist-info/RECORD,,
+PySimultan-0.3.0.dist-info/LICENSE.txt,sha256=53SfqMB8o2gCG74cXKJb1NtKYYrtw5S2hvtPeB5vaig,1040
+PySimultan-0.3.0.dist-info/METADATA,sha256=t0eEJpKbOkbD24AK0jVsQXVcys2EURSaK3-R-Tv9izU,1990
+PySimultan-0.3.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+PySimultan-0.3.0.dist-info/top_level.txt,sha256=pbE6SbdKIEEK4vaDNmmdRTj0vesrjgRXGow8QWMTXvk,12
+PySimultan-0.3.0.dist-info/RECORD,,

PySimultan2/default_types.py

@@ -433,6 +433,12 @@ class ComponentDictionary(SimultanObject):
             setter_fcn = self.type_setter_fcn_lookup_dict.get(type(value), set_property_to_unknown_type)
 
         setter_fcn(*fcn_arg_list)
+        item = self.__getitem__(key, check_dict=False)
+
+        # self._object_mapper.create_python_object(self._wrapped_obj)
+        #
+        # if isinstance(value, ):
+
         self._dict[key] = self.__getitem__(key, check_dict=False)
 
     def __delitem__(self, key):
@@ -460,9 +466,9 @@ class ComponentDictionary(SimultanObject):
                                                                              data_model=self._data_model,
                                                                              object_mapper=self._object_mapper)
         for component in self._wrapped_obj.Components.Items:
-            comp_dict[component.Name] = get_obj_value(component,
-                                                      data_model=self._data_model,
-                                                      object_mapper=self._object_mapper)
+            comp_dict[component.Slot.SlotBase.Target.Key] = get_obj_value(component.Component,
+                                                                          data_model=self._data_model,
+                                                                          object_mapper=self._object_mapper)
         for ref_component in self._wrapped_obj.ReferencedComponents.Items:
             comp_dict[ref_component.Slot.SlotBase.Target.Name] = get_obj_value(ref_component.Target,
                                                                                data_model=self._data_model,

PySimultan2/utils.py

@@ -380,13 +380,15 @@ def add_sub_component(comp: SimComponent,
             sub_comp.Slots.InsertItem(0, slot)
 
     if slot_extension is None:
-        new_slot = comp.Components.FindAvailableSlot(slot, "{0}")
+        new_slot = comp.Components.FindAvailableSlot(slot.Target if isinstance(slot,
+                                                                               SimTaxonomyEntryReference)
+                                                     else slot, "{0}")
     else:
         new_slot = SimSlot(sub_comp.Slots[0].Target, str(slot_extension))
 
     entry = SimChildComponentEntry(new_slot, sub_comp)
     if entry not in comp.Components.Items:
-        comp.Components.InsertItem(len(comp.Components.Items) + 1, entry)
+        comp.Components.InsertItem(len(comp.Components.Items), entry)
     return True