PySimultan 0.6.5__py3-none-any.whl → 0.7.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. PySimultan2/__about__.py +1 -1
  2. PySimultan2/data_model.py +5 -26
  3. PySimultan2/object_mapper.py +3 -3
  4. PySimultan2/resources/AssimpNet.dll +0 -0
  5. PySimultan2/resources/AvalonDock.dll +0 -0
  6. PySimultan2/resources/BruTile.dll +0 -0
  7. PySimultan2/resources/Cyotek.Drawing.BitmapFont.dll +0 -0
  8. PySimultan2/resources/HelixToolkit.Core.Wpf.dll +0 -0
  9. PySimultan2/resources/HelixToolkit.SharpDX.Core.Wpf.dll +0 -0
  10. PySimultan2/resources/HelixToolkit.SharpDX.Core.dll +0 -0
  11. PySimultan2/resources/HelixToolkit.dll +0 -0
  12. PySimultan2/resources/Python.Runtime.dll +0 -0
  13. PySimultan2/resources/SIMULTAN.UI.dll +0 -0
  14. PySimultan2/resources/SIMULTAN.UI.xml +16226 -0
  15. PySimultan2/resources/SharpDX.D3DCompiler.dll +0 -0
  16. PySimultan2/resources/SharpDX.DXGI.dll +0 -0
  17. PySimultan2/resources/SharpDX.Direct2D1.dll +0 -0
  18. PySimultan2/resources/SharpDX.Direct3D11.dll +0 -0
  19. PySimultan2/resources/SharpDX.Direct3D9.dll +0 -0
  20. PySimultan2/resources/SharpDX.dll +0 -0
  21. PySimultan2/resources/System.Collections.Immutable.dll +0 -0
  22. PySimultan2/resources/System.Reflection.Metadata.dll +0 -0
  23. PySimultan2/resources/XAMLMarkupExtensions.dll +0 -0
  24. PySimultan2/resources/assimp.dll +0 -0
  25. PySimultan2/resources/componentmanager.user +0 -0
  26. PySimultan2/resources/defaultsettings.xml +0 -0
  27. PySimultan2/resources/setup.bat +1 -0
  28. {pysimultan-0.6.5.dist-info → pysimultan-0.7.0.dist-info}/METADATA +3 -4
  29. {pysimultan-0.6.5.dist-info → pysimultan-0.7.0.dist-info}/RECORD +31 -7
  30. {pysimultan-0.6.5.dist-info → pysimultan-0.7.0.dist-info}/WHEEL +0 -0
  31. {pysimultan-0.6.5.dist-info → pysimultan-0.7.0.dist-info}/licenses/LICENSE.txt +0 -0
PySimultan2/__about__.py CHANGED
@@ -1 +1 @@
1
- version = '0.6.5'
1
+ version = '0.7.0'
PySimultan2/data_model.py CHANGED
@@ -284,7 +284,7 @@ class DataModel:
284
284
  self.data = self.project_data_manager.Components
285
285
 
286
286
  self.create_component_dict.cache_clear()
287
- self.get_component_by_id_cached.cache_clear()
287
+ self.get_component_by_id.cache_clear()
288
288
 
289
289
  return self.data
290
290
 
@@ -357,7 +357,7 @@ class DataModel:
357
357
  self.data.RemoveItem(index)
358
358
 
359
359
  self.create_component_dict.cache_clear()
360
- self.get_component_by_id_cached.cache_clear()
360
+ self.get_component_by_id.cache_clear()
361
361
 
362
362
  def remove_component(self,
363
363
  component: Union[SimComponent, SimultanObject] = None,
@@ -380,7 +380,7 @@ class DataModel:
380
380
  self.data.RemoveItem(index)
381
381
 
382
382
  self.create_component_dict.cache_clear()
383
- self.get_component_by_id_cached.cache_clear()
383
+ self.get_component_by_id.cache_clear()
384
384
 
385
385
  def save(self):
386
386
  """
@@ -464,7 +464,7 @@ class DataModel:
464
464
  self.data.RemoveItem(index)
465
465
 
466
466
  self.create_component_dict.cache_clear()
467
- self.get_component_by_id_cached.cache_clear()
467
+ self.get_component_by_id.cache_clear()
468
468
 
469
469
  def add_new_geometry_model(self, file_name: str, model_name: str = None, return_resource=False):
470
470
  """
@@ -601,11 +601,7 @@ class DataModel:
601
601
 
602
602
  existing_files = [x.current_full_path for x in self.project_data_manager.AssetManager.Resources]
603
603
  try:
604
- if isinstance(filename, (PosixPath, WindowsPath)):
605
- # convert to SystemFileInfo
606
- act_filename = str(filename)
607
- else:
608
- act_filename = filename.replace('\\', os.sep)
604
+ act_filename = filename.replace('\\', os.sep)
609
605
  except TypeError:
610
606
  act_filename = filename
611
607
 
@@ -982,23 +978,6 @@ class DataModel:
982
978
  # print(item_id.GlobalId, item_id.LocalId)
983
979
  # _ = [print((x.Id.GlobalId, x.Id.LocalId)) for x in self.data.Items]
984
980
 
985
- component = self.get_component_by_id_cached(item_id=item_id,
986
- search_subcomponents=search_subcomponents)
987
- if component is None:
988
- self.get_component_by_id_cached.cache_clear()
989
- component = self.get_component_by_id_cached(item_id=item_id,
990
- search_subcomponents=search_subcomponents)
991
-
992
- return component
993
-
994
- @lru_cache()
995
- def get_component_by_id_cached(self,
996
- item_id: SimId,
997
- search_subcomponents=False) -> Union[SimComponent, None]:
998
-
999
- # print(item_id.GlobalId, item_id.LocalId)
1000
- # _ = [print((x.Id.GlobalId, x.Id.LocalId)) for x in self.data.Items]
1001
-
1002
981
  component = next((x for x in self.data.Items if x.Id.Equals(item_id)), None)
1003
982
 
1004
983
  if component is None and search_subcomponents:
PySimultan2/object_mapper.py CHANGED
@@ -104,9 +104,9 @@ class PythonMapper(object):
104
104
  def register(self,
105
105
  taxonomy: str,
106
106
  cls: Type[Any],
107
- taxonomy_map: TaxonomyMap,
108
- re_register: bool = True,
109
- update_in_other_mappers: bool = False):
107
+ re_register=True,
108
+ update_in_other_mappers=False,
109
+ taxonomy_map=None):
110
110
 
111
111
  # print(f'Registering {taxonomy} with {cls} {hash(cls)}')
112
112
 
PySimultan2/resources/AssimpNet.dll ADDED
Binary file
PySimultan2/resources/AvalonDock.dll ADDED
Binary file
PySimultan2/resources/BruTile.dll ADDED
Binary file
PySimultan2/resources/HelixToolkit.dll ADDED
Binary file
PySimultan2/resources/Python.Runtime.dll ADDED
Binary file
PySimultan2/resources/SIMULTAN.UI.dll ADDED
Binary file