Profile editor - Continue updating datamodel in editor

Display conditions - Added setting to display current values while selecting condition targets

src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml

@@ -8,6 +8,7 @@
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:converters="clr-namespace:Artemis.UI.Converters"
     xmlns:utilities="clr-namespace:Artemis.UI.Utilities"
+    xmlns:dataModel="clr-namespace:Artemis.UI.Shared.DataModelVisualization.Shared;assembly=Artemis.UI.Shared"
     x:Class="Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.DisplayConditionPredicateView"
     mc:Ignorable="d"
     d:DesignHeight="450" d:DesignWidth="800"
@@ -20,6 +21,47 @@
                 <ResourceDictionary>
                     <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
                     <utilities:BindingProxy x:Key="DataContextProxy" Data="{Binding}" />
+                    <DataTemplate x:Key="DataModelSelectionTemplate">
+                        <StackPanel>
+                            <StackPanel.Resources>
+                                <DataTemplate DataType="{x:Type dataModel:DataModelPropertiesViewModel}">
+                                    <TextBlock Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" />
+                                </DataTemplate>
+                                <DataTemplate DataType="{x:Type dataModel:DataModelPropertyViewModel}">
+                                    <Grid ToolTip="{Binding PropertyDescription.Description}">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <!-- Value description -->
+                                        <TextBlock Grid.Column="0" Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" />
+
+                                        <!-- Value display -->
+                                        <StackPanel Grid.Column="1" Visibility="{Binding Data.ShowDataModelValues.Value, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay, Source={StaticResource DataContextProxy}}">
+                                            <TextBlock Text="{Binding DisplayValue, Mode=OneWay}"
+                                                       FontFamily="Consolas"
+                                                       HorizontalAlignment="Right"
+                                                       Visibility="{Binding ShowToString, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}"
+                                                       Margin="15 0.5 0 0" />
+                                            <TextBlock Text="null"
+                                                       FontFamily="Consolas"
+                                                       HorizontalAlignment="Right"
+                                                       Foreground="{DynamicResource MaterialDesignCheckBoxDisabled}"
+                                                       Margin="15 0.5 0 0"
+                                                       Visibility="{Binding ShowNull, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}" />
+                                            <ContentControl s:View.Model="{Binding DisplayViewModel}"
+                                                            FontFamily="Consolas"
+                                                            Margin="15 0.5 0 0"
+                                                            Visibility="{Binding ShowViewModel, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}" />
+                                        </StackPanel>
+
+                                    </Grid>
+                                </DataTemplate>
+                            </StackPanel.Resources>
+                            <ContentPresenter Content="{Binding}" />
+                        </StackPanel>
+                    </DataTemplate>
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
@@ -55,13 +97,12 @@
                     <ContextMenu.ItemContainerStyle>
                         <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}">
                             <Setter Property="ItemsSource" Value="{Binding Children}" />
-                            <Setter Property="Header" Value="{Binding PropertyDescription.Name}" />
-                            <Setter Property="ToolTip" Value="{Binding PropertyDescription.Description}" />
                             <Setter Property="Command" Value="{Binding Data.SelectLeftPropertyCommand, Source={StaticResource DataContextProxy}}" />
                             <Setter Property="CommandParameter" Value="{Binding}" />
                             <Setter Property="CommandTarget" Value="{Binding}" />
                             <Setter Property="IsEnabled" Value="{Binding IsMatchingFilteredTypes}" />
                             <Setter Property="IsSubmenuOpen" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}" />
+                            <Setter Property="HeaderTemplate" Value="{StaticResource DataModelSelectionTemplate}" />
                         </Style>
                     </ContextMenu.ItemContainerStyle>
                 </ContextMenu>
@@ -119,12 +160,12 @@
                         <ContextMenu.ItemContainerStyle>
                             <Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource MaterialDesignMenuItem}">
                                 <Setter Property="ItemsSource" Value="{Binding Children}" />
-                                <Setter Property="Header" Value="{Binding PropertyDescription.Name}" />
-                                <Setter Property="ToolTip" Value="{Binding PropertyDescription.Description}" />
                                 <Setter Property="Command" Value="{Binding Data.SelectRightPropertyCommand, Source={StaticResource DataContextProxy}}" />
                                 <Setter Property="CommandParameter" Value="{Binding}" />
                                 <Setter Property="CommandTarget" Value="{Binding}" />
                                 <Setter Property="IsEnabled" Value="{Binding IsMatchingFilteredTypes}" />
+                                <Setter Property="IsSubmenuOpen" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}" />
+                                <Setter Property="HeaderTemplate" Value="{StaticResource DataModelSelectionTemplate}" />
                             </Style>
                         </ContextMenu.ItemContainerStyle>
                     </ContextMenu>
@@ -139,8 +180,8 @@
             </Button>
 
             <!-- Right side property if type is static -->
-            <materialDesign:Transitioner SelectedIndex="{Binding RightSideTransitionIndex}" 
-                                         DefaultTransitionOrigin="0.5, 0.5" 
+            <materialDesign:Transitioner SelectedIndex="{Binding RightSideTransitionIndex}"
+                                         DefaultTransitionOrigin="0.5, 0.5"
                                          Margin="3 -4"
                                          Visibility="{Binding ShowRightSidePropertySelection, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}, Mode=OneWay}">
                 <Button Style="{StaticResource DisplayConditionButton}"
@@ -150,7 +191,7 @@
                         Command="{s:Action ActivateRightSideInputViewModel}"
                         HorizontalAlignment="Left">
                     <Grid>
