Profile editor - Reimplemented more of the timeline

src/Artemis.UI.Shared/DataModelVisualization/Input/DataModelDynamicViewModel.cs

@@ -89,10 +89,7 @@ namespace Artemis.UI.Shared.Input
         private void Initialize()
         {
             // Get the data models
-            DataModelViewModel = _dataModelUIService.GetMainDataModelVisualization();
-            if (!_dataModelUIService.GetPluginExtendsDataModel(_module))
-                DataModelViewModel.Children.Add(_dataModelUIService.GetPluginDataModelVisualization(_module));
-
+            DataModelViewModel = _dataModelUIService.GetPluginDataModelVisualization(_module, true);
             DataModelViewModel.UpdateRequested += DataModelOnUpdateRequested;
 
             _updateTimer.Start();

src/Artemis.UI.Shared/Services/DataModelUIService.cs

@@ -32,7 +32,7 @@ namespace Artemis.UI.Shared.Services
         public DataModelPropertiesViewModel GetMainDataModelVisualization()
         {
             var viewModel = new DataModelPropertiesViewModel(null, null, null);
-            foreach (var dataModelExpansion in _dataModelService.DataModelExpansions)
+            foreach (var dataModelExpansion in _dataModelService.GetDataModels())
                 viewModel.Children.Add(new DataModelPropertiesViewModel(dataModelExpansion, viewModel, null));
 
             // Update to populate children
@@ -41,8 +41,23 @@ namespace Artemis.UI.Shared.Services
             return viewModel;
         }
 
-        public DataModelPropertiesViewModel GetPluginDataModelVisualization(Plugin plugin)
+        public DataModelPropertiesViewModel GetPluginDataModelVisualization(Plugin plugin, bool includeMainDataModel)
         {
+            if (includeMainDataModel)
+            {
+                var mainDataModel = GetMainDataModelVisualization();
+
+                // If the main data model already includes the plugin data model we're done
+                if (mainDataModel.Children.Any(c => c.DataModel.PluginInfo.Instance == plugin))
+                    return mainDataModel;
+                // Otherwise get just the plugin data model and add it
+                var pluginDataModel = GetPluginDataModelVisualization(plugin, false);
+                if (pluginDataModel != null)
+                    mainDataModel.Children.Add(pluginDataModel);
+
+                return mainDataModel;
+            }
+            
             var dataModel = _dataModelService.GetPluginDataModel(plugin);
             if (dataModel == null)
                 return null;
@@ -55,12 +70,7 @@ namespace Artemis.UI.Shared.Services
             viewModel.UpdateRequested += (sender, args) => viewModel.Update(this);
             return viewModel;
         }
-
-        public bool GetPluginExtendsDataModel(Plugin plugin)
-        {
-            return _dataModelService.GetPluginExtendsDataModel(plugin);
-        }
-
+        
         public DataModelVisualizationRegistration RegisterDataModelInput<T>(PluginInfo pluginInfo, IReadOnlyCollection<Type> compatibleConversionTypes = null) where T : DataModelInputViewModel
         {
             if (compatibleConversionTypes == null)

src/Artemis.UI.Shared/Services/Interfaces/IDataModelUIService.cs

@@ -12,14 +12,7 @@ namespace Artemis.UI.Shared.Services
         IReadOnlyCollection<DataModelVisualizationRegistration> RegisteredDataModelEditors { get; }
         IReadOnlyCollection<DataModelVisualizationRegistration> RegisteredDataModelDisplays { get; }
         DataModelPropertiesViewModel GetMainDataModelVisualization();
-        DataModelPropertiesViewModel GetPluginDataModelVisualization(Plugin plugin);
-
-        /// <summary>
-        ///     Determines whether the given plugin expands the main data model
-        /// </summary>
-        /// <param name="plugin"></param>
-        /// <returns></returns>
-        bool GetPluginExtendsDataModel(Plugin plugin);
+        DataModelPropertiesViewModel GetPluginDataModelVisualization(Plugin plugin, bool includeMainDataModel);
 
         DataModelVisualizationRegistration RegisterDataModelInput<T>(PluginInfo pluginInfo, IReadOnlyCollection<Type> compatibleConversionTypes) where T : DataModelInputViewModel;
         DataModelVisualizationRegistration RegisterDataModelDisplay<T>(PluginInfo pluginInfo) where T : DataModelDisplayViewModel;