PySimultan 0.5.9.7__tar.gz → 0.6.0.1__tar.gz

{pysimultan-0.5.9.7 → pysimultan-0.6.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.5.9.7
+Version: 0.6.0.1
 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.5.9.7 → pysimultan-0.6.0.1}/src/PySimultan2/CHANGELOG.md

@@ -1,3 +1,7 @@
+Version 0.6.0.1 (15.01.2024)
+- Updated SIMULTAN Version to 0.7.6
+- Fixed bugs in default_types.ComponentList
+
 Version 0.5.9.7 (09.01.2024)
 - Added default component support to Mapper: if a default component is not present in the datamodel, it is automatically added
 - Fixed content naming bug: Content.name is now used for the name of the TaxonomyEntry in SIMULTAN

pysimultan-0.6.0.1/src/PySimultan2/__about__.py

@@ -0,0 +1 @@
+version = '0.6.0.1'

{pysimultan-0.5.9.7 → pysimultan-0.6.0.1}/src/PySimultan2/data_model.py

@@ -188,7 +188,7 @@ class DataModel:
         resources = self.project_data_manager.AssetManager.Resources
 
         for resource in resources:
-            if resource is None:
+            if resource is None or not isinstance(resource, (ResourceFileEntry, ContainedResourceFileEntry)):
                 continue
             self.resources[resource.Key] = resource
 