-                        <StackPanel Visibility="{Binding RightStaticValue, Converter={StaticResource NullToVisibilityConverter}}" Orientation="Horizontal" >
+                        <StackPanel Visibility="{Binding RightStaticValue, Converter={StaticResource NullToVisibilityConverter}}" Orientation="Horizontal">
                             <TextBlock FontWeight="Light"
                                        Text="{Binding SelectedLeftSideProperty.PropertyDescription.Prefix}"
                                        Visibility="{Binding SelectedLeftSideProperty.PropertyDescription.Prefix, Converter={StaticResource NullToVisibilityConverter}}" />
@@ -168,8 +209,9 @@
                 <Border BorderBrush="{DynamicResource PrimaryHueMidBrush}"
                         Background="{DynamicResource MaterialDesignPaper}"
                         CornerRadius="3"
-                        Padding="3"                        
-                        HorizontalAlignment="Left">
+                        Padding="3"
+                        HorizontalAlignment="Left"
+                        MinWidth="140">
                     <ContentControl s:View.Model="{Binding RightSideInputViewModel}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" />
                 </Border>
             </materialDesign:Transitioner>

src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs

@@ -5,6 +5,8 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using Artemis.Core.Models.Profile.Conditions;
+using Artemis.Core.Plugins.Models;
+using Artemis.Core.Services;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Events;
 using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract;
@@ -37,7 +39,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
         private List<Type> _supportedInputTypes;
 
         public DisplayConditionPredicateViewModel(DisplayConditionPredicate displayConditionPredicate, DisplayConditionViewModel parent, IProfileEditorService profileEditorService,
-            IDataModelVisualizationService dataModelVisualizationService, IDataModelService dataModelService, IEventAggregator eventAggregator)
+            IDataModelVisualizationService dataModelVisualizationService, IDataModelService dataModelService, ISettingsService settingsService, IEventAggregator eventAggregator)
             : base(displayConditionPredicate, parent)
         {
             _profileEditorService = profileEditorService;
@@ -49,6 +51,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             SelectRightPropertyCommand = new DelegateCommand(ExecuteSelectRightProperty);
             SelectOperatorCommand = new DelegateCommand(ExecuteSelectOperatorCommand);
 
+            ShowDataModelValues = settingsService.GetSetting<bool>("ProfileEditor.ShowDataModelValues");
+
             // Initialize async, no need to wait for it
             Task.Run(Initialize);
         }
@@ -56,6 +60,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
         public DisplayConditionPredicate DisplayConditionPredicate => (DisplayConditionPredicate) Model;
         public bool ShowRightSidePropertySelection => DisplayConditionPredicate.PredicateType == PredicateType.Dynamic;
         public bool CanActivateRightSideInputViewModel => SelectedLeftSideProperty?.PropertyInfo != null;
+        public PluginSetting<bool> ShowDataModelValues { get; }
 
         public bool IsInitialized
         {
@@ -262,8 +267,12 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
 
         private void RightDataModelUpdateRequested(object sender, EventArgs e)
         {
+            var leftSideType = SelectedLeftSideProperty?.PropertyInfo?.PropertyType;
             if (DisplayConditionPredicate.PredicateType == PredicateType.Dynamic)
                 SelectedRightSideProperty = LeftSideDataModel.GetChildForCondition(DisplayConditionPredicate, DisplayConditionSide.Right);
+
+            // With the data model updated, also reapply the filter
+            RightSideDataModel.ApplyTypeFilter(true, leftSideType);
         }
 
         private void LeftDataModelUpdateRequested(object sender, EventArgs e)

src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorViewModel.cs

@@ -195,7 +195,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor
         protected override void OnInitialActivate()
         {
             LoadWorkspaceSettings();
-            _profileEditorService.StopRegularRender();
+            Module.IsProfileUpdatingDisabled = true;
             Module.ActiveProfileChanged += ModuleOnActiveProfileChanged;
             Execute.PostToUIThread(LoadProfiles);
             base.OnInitialActivate();
@@ -204,7 +204,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor
         protected override void OnClose()
         {
             SaveWorkspaceSettings();
-            _profileEditorService.ResumeRegularRender();
+            Module.IsProfileUpdatingDisabled = false;
             Module.ActiveProfileChanged -= ModuleOnActiveProfileChanged;
             base.OnClose();
         }

src/Artemis.UI/Screens/Settings/SettingsView.xaml

@@ -175,6 +175,32 @@
                         </StackPanel>
                     </materialDesign:Card>
 
+                    <!-- Profile editor settings -->
+                    <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="0 15">Profile editor</TextBlock>
+                    <materialDesign:Card materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch" Margin="0,0,5,0">
+                        <StackPanel Margin="15">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <StackPanel Grid.Column="0">
+                                    <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Show condition data model values</TextBlock>
+                                    <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
+                                        While selecting a condition target, show the current values of the data model
+                                    </TextBlock>
+                                </StackPanel>
+                                <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                                    <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding ShowDataModelValues}" />
+                                </StackPanel>
+                            </Grid>
+                        </StackPanel>
+                    </materialDesign:Card>
+
                     <!-- Rendering settings -->
                     <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="0 15">Rendering</TextBlock>
                     <materialDesign:Card materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch" Margin="0,0,5,0">

src/Artemis.UI/Screens/Settings/SettingsViewModel.cs

@@ -119,6 +119,16 @@ namespace Artemis.UI.Screens.Settings
             }
         }
 
+        public bool ShowDataModelValues
+        {
+            get => _settingsService.GetSetting("ProfileEditor.ShowDataModelValues", false).Value;
+            set
+            {
+                _settingsService.GetSetting("ProfileEditor.ShowDataModelValues", false).Value = value;
+                _settingsService.GetSetting("ProfileEditor.ShowDataModelValues", false).Save();
+            }
+        }
+
         public Tuple<string, double> SelectedRenderScale
         {
             get => RenderScales.FirstOrDefault(s => Math.Abs(s.Item2 - RenderScale) < 0.01);