From 16c6447bf9ae90fd9c256bb5797b04ebbb78489e Mon Sep 17 00:00:00 2001 From: Tony Langhammer Date: Tue, 28 Jun 2022 22:21:27 +0200 Subject: [PATCH 1/2] Fix LayerEffect order double variable assignment This fixes the accidental double assignment of the LayerEffect order messing up more complex profiles. Closes #669 --- src/Artemis.Core/Models/Profile/RenderProfileElement.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Artemis.Core/Models/Profile/RenderProfileElement.cs b/src/Artemis.Core/Models/Profile/RenderProfileElement.cs index 6d70fa31a..b518ec1f7 100644 --- a/src/Artemis.Core/Models/Profile/RenderProfileElement.cs +++ b/src/Artemis.Core/Models/Profile/RenderProfileElement.cs @@ -273,7 +273,7 @@ namespace Artemis.Core int index = 0; foreach (BaseLayerEffect baseLayerEffect in LayerEffects.OrderBy(e => e.Order)) { - baseLayerEffect.Order = Order = index + 1; + baseLayerEffect.Order = index + 1; index++; } @@ -437,4 +437,4 @@ namespace Artemis.Core #endregion } -} \ No newline at end of file +} From 94826e85983040150568a531f4a7bb643869bb07 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 15 Jul 2022 21:46:51 +0200 Subject: [PATCH 2/2] Debugger - Added the ability to copy data model paths --- .../Shared/DataModelVisualizationViewModel.cs | 7 +++++++ .../Screens/Settings/Debug/Tabs/DataModelDebugView.xaml | 7 +++++++ .../Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs index 47f3341d2..c7b16dbed 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs @@ -4,6 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reflection; using System.Text; +using System.Windows; using Artemis.Core; using Artemis.Core.Modules; using Artemis.UI.Shared.Services; @@ -194,6 +195,12 @@ namespace Artemis.UI.Shared IsMatchingFilteredTypes = filteredTypes.Any(t => t == type || t == typeof(Enum) && type.IsEnum); } + public void CopyPath() + { + if (Path != null) + Clipboard.SetText(Path); + } + internal virtual int GetChildDepth() { return 0; diff --git a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml index f178ca853..5be27c2e5 100644 --- a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml +++ b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml @@ -73,6 +73,13 @@ diff --git a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs index 7825cc03b..3588aada4 100644 --- a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs +++ b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs @@ -81,6 +81,11 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs } } + public void CopyPath(DataModelVisualizationViewModel viewModel) + { + viewModel.CopyPath(); + } + #region Overrides of Screen ///