@@ -307,8 +307,8 @@ class DataModel:
         """
         # logger.info(
         #     f'Adding component {component.Id} {component.Name} {type(component)} to project {self.project_path}')
-        if component.Id.LocalId != 0:
-            raise ValueError(f'Component {component.Id} already added to project {self.project_path}')
+        # if component.Id.LocalId != 0:
+        #     raise ValueError(f'Component {component.Id} already added to project {self.project_path}')
 
         if not hasattr(component, '__added_to_data_model__'):
             component.__added_to_data_model__ = True

{pysimultan-0.5.9.7 → pysimultan-0.6.0.1}/src/PySimultan2/default_types.py

@@ -37,6 +37,9 @@ class ComponentList(SimultanObject):
         self.component_policy = kwargs.get('component_policy', 'subcomponent')  # component add policy of the content/parameter/property, 'reference' or 'subcomponent'
         self.index = 0
 
+        if args:
+            self.append(args)
+
     @classmethod
     def create_from_values(cls,
                            values: Union[List[SimultanObject], Set[SimultanObject], Tuple[SimultanObject]],
@@ -123,20 +126,40 @@ class ComponentList(SimultanObject):
             logger.error(f'Could not get data from list {self}:\n{e}')
             return []
 
-    def discard(self, value: SimultanObject):
+    def discard(self,
+                value: SimultanObject,
+                update_slots: bool = True):
 
         components = self.components
         subcomponents = self.ref_components
 
         if value._wrapped_obj in components:
             index = components.index(value._wrapped_obj)
-            self.remove_subcomponent(value._wrapped_obj)
+            self._data_model.add_component(value._wrapped_obj)
+            self._wrapped_obj.Components.RemoveAt(index)
         elif value._wrapped_obj in subcomponents:
             index = subcomponents.index(value._wrapped_obj)
             self.remove_referenced_component(value._wrapped_obj)
         else:
             raise ValueError(f'Component {value} not in list {self}')
-        self._update_slot_extensions(index)
+        if update_slots:
+            self._update_slot_extensions(index)
+
+    def insert(self, index: int, value: Any):
+        for i, component in enumerate(self.data[index:]):
+            if component._wrapped_obj in self.components:
+                slot, c_entry = next(
+                    (x.Slot, x) for x in self._wrapped_obj.Components.Items if x.Component == component._wrapped_obj)
+            elif component._wrapped_obj in self.ref_components:
+                slot, c_entry = next((x.Slot, x) for x in self._wrapped_obj.ReferencedComponents.Items if
+                                     x.Target == component._wrapped_obj)
+            c_entry.set_Slot(SimSlot(slot.SlotBase, str(i + index + 1)))
+
+        self._set_value(value, index)
+        print(f'Inserted {value} at index {index}')
+
+        if self.data[index] is not value:
+            raise ValueError(f'Could not insert {value} at index {index}')
 
     def append(self, values: Union[SimultanObject, List]):
 
@@ -162,7 +185,7 @@ class ComponentList(SimultanObject):
                 if component._wrapped_obj in self.components:
                     slot, c_entry = next((x.Slot, x) for x in self._wrapped_obj.Components.Items if x.Component == component._wrapped_obj)
                 elif component._wrapped_obj in self.ref_components:
-                    slot = next(x.Slot for x in self._wrapped_obj.ReferencedComponents.Items if x.Target == component._wrapped_obj)
+                    slot, c_entry = next((x.Slot, x) for x in self._wrapped_obj.ReferencedComponents.Items if x.Target == component._wrapped_obj)
                 else:
                     raise ValueError(f'Component {component} not in list {self}')
                 c_entry.set_Slot(SimSlot(slot.SlotBase, str(i)))
@@ -176,9 +199,14 @@ class ComponentList(SimultanObject):
             slot = value._wrapped_obj.Slots.Items[0]
 
             if self.component_policy == 'subcomponent' and value._wrapped_obj.Parent is None:
-                self.add_subcomponent(value._wrapped_obj,
-                                      slot_extension=str(i),
-                                      slot=slot)
+                if value in self.components:
+                    self.add_referenced_component(value._wrapped_obj,
+                                                  slot_extension=str(i),
+                                                  slot=slot)
+                else:
+                    self.add_subcomponent(value._wrapped_obj,
+                                          slot_extension=str(i),
+                                          slot=slot)
             else:
                 self.add_referenced_component(value._wrapped_obj,
                                               slot_extension=str(i),
@@ -224,7 +252,10 @@ class ComponentList(SimultanObject):
                 if self.data[i] is value:
                     return
                 self.discard(self.data[i])
-                self._set_value(value, i)
+                self.insert(i, value)
+
+        if self.data[i] is not value:
+            raise ValueError(f'Could not insert {value} at index {i}')
 
     def extend(self, values: List):
         return self.append(values)

{pysimultan-0.5.9.7 → pysimultan-0.6.0.1}/src/PySimultan2/files.py

@@ -616,7 +616,7 @@ class DirectoryInfo(object, metaclass=DirectoryInfoMetaMock):
 
     @property
     def helper_file(self) -> Optional[FileInfo]:
-        if self._helper_file is None:
+        if self._helper_file is None or not isinstance(self._helper_file, FileInfo):
             self._helper_file = self.add_file('__dir_helper_file__')
 
         return self._helper_file

{pysimultan-0.5.9.7 → pysimultan-0.6.0.1}/src/PySimultan2/object_mapper.py

@@ -432,6 +432,7 @@ class PythonMapper(object):
         new_mapper.taxonomy_maps = self.taxonomy_maps
         new_mapper.registered_geometry_classes = self.registered_geometry_classes
         new_mapper.load_undefined = self.load_undefined
+        new_mapper.default_components = self.default_components
 
         return new_mapper
 
@@ -442,6 +443,7 @@ class PythonMapper(object):
         self.registered_classes.update(other.registered_classes)
         self.taxonomy_maps.update(other.taxonomy_maps)
         self.registered_geometry_classes.update(other.registered_geometry_classes)
+        self.default_components.extend(other.default_components)
         return self
 
     def get_mapped_class_for_python_type(self, python_type: type) -> Optional[Type[SimultanObject]]:

{pysimultan-0.5.9.7 → pysimultan-0.6.0.1}/src/PySimultan2/resources/ComponentBuilder.xml

@@ -962,6 +962,79 @@
             </summary>
             <param name="settings">The application settings</param>
         </member>
+        <member name="M:ComponentBuilder.Util.ComponentBuilderPluginManager.Initialize(SIMULTAN.Plugins.IPluginData,System.Collections.Generic.IList{System.IO.FileInfo})">
+            <summary>
+            Initializes the PluginManager. Needs to be called by derived classes
+            </summary>
+            <param name="data">The plugin data that is used to initialize the plugins</param>
+            <param name="ignoredPlugins">A list of plugins that get ignored during loading</param>
+        </member>
+        <member name="M:ComponentBuilder.Util.ComponentBuilderPluginManager.InitializePlugin(SIMULTAN.Plugins.ISimPlugin,System.Boolean)">
+            <summary>
+            Initializes a plugin
+            </summary>
+            <param name="plugin">The plugin to initialize</param>
+            <param name="initialize">When set to False, only the Localization assemblies are loaded. Otherwise the plugins initialize method is called too</param>
+        </member>
+        <member name="M:ComponentBuilder.Util.ComponentBuilderPluginManager.LoadPlugin(System.IO.DirectoryInfo)">
+            <summary>
+            Searches for plugins in a given directory
+            </summary>
+            <param name="directory">The folder to search in</param>
+            <returns>A list of all assemblies and plugins which are found in the folder</returns>
+        </member>
+        <member name="M:ComponentBuilder.Util.ComponentBuilderPluginManager.AddPlugin(System.Reflection.Assembly,System.Collections.Generic.List{System.Type},System.Boolean)">
+            <summary>
+            Adds a new plugin to the manager
+            </summary>
+            <param name="assembly">The plugin assembly</param>
+            <param name="pluginTypes">A list of plugin types in this assembly</param>
+            <param name="initLocalization">When set to True, the Localization assembly gets loaded</param>
+        </member>
+        <member name="M:ComponentBuilder.Util.ComponentBuilderPluginManager.RemovePlugin(System.Reflection.Assembly)">
+            <summary>
+            Removes a plugin from the manager. Does NOT unload the plugin from the application
+            </summary>
+            <param name="assembly">The plugin assembly to remove</param>
+        </member>
+        <member name="M:ComponentBuilder.Util.ComponentBuilderPluginManager.GetPluginInfo(System.IO.DirectoryInfo)">
+            <summary>
+            Gets the plugin info and all plugins it depends on
+            </summary>
+            <param name="pluginDirectory">The folder in which the plugin is stored</param>
+            <returns>The info about the plugin and a list of all plugins it depends on</returns>
+        </member>
+        <member name="M:ComponentBuilder.Util.ComponentBuilderPluginManager.GetDependencies(System.Collections.Generic.IEnumerable{System.String})">
+            <summary>
+            Returns a list of all dependency plugin names together with the minimum required version
+            </summary>
+            <param name="installedPlugins">A list of all installed plugins</param>
+            <returns>A list of all dependency plugin names together with the minimum required version</returns>
+        </member>
+        <member name="M:ComponentBuilder.Util.ComponentBuilderPluginManager.GetDependingPlugins(System.String,System.Collections.Generic.IEnumerable{System.String})">
+            <summary>
+            Returns a list of all plugins that depend on a plugin
+            </summary>
+            <param name="dependencyName">The plugin for which the dependents should be searched for</param>
+            <param name="installedPlugins">A list of all installed plugins</param>
+            <returns>A list of all depending plugin names together with the minimum required version</returns>
+        </member>
+        <member name="M:ComponentBuilder.Util.ComponentBuilderPluginManager.FindLibDirectory(System.IO.DirectoryInfo)">
+            <summary>
+            Returns the folder in which the dll files are located based on the plugins root folder.
+            Use <see cref="M:ComponentBuilder.Util.ComponentBuilderPluginManager.FindPluginRootFromAssembly(System.Reflection.Assembly)"/> for the reverse.
+            </summary>
+            <param name="pluginRootDirectory">The plugin root directory</param>
+            <returns>The folder in which the dlls of the plugin are located</returns>
+        </member>
+        <member name="M:ComponentBuilder.Util.ComponentBuilderPluginManager.FindPluginRootFromAssembly(System.Reflection.Assembly)">
+            <summary>
+            Returns the plugin root folder based on the plugin assembly
+            Use <see cref="M:ComponentBuilder.Util.ComponentBuilderPluginManager.FindLibDirectory(System.IO.DirectoryInfo)"/> for the reverse.
+            </summary>
+            <param name="assembly">The plugin assembly</param>
+            <returns>The root folder of the plugin</returns>
+        </member>
         <member name="T:ComponentBuilder.Util.MultiValueUtils">
             <summary>
             Helpers for MultiValues
@@ -1041,7 +1114,6 @@
             Initializes a new instance of the InstallFromZipTask class
             </summary>
             <param name="zipArchive">The zip file</param>
-            <param name="target">The directory where the plugin should be installed (should be a direct subfolder of PluginManager.DefaultPluginDirectory)</param>
         </member>
         <member name="M:ComponentBuilder.ViewNEW.AutoUpdate.InstallFromZipTask.Run(System.IProgress{System.ValueTuple{System.Double,System.String,System.Boolean}})">
             <inheritdoc />
@@ -1068,12 +1140,12 @@
             Updater task for removing a plugin from the application
             </summary>
         </member>
-        <member name="M:ComponentBuilder.ViewNEW.AutoUpdate.PluginRemoveTask.#ctor(System.IO.DirectoryInfo,System.String,System.Reflection.Assembly)">
+        <member name="M:ComponentBuilder.ViewNEW.AutoUpdate.PluginRemoveTask.#ctor(System.IO.DirectoryInfo,System.String,System.String,System.Reflection.Assembly)">
             <summary>
             Initializes a new instance of the PluginRemoveTask class
             </summary>
             <param name="pluginDirectory">The directory where the plugin is installed</param>
-            <param name="pluginName">The name of the plugin</param>
+            <param name="displayName">The name of the plugin</param>
             <param name="pluginAssembly">The assembly of the plugin</param>
         </member>
         <member name="P:ComponentBuilder.ViewNEW.AutoUpdate.PluginRemoveTask.ContinueOnError">
@@ -4898,6 +4970,9 @@
             </summary>
             <param name="rule">The rule</param>
         </member>
+        <member name="M:ComponentBuilder.ViewNEW.Components.ContextDataMappingRuleVM.Dispose(System.Boolean)">
+            <inheritdoc />
+        </member>
         <member name="T:ComponentBuilder.ViewNEW.Components.ContextDataMappingToolVM">
             <summary>
             ViewModel for DataMappingTools in the ContextMenu for selecting data mapping rule assignments
@@ -4924,12 +4999,7 @@
             </summary>
             <param name="tool">The tool to display</param>
         </member>
-        <member name="P:ComponentBuilder.ViewNEW.Components.ContextDataMappingToolVM.IsDisposed">
-            <summary>
-            Returns True when the object has already been disposed, otherwise False. May only be set from inside the <see cref="M:ComponentBuilder.ViewNEW.Components.ContextDataMappingToolVM.Dispose"/> method
-            </summary>
-        </member>
-        <member name="M:ComponentBuilder.ViewNEW.Components.ContextDataMappingToolVM.Dispose">
+        <member name="M:ComponentBuilder.ViewNEW.Components.ContextDataMappingToolVM.Dispose(System.Boolean)">
             <inheritdoc />
         </member>
         <member name="T:ComponentBuilder.ViewNEW.Components.ContextUserComponentListVM">
@@ -12330,6 +12400,19 @@
             <param name="parentVM">The PluginManagerVM</param>
             <param name="serviceProvider">The service provider</param>
         </member>
+        <member name="T:ComponentBuilder.ViewNEW.PluginManagers.DependencyDialog.InstallDependencyDialog">
+            <summary>
+            Interaction logic for InstallDependencyDialog.xaml
+            </summary>
+            <summary>
+            InstallDependencyDialog
+            </summary>
+        </member>
+        <member name="M:ComponentBuilder.ViewNEW.PluginManagers.DependencyDialog.InstallDependencyDialog.InitializeComponent">
+            <summary>
+            InitializeComponent
+            </summary>
+        </member>
         <member name="T:ComponentBuilder.ViewNEW.PluginManagers.GeometryViewerPluginData">
             <summary>
             Provides data for GeometryViewer plugins
@@ -12632,11 +12715,6 @@
             Command for showing a dialog to select a file which gets stored in InstallPath
             </summary>
         </member>
-        <member name="P:ComponentBuilder.ViewNEW.PluginManagers.PluginManagerVM.SelectedItem">
-            <summary>
-            The currently selected entry in the Plugins collection
-            </summary>
-        </member>
         <member name="M:ComponentBuilder.ViewNEW.PluginManagers.PluginManagerVM.#ctor(SIMULTAN.Utils.IServicesProvider)">
             <summary>
             Initializes a new instance of the PluginManagerVM class
@@ -17035,7 +17113,7 @@
         </member>
         <member name="T:ComponentBuilder.ViewNEW.Taxonomies.TaxonomyEditorWidgetVM">
             <summary>
-            Viewmodel for the Taxonomies editor widget
+            ViewModel for the Taxonomies editor widget
             </summary>
         </member>
         <member name="P:ComponentBuilder.ViewNEW.Taxonomies.TaxonomyEditorWidgetVM.Entries">

{pysimultan-0.5.9.7 → pysimultan-0.6.0.1}/src/PySimultan2/resources/SIMULTAN.Lang.xml

@@ -2969,6 +2969,31 @@
               Looks up a localized string similar to Volume.
             </summary>
         </member>
+        <member name="P:SIMULTAN.Lang.CM_INSTALLDEP_HEADEREND">
+            <summary>
+              Looks up a localized string similar to &quot; requires the following changes:.
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Lang.CM_INSTALLDEP_HEADERSTART">
+            <summary>
+              Looks up a localized string similar to Installing Plugin &quot;.
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Lang.CM_INSTALLDEP_TITLE">
+            <summary>
+              Looks up a localized string similar to Install/Update Dependencies.
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Lang.CM_INSTALLDEP_TOINSTALL">
+            <summary>
+              Looks up a localized string similar to Plugins to install:.
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Lang.CM_INSTALLDEP_TOUPDATE">
+            <summary>
+              Looks up a localized string similar to Plugins to update:.
+            </summary>
+        </member>
         <member name="P:SIMULTAN.Lang.CM_INSTANCE_GEOPLACEMENT_FORMAT">
             <summary>
               Looks up a localized string similar to Geometry Placement {0} (File: {1}).
@@ -5096,6 +5121,15 @@
               Looks up a localized string similar to Remove Plugin?.
             </summary>
         </member>
+        <member name="P:SIMULTAN.Lang.CM_PLUGIN_ASK_REMOVESTILLNEEDED">
+             <summary>
+               Looks up a localized string similar to The Plugin {0} is a dependency for the following plugins
+            
+            {1}
+            
+            Do you really want to remove it?.
+             </summary>
+        </member>
         <member name="P:SIMULTAN.Lang.CM_PLUGIN_AUTHOR">
             <summary>
               Looks up a localized string similar to by.
@@ -5111,6 +5145,18 @@
               Looks up a localized string similar to Enable.
             </summary>
         </member>
+        <member name="P:SIMULTAN.Lang.CM_PLUGIN_FAILEDTOINIT">
+             <summary>
+               Looks up a localized string similar to Failed to initialize Plugin &quot;{0}&quot;. The Plugin will be disabled and need to be reenabled after fixing the problem.
+            
+            Reason: {1}.
+             </summary>
+        </member>
+        <member name="P:SIMULTAN.Lang.CM_PLUGIN_FAILEDTOINIT_TITLE">
+            <summary>
+              Looks up a localized string similar to Plugin Error.
+            </summary>
+        </member>
         <member name="P:SIMULTAN.Lang.CM_PLUGIN_HOMEPAGE">
             <summary>
               Looks up a localized string similar to Website.
@@ -5194,6 +5240,21 @@
               Looks up a localized string similar to Failed to install plugin from zip archive {0}.
             </summary>
         </member>
+        <member name="P:SIMULTAN.Lang.CM_PLUGINGROUP_APPLICATION">
+            <summary>
+              Looks up a localized string similar to Application.
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Lang.CM_PLUGINGROUP_DEPENDENDCIES">
+            <summary>
+              Looks up a localized string similar to Dependencies.
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Lang.CM_PLUGINGROUP_INSTALLEDPLUGIN">
+            <summary>
+              Looks up a localized string similar to Plugins.
+            </summary>
+        </member>
         <member name="P:SIMULTAN.Lang.CM_PLUGINMANAGER_ADD">
             <summary>
               Looks up a localized string similar to Add.
@@ -5206,7 +5267,7 @@
         </member>
         <member name="P:SIMULTAN.Lang.CM_PLUGINMANAGER_FROMZIP">
             <summary>
-              Looks up a localized string similar to From Zip Archive.
+              Looks up a localized string similar to From File.
             </summary>
         </member>
         <member name="P:SIMULTAN.Lang.CM_PLUGINMANAGER_INSTALL">

{pysimultan-0.5.9.7 → pysimultan-0.6.0.1}/src/PySimultan2/resources/SIMULTAN.UI.xml

@@ -1021,6 +1021,24 @@
         <member name="M:SIMULTAN.UI.Controls.CalculationTextBlock.CalculationTextBlock.OnApplyTemplate">
             <inheritdoc />
         </member>
+        <member name="T:SIMULTAN.UI.Controls.CalendarTimePicker">
+            <summary>
+            Control to pick the time with up and down buttons for hours and minutes
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.UI.Controls.CalendarTimePicker.Time">
+            <summary>
+            The time property
+            </summary>
+        </member>
+        <member name="F:SIMULTAN.UI.Controls.CalendarTimePicker.TimeProperty">
+            <summary>
+            Dependency property for the time
+            </summary>
+        </member>
+        <member name="M:SIMULTAN.UI.Controls.CalendarTimePicker.OnApplyTemplate">
+            <inheritdoc/>
+        </member>
         <member name="T:SIMULTAN.UI.Controls.ColorButton">
             <summary>
             Provides a button to display (and change) a single DerivedColor instances.
@@ -1365,6 +1383,40 @@
             <param name="dgci">The DataGridCellInfo</param>
             <returns>The column index of this Cell</returns>
         </member>
+        <member name="T:SIMULTAN.UI.Controls.DateTimePicker">
+            <summary>
+            Control for picking date and Time
+            </summary>
+        </member>
+        <member name="F:SIMULTAN.UI.Controls.DateTimePicker.DefaultTimeText">
+            <summary>
+            Default text for empty time
+            </summary>
+        </member>
+        <member name="F:SIMULTAN.UI.Controls.DateTimePicker.DefaultTimeFormat">
+            <summary>
+            Default time format
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.UI.Controls.DateTimePicker.Time">
+            <summary>
+            The current time property
+            </summary>
+        </member>
+        <member name="F:SIMULTAN.UI.Controls.DateTimePicker.TimeProperty">
+            <summary>
+            Dependency property for the time
+            </summary>
+        </member>
+        <member name="M:SIMULTAN.UI.Controls.DateTimePicker.OnApplyTemplate">
+            <inheritdoc/>
+        </member>
+        <member name="M:SIMULTAN.UI.Controls.DateTimePicker.OnSelectedDateChanged(System.Windows.Controls.SelectionChangedEventArgs)">
+            <summary>
+            Called when the selected date changes, also updates the time.
+            </summary>
+            <param name="e">The event args</param>
+        </member>
         <member name="T:SIMULTAN.UI.Controls.DebugControl">
             <summary>
             Control for debugging when a control is loaded
@@ -14018,6 +14070,11 @@
             <param name="viewModel">ViewModel for the widget</param>
             <param name="dataTemplate">DataTemplate for the widget</param>
         </member>
+        <member name="E:SIMULTAN.UI.Services.IGeometryViewerInstance.Closed">
+            <summary>
+            Invoked when the GeometryViewer window got closed
+            </summary>
+        </member>
         <member name="T:SIMULTAN.UI.Services.OpenMode">
             <summary>
             Defines how a geometry model is opened