PySimultan 0.7.3__py3-none-any.whl → 0.7.5__py3-none-any.whl

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.7.3'
+version = '0.7.5'

PySimultan2/__init__.py

@@ -48,7 +48,6 @@ def setup():
     logger.setLevel('DEBUG')
 
     dll_path = os.environ.get('SIMULTAN_SDK_DIR', None)
-    dll_path = None
     if dll_path is None:
         with pkg_resources.path(resources, 'SIMULTAN.dll') as r_path:
             dll_path = str(r_path)
@@ -59,8 +58,11 @@ def setup():
     list(clr_loader.find_runtimes())
     load('coreclr')
     import clr
-    test = clr.AddReference(
-        os.path.join(dll_path, 'SIMULTAN.dll') if not dll_path.endswith('SIMULTAN.dll') else dll_path)
+    try:
+        clr.AddReference('SIMULTAN')
+    except Exception as e:
+        test = clr.AddReference(
+            os.path.join(dll_path, 'SIMULTAN.dll') if not dll_path.endswith('SIMULTAN.dll') else dll_path)
     clr.AddReference("System.Security.Cryptography")
     # clr.AddReference(os.path.join(dll_path, 'SIMULTAN'))
 

PySimultan2/multi_values.py

@@ -16,6 +16,18 @@ from pandas import DataFrame
 import System
 
 
