diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingsView.xaml b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingsView.xaml
index 90da2f349..52fa0286f 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingsView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingsView.xaml
@@ -31,7 +31,10 @@
-
+
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingsViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingsViewModel.cs
index a2b4d0846..85b601c4e 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingsViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingsViewModel.cs
@@ -13,13 +13,15 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
private readonly IProfileEditorService _profileEditorService;
private IDataBinding _dataBinding;
- public DataBindingsViewModel(IProfileEditorService profileEditorService, INodeService nodeService)
+ public DataBindingsViewModel(IProfileEditorService profileEditorService, INodeService nodeService, ISettingsService settingsService)
{
_profileEditorService = profileEditorService;
AvailableNodes = nodeService.AvailableNodes.ToList();
+ AlwaysShowValues = settingsService.GetSetting("ProfileEditor.AlwaysShowValues", true);
}
public List AvailableNodes { get; }
+ public PluginSetting AlwaysShowValues { get; }
public IDataBinding DataBinding
{
@@ -37,6 +39,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
}
}
+
private void ProfileEditorServiceOnSelectedDataBindingChanged(object sender, EventArgs e)
{
SubscribeToSelectedDataBinding();
diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml
index c7cf110cf..bb2739781 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml
@@ -124,7 +124,11 @@
IsChecked="{Binding ShowDataModelValues.Value}"/>
+ IsChecked="{Binding ShowFullPaths.Value}"/>
+
diff --git a/src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml b/src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml
index eb9341488..265423dd5 100644
--- a/src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml
+++ b/src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml
@@ -70,7 +70,7 @@
-
+
diff --git a/src/Artemis.VisualScripting/Nodes/CustomViewModels/DataModelNodeCustomViewModel.cs b/src/Artemis.VisualScripting/Nodes/CustomViewModels/DataModelNodeCustomViewModel.cs
index eb3f10cca..44db086bd 100644
--- a/src/Artemis.VisualScripting/Nodes/CustomViewModels/DataModelNodeCustomViewModel.cs
+++ b/src/Artemis.VisualScripting/Nodes/CustomViewModels/DataModelNodeCustomViewModel.cs
@@ -11,12 +11,10 @@ namespace Artemis.VisualScripting.Nodes.CustomViewModels
private readonly DataModelNode _node;
private BindableCollection _modules;
- public DataModelNodeCustomViewModel(DataModelNode node, ISettingsService settingsService, IPluginManagementService test) : base(node)
+ public DataModelNodeCustomViewModel(DataModelNode node, ISettingsService settingsService) : base(node)
{
_node = node;
- var tessst = test.GetFeaturesOfType();
-
ShowFullPaths = settingsService.GetSetting("ProfileEditor.ShowFullPaths", true);
ShowDataModelValues = settingsService.GetSetting("ProfileEditor.ShowDataModelValues", false);
}
@@ -38,7 +36,7 @@ namespace Artemis.VisualScripting.Nodes.CustomViewModels
if (ReferenceEquals(_node.DataModelPath, value))
return;
- _node.DataModelPath.Dispose();
+ _node.DataModelPath?.Dispose();
_node.DataModelPath = value;
_node.DataModelPath.Save();
diff --git a/src/Artemis.VisualScripting/Nodes/DataModelNode.cs b/src/Artemis.VisualScripting/Nodes/DataModelNode.cs
index dbbb0ded9..850a71cef 100644
--- a/src/Artemis.VisualScripting/Nodes/DataModelNode.cs
+++ b/src/Artemis.VisualScripting/Nodes/DataModelNode.cs
@@ -45,7 +45,9 @@ namespace Artemis.VisualScripting.Nodes
if (Output == null)
UpdateOutputPin(false);
- Output.Value = DataModelPath.GetValue() ?? Output.Type.GetDefault();
+ object pathValue = DataModelPath.GetValue();
+ if (pathValue != null)
+ Output.Value = pathValue;
}
}