Direct databindings - Added a large amount of modifiers

Direct databindings - Allow modifiers to have a different input parameter
Direct databindings - Categorised modifiers
Direct databindings - Added descriptions to modifiers
This commit is contained in:
Robert committed 2020-09-29 19:09:34 +02:00
1 parent a5455c26d6
commit e2f2f7ca65
48 files changed
+658 -186

No files matched your search

@@ -1,5 +1,4 @@
using System;
using System.Linq;
using System.Linq.Expressions;
using Artemis.Core.DataModelExpansions;
using Artemis.Storage.Entities.Profile.DataBindings;
@@ -227,16 +226,16 @@ namespace Artemis.Core
ParameterDataModel = null;
ParameterPropertyPath = null;
var targetType = DirectDataBinding.DataBinding.GetTargetType();
var parameterType = ModifierType?.ParameterType ?? DirectDataBinding.DataBinding.GetTargetType();
// If not null ensure the types match and if not, convert it
if (staticValue != null && staticValue.GetType() == targetType)
if (staticValue != null && staticValue.GetType() == parameterType)
ParameterStaticValue = staticValue;
else if (staticValue != null)
ParameterStaticValue = Convert.ChangeType(staticValue, targetType);
ParameterStaticValue = Convert.ChangeType(staticValue, parameterType);
// If null create a default instance for value types or simply make it null for reference types
else if (targetType.IsValueType)
ParameterStaticValue = Activator.CreateInstance(targetType);
else if (parameterType.IsValueType)
ParameterStaticValue = Activator.CreateInstance(parameterType);
else
ParameterStaticValue = null;
@@ -269,18 +268,18 @@ namespace Artemis.Core
else if (ParameterType == ProfileRightSideType.Static && Entity.ParameterStaticValue != null && ParameterStaticValue == null)
{
// Use the target type so JSON.NET has a better idea what to do
var targetType = DirectDataBinding.DataBinding.GetTargetType();
var parameterType = ModifierType?.ParameterType ?? DirectDataBinding.DataBinding.GetTargetType();
object staticValue;
try
{
staticValue = JsonConvert.DeserializeObject(Entity.ParameterStaticValue, targetType);
staticValue = JsonConvert.DeserializeObject(Entity.ParameterStaticValue, parameterType);
}
// If deserialization fails, use the type's default
catch (JsonSerializationException e)
{
DeserializationLogger.LogModifierDeserializationFailure(GetType().Name, e);
staticValue = Activator.CreateInstance(targetType);
staticValue = Activator.CreateInstance(parameterType);
}
UpdateParameter(staticValue);
@@ -307,7 +306,7 @@ namespace Artemis.Core
CompiledParameterAccessor = lambda.Compile();
}
}
#region Event handlers
private void DataBindingModifierTypeStoreOnDataBindingModifierAdded(object sender, DataBindingModifierTypeStoreEvent e)
@@ -21,9 +21,20 @@ namespace Artemis.Core
public abstract IReadOnlyCollection<Type> CompatibleTypes { get; }
/// <summary>
/// Gets or sets the description of this modifier
/// Gets the supported parameter type
/// <para>If <c>null</c>, the parameter type will match the source property</para>
/// </summary>
public abstract string Description { get; }
public virtual Type ParameterType => null;
/// <summary>
/// Gets or sets whether this modifier supports a parameter, defaults to <c>true</c>
/// </summary>
public virtual bool SupportsParameter => true;
/// <summary>
/// Gets the name of this modifier
/// </summary>
public abstract string Name { get; }
/// <summary>
/// Gets or sets the icon of this modifier
@@ -31,16 +42,15 @@ namespace Artemis.Core
public abstract string Icon { get; }
/// <summary>
/// Gets or sets whether this modifier supports a parameter, defaults to <c>true</c>
/// Gets the description of this modifier
/// </summary>
public bool SupportsParameter { get; protected set; } = true;
public virtual string Description => null;
/// <summary>
/// Gets or sets the preferred parameter type
/// <para>If <c>null</c>, the parameter type will match the source property</para>
/// Gets the category of this modifier
/// </summary>
public Type PreferredParameterType { get; protected set; } = null;
public virtual string Category => null;
/// <summary>
/// Returns whether the given type is supported by the modifier
/// </summary>