+class SimultanPandasDataFrame(pd.DataFrame):
+    # temporary properties
+
+    # normal properties
+    _metadata = ["SimultanField"]
+
+    @property
+    def _constructor(self):
+        return SimultanPandasDataFrame
+
+
+
 def numpy_to_simultan_multi_value_field_3d(array: np.ndarray,
                                            name: str = 'UnnamedField',
                                            x_axis: list = None,
@@ -124,7 +136,8 @@ def simultan_multi_value_big_table_to_pandas(field: SimMultiValueBigTable) -> pd
     for i in range(field.RowHeaders.Count):
         data[i, :] = list(field.GetRow(i))
 
-    df = pd.DataFrame(data, columns=[x.Name for x in field.ColumnHeaders], index=[x.Name for x in field.RowHeaders])
+    df = SimultanPandasDataFrame(data, columns=[x.Name for x in field.ColumnHeaders], index=[x.Name for x in field.RowHeaders])
+    df.SimultanField = {'id': field.Id, 'name': field.Name}
 
     return df
 
@@ -224,8 +237,16 @@ def set_parameter_to_value_field(parameter: SimDoubleParameter,
         #
         # 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, SimultanPandasDataFrame):
+        field = next(x for x in data_model.value_fields if x.Id.Equals(value.SimultanField['id']))  # check if field is in data model
+        value_field = pandas_to_simultan_multi_value_big_table(value,
+                                                               name=field_name if field_name is not None else str(
+                                                               parameter.Id) + '_field')
+        field.ReplaceData(value_field)
+        source = SimMultiValueBigTableParameterSource(field, 0, 0)
 
     elif isinstance(value, pd.DataFrame):
+        value.__class__ = SimultanPandasDataFrame  # change class to add temporary properties
         value_field = pandas_to_simultan_multi_value_big_table(value,
                                                                name=field_name if field_name is not None else str(
                                                                    parameter.Id) + '_field')
@@ -233,6 +254,7 @@ def set_parameter_to_value_field(parameter: SimDoubleParameter,
             data_model.add_field(value_field)
 
         source = SimMultiValueBigTableParameterSource(value_field, 0, 0)
+        value.SimultanField = {'id': value_field.Id, 'name': value_field.Name}
 
     else:
         raise ValueError('The value of the field parameter must be a numpy array or a DataFrame.')

PySimultan2/type_setter_lookup.py

@@ -12,6 +12,7 @@ from .utils import (SimComponent, SimDoubleParameter, SimIntegerParameter, SimSt
 from .simultan_object import SimultanObject, MetaMock
 
 from .default_types import ComponentList, ComponentDictionary
+from .multi_values import SimultanPandasDataFrame
 
 from SIMULTAN.Data.Components import (ComponentWalker, SimComponent, SimBoolParameter, SimDoubleParameter,
                                       SimEnumParameter, SimIntegerParameter, SimStringParameter, ComponentMapping,
@@ -50,7 +51,8 @@ class TypeSetterFcnLookupDict(object):
                    ComponentDictionary: set_property_to_sim_component,
                    ComponentList: set_property_to_list,
                    np.ndarray: set_property_to_value_field,
-                   pd.DataFrame: set_property_to_value_field}
+                   pd.DataFrame: set_property_to_value_field,
+                   SimultanPandasDataFrame: set_property_to_value_field}
 
     def __getitem__(self, item: type):
         bases = [item, *inspect.getmro(type(item))]

PySimultan2/utils.py

@@ -27,7 +27,7 @@ from SIMULTAN.Data.Assets import (ResourceEntry, ResourceFileEntry, ContainedRes
 from SIMULTAN.Data.Geometry import Face, Edge, Vertex, Volume
 
 from .multi_values import (simultan_multi_value_field_3d_to_numpy, set_parameter_to_value_field,
-                           create_field_parameter, simultan_multi_value_big_table_to_pandas)
+                           create_field_parameter, simultan_multi_value_big_table_to_pandas, SimultanPandasDataFrame)
 from .files import FileInfo, remove_asset_from_component, add_asset_to_component, DirectoryInfo
 
 if TYPE_CHECKING:
@@ -1442,9 +1442,11 @@ def add_properties(prop_name: str,
     def getx(self):
 
         cache_value = self.__property_cache__.get(content.text_or_key, Empty)
+        if isinstance(cache_value, SimultanPandasDataFrame):
+            cache_value = Empty
 
         if cache_value is not Empty:
-            return self.__property_cache__[content.text_or_key]
+            return cache_value
 
         val = get_property(component=self,
                            text_or_key=content.text_or_key,

{pysimultan-0.7.3.dist-info → pysimultan-0.7.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.7.3
+Version: 0.7.5
 Project-URL: Documentation, https://github.com/Bühler Maximilian/PySimultan2#readme
 Project-URL: Issues, https://github.com/Bühler Maximilian/PySimultan2/issues
 Project-URL: Source, https://github.com/Bühler Maximilian/PySimultan2

{pysimultan-0.7.3.dist-info → pysimultan-0.7.5.dist-info}/RECORD

@@ -1,15 +1,15 @@
 PySimultan2/CHANGELOG.md,sha256=sFTVr_AgFyqf4HPmShaAHKaHcT5A3MjL2s2VVzEdoyM,1340
-PySimultan2/__about__.py,sha256=Yl5Obh3nV2cgQAb9sShmU5W55HPrpYbI_WGlWqZ5S6Y,19
-PySimultan2/__init__.py,sha256=PGVR1uhY01dF5tHyad-znURUZ_LVB95vsjId2BT0aJM,3245
+PySimultan2/__about__.py,sha256=TEFip2a0VFNRURwwPsPibE-taPGthCRZsDf-CCUhJ3Q,19
+PySimultan2/__init__.py,sha256=MMHfHx8GQWmoHgFN8MTG4jIOqwrKzTyDYeB3LMjsU9c,3308
 PySimultan2/data_model.py,sha256=3KX3cjsEB-9G-FzRVd0Zo1FpoAgR8cFOCo-drPoXJKg,45894
 PySimultan2/default_types.py,sha256=NnBgf16CElEAWH7tA0qLKqFHZ4_YS00HAJpKHG1CmjQ,30581
 PySimultan2/files.py,sha256=8JCWtUPS89POsPrmn_kCrHzmiBsLb1iWhw-A9qQLcR8,34716
-PySimultan2/multi_values.py,sha256=CkmfifA-mHL3Cnm496tGQuUchpmNF7JCulyrhUFAM_I,15638
+PySimultan2/multi_values.py,sha256=gx46mYc_foSVJkesNkNHFGSA95aM1Z3ypgjhzNfPWHs,16687
 PySimultan2/object_mapper.py,sha256=0qiVEjn6q24u2_YZGOyD4ESXZ-0tfJjGjSowT8wa2wM,20568
 PySimultan2/simultan_object.py,sha256=-3dTlkyoVdrXmSZgozz7fTHJnaxN63utYPXOXTCuEOY,20837
 PySimultan2/taxonomy_maps.py,sha256=hhgXhRXIPTD2briG_yYZssJ9musOnzs0LC4e8e78e40,10323
-PySimultan2/type_setter_lookup.py,sha256=PGa5_EtV7SM15w3uxy0fA3LiQ0TaS4Ys0LYR5zs8aNk,3748
-PySimultan2/utils.py,sha256=FNJzBVqN31oRKak4NNx9xNmKMrROKphgbh6XfQCmlMw,67115
+PySimultan2/type_setter_lookup.py,sha256=QtepnP-FigxGv53_dB70hLSFewEidZS1KrUpW7ZIrQI,3873
+PySimultan2/utils.py,sha256=1k8IoAHJVsXDZPrqlmEkCfszsqSTN4yh3-CqELP5KmY,67202
 PySimultan2/geometry/__init__.py,sha256=nJolTD1i5J8qUkOQa-r3D20aq3Co3sN31Xc0n4wJpJo,248
 PySimultan2/geometry/geometry_base.py,sha256=TwABfQEsqxAIGLqwvqVXEV-GA5sYGBJSJm7e58QmNzM,24015
 PySimultan2/geometry/utils.py,sha256=J25YsK8sso_UL7xRusItQZvyjtvxdOsSPelBQYFABhY,8519
@@ -44,7 +44,7 @@ PySimultan2/resources/System.Data.OleDb.dll,sha256=-AAzdmyo01QNgD9qnUIewEImplJFV
 PySimultan2/resources/System.Net.Http.Formatting.dll,sha256=xQBIin4YpqDObdqwau_5dr8XQEq54hlxV4gBgNtUqbc,179672
 PySimultan2/resources/System.Reflection.MetadataLoadContext.dll,sha256=P4PBRwAGWL27sNc754Wd28t_koJKBFYJ2FyolrD1xo0,242296
 PySimultan2/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pysimultan-0.7.3.dist-info/METADATA,sha256=ZDkGZr0z2LnB2G2eMgKHQdb2tIM8nMeCT5Plo4C_2Tc,6608
-pysimultan-0.7.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pysimultan-0.7.3.dist-info/licenses/LICENSE.txt,sha256=FgR_YZkk7oYz4087xYXfcBCXGuTStFrsOWTH4bbpa3c,1821
-pysimultan-0.7.3.dist-info/RECORD,,
+pysimultan-0.7.5.dist-info/METADATA,sha256=n96S6y6WItLIV5ORnIRffxa_2LuNmKSKV-75F0NsChk,6608
+pysimultan-0.7.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pysimultan-0.7.5.dist-info/licenses/LICENSE.txt,sha256=FgR_YZkk7oYz4087xYXfcBCXGuTStFrsOWTH4bbpa3c,1821
+pysimultan-0.7.5.dist-info/RECORD,,