Data model conditions - Moved events into a separate 'mode'

src/Artemis.Core/JsonConverters/ForgivingIntConverter.cs

@@ -0,0 +1,31 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Artemis.Core.JsonConverters
+{
+    /// <summary>
+    ///     An int converter that, if required, will round float values
+    /// </summary>
+    internal class ForgivingIntConverter : JsonConverter<int>
+    {
+        public override bool CanWrite => false;
+
+        public override void WriteJson(JsonWriter writer, int value, JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override int ReadJson(JsonReader reader, Type objectType, int existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            JValue jsonValue = serializer.Deserialize<JValue>(reader);
+
+            if (jsonValue.Type == JTokenType.Float)
+                return (int) Math.Round(jsonValue.Value<double>());
+            if (jsonValue.Type == JTokenType.Integer) 
+                return jsonValue.Value<int>();
+
+            throw new FormatException();
+        }
+    }
+}

src/Artemis.Core/Models/Profile/DataBindings/Modes/Conditional/ConditionalDataBinding.cs

@@ -75,7 +75,7 @@ namespace Artemis.Core
 
             return condition;
         }
-
+        
         /// <summary>
         ///     Removes a condition from the conditional data binding's <see cref="Conditions" /> collection and disposes it
         /// </summary>

src/Artemis.Core/Models/Profile/DataModel/DataModelEvent.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Artemis.Core.DataModelExpansions;
 
 namespace Artemis.Core
@@ -8,6 +10,45 @@ namespace Artemis.Core
     /// </summary>
     public class DataModelEvent<T> : IDataModelEvent where T : DataModelEventArgs
     {
+        private bool _trackHistory;
+
+        /// <summary>
+        ///     Creates a new instance of the <see cref="DataModelEvent{T}" /> class with history tracking disabled
+        /// </summary>
+        public DataModelEvent()
+        {
+        }
+
+        /// <summary>
+        ///     Creates a new instance of the <see cref="DataModelEvent{T}" />
+        /// </summary>
+        /// <param name="trackHistory">A boolean indicating whether the last 20 events should be tracked</param>
+        public DataModelEvent(bool trackHistory)
+        {
+            _trackHistory = trackHistory;
+        }
+
+        /// <inheritdoc />
+        [DataModelProperty(Name = "Last event trigger", Description = "The time at which the event last triggered")]
+        public DateTime LastTrigger { get; private set; }
+
+        /// <summary>
+        ///     Gets the event arguments of the last time the event was triggered
+        /// </summary>
+        [DataModelProperty(Description = "The arguments of the last time this event triggered")]
+        public T? LastEventArguments { get; private set; }
+
+        /// <inheritdoc />
+        [DataModelProperty(Description = "The total amount of times this event has triggered since the module was activated")]
+        public int TriggerCount { get; private set; }
+
+        /// <summary>
+        ///     Gets a queue of the last 20 event arguments
+        ///     <para>Always empty if <see cref="TrackHistory" /> is <see langword="false" /></para>
+        /// </summary>
+        [DataModelProperty(Description = "The arguments of the last time this event triggered")]
+        public Queue<T> EventArgumentsHistory { get; } = new Queue<T>(20);
+
         /// <summary>
         ///     Trigger the event with the given <paramref name="eventArgs" />
         /// </summary>
@@ -21,6 +62,16 @@ namespace Artemis.Core
             LastTrigger = DateTime.Now;
             TriggerCount++;
 
+            if (TrackHistory)
+            {
+                lock (EventArgumentsHistory)
+                {
+                    if (EventArgumentsHistory.Count == 20)
+                        EventArgumentsHistory.Dequeue();
+                    EventArgumentsHistory.Enqueue(eventArgs);
+                }
+            }
+
             OnEventTriggered();
         }
 
@@ -30,26 +81,38 @@ namespace Artemis.Core
         }
 
         /// <inheritdoc />
-        public DateTime LastTrigger { get; private set; }
-
-        /// <inheritdoc />
-        public int TriggerCount { get; private set; }
-
-        /// <summary>
-        ///     Gets the event arguments of the last time the event was triggered
-        /// </summary>
-        public T? LastEventArguments { get; private set; }
+        [DataModelIgnore]
+        public Type ArgumentsType => typeof(T);
 
         /// <inheritdoc />
         [DataModelIgnore]
-        public Type ArgumentsType => typeof(T);
+        public bool TrackHistory
+        {
+            get => _trackHistory;
+            set
+            {
+                EventArgumentsHistory.Clear();
+                _trackHistory = value;
+            }
+        }
 
         /// <inheritdoc />
         [DataModelIgnore]
         public DataModelEventArgs? LastEventArgumentsUntyped => LastEventArguments;
 
+        /// <inheritdoc />
+        [DataModelIgnore]
+        public List<DataModelEventArgs> EventArgumentsHistoryUntyped => EventArgumentsHistory.Cast<DataModelEventArgs>().ToList();
+
         /// <inheritdoc />
         public event EventHandler? EventTriggered;
+
+        /// <inheritdoc />
+        public void Reset()
+        {
+            TriggerCount = 0;
+            EventArgumentsHistory.Clear();
+        }
     }
 
     /// <summary>
@@ -57,6 +120,45 @@ namespace Artemis.Core
     /// </summary>
     public class DataModelEvent : IDataModelEvent
     {
+        private bool _trackHistory;
+
+        /// <summary>
+        ///     Creates a new instance of the <see cref="DataModelEvent" /> class with history tracking disabled
+        /// </summary>
+        public DataModelEvent()
+        {
+        }
+
+        /// <summary>
+        ///     Creates a new instance of the <see cref="DataModelEvent" />
+        /// </summary>
+        /// <param name="trackHistory">A boolean indicating whether the last 20 events should be tracked</param>
+        public DataModelEvent(bool trackHistory)
+        {
+            _trackHistory = trackHistory;
+        }
+
+        /// <inheritdoc />
+        [DataModelProperty(Name = "Last event trigger", Description = "The time at which the event last triggered")]
+        public DateTime LastTrigger { get; private set; }
+
+        /// <summary>
+        ///     Gets the event arguments of the last time the event was triggered
+        /// </summary>
+        [DataModelProperty(Description = "The arguments of the last time this event triggered")]
+        public DataModelEventArgs? LastEventArguments { get; private set; }
+
+        /// <inheritdoc />
+        [DataModelProperty(Description = "The total amount of times this event has triggered since the module was activated")]
+        public int TriggerCount { get; private set; }
+
+        /// <summary>
+        ///     Gets a queue of the last 20 event arguments
+        ///     <para>Always empty if <see cref="TrackHistory" /> is <see langword="false" /></para>
+        /// </summary>
+        [DataModelProperty(Description = "The arguments of the last time this event triggered")]
+        public Queue<DataModelEventArgs> EventArgumentsHistory { get; } = new Queue<DataModelEventArgs>(20);
+
         /// <summary>
         ///     Trigger the event
         /// </summary>
@@ -68,6 +170,16 @@ namespace Artemis.Core
             LastTrigger = DateTime.Now;
             TriggerCount++;
 
+            if (TrackHistory)
+            {
+                lock (EventArgumentsHistory)
+                {
+                    if (EventArgumentsHistory.Count == 20)
+                        EventArgumentsHistory.Dequeue();
+                    EventArgumentsHistory.Enqueue(eventArgs);
+                }
+            }
+
             OnEventTriggered();
         }
 
@@ -75,27 +187,39 @@ namespace Artemis.Core
         {
             EventTriggered?.Invoke(this, EventArgs.Empty);
         }
-
-        /// <inheritdoc />
-        public DateTime LastTrigger { get; private set; }
-
-        /// <inheritdoc />
-        public int TriggerCount { get; private set; }
-
-        /// <summary>
-        ///     Gets the event arguments of the last time the event was triggered
-        /// </summary>
-        public DataModelEventArgs? LastEventArguments { get; private set; }
-
+        
         /// <inheritdoc />
         [DataModelIgnore]
         public Type ArgumentsType => typeof(DataModelEventArgs);
 
+        /// <inheritdoc />
+        [DataModelIgnore]
+        public bool TrackHistory
+        {
+            get => _trackHistory;
+            set
+            {
+                EventArgumentsHistory.Clear();
+                _trackHistory = value;
+            }
+        }
+
         /// <inheritdoc />
         [DataModelIgnore]
         public DataModelEventArgs? LastEventArgumentsUntyped => LastEventArguments;
 
+        /// <inheritdoc />
+        [DataModelIgnore]
+        public List<DataModelEventArgs> EventArgumentsHistoryUntyped => EventArgumentsHistory.ToList();
+
         /// <inheritdoc />
         public event EventHandler? EventTriggered;
+
+        /// <inheritdoc />
+        public void Reset()
+        {
+            TriggerCount = 0;
+            EventArgumentsHistory.Clear();
+        }
     }
 }

src/Artemis.Core/Models/Profile/DataModel/DataModelPath.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -281,7 +280,7 @@ namespace Artemis.Core
 
             Entity.Path = Path;
             Entity.DataModelGuid = DataModelGuid;
-            
+
             Entity.WrapperType = Target switch
             {
                 ListPredicateWrapperDataModel _ => PathWrapperType.List,

src/Artemis.Core/Models/Profile/DataModel/IDataModelEvent.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace Artemis.Core
 {
@@ -19,14 +20,31 @@ namespace Artemis.Core
         /// </summary>
         Type ArgumentsType { get; }
 
+        /// <summary>
+        ///     Gets or sets a boolean indicating whether the last 20 events should be tracked
+        ///     <para>Note: setting this to <see langword="false" /> will clear the current history</para>
+        /// </summary>
+        bool TrackHistory { get; set; }
+
         /// <summary>
         ///     Gets the event arguments of the last time the event was triggered by its base type
         /// </summary>
         public DataModelEventArgs? LastEventArgumentsUntyped { get; }
 
+        /// <summary>
+        ///     Gets a list of the last 20 event arguments by their base type.
+        ///     <para>Always empty if <see cref="TrackHistory" /> is <see langword="false" /></para>
+        /// </summary>
+        public List<DataModelEventArgs> EventArgumentsHistoryUntyped { get; }
+
         /// <summary>
         ///     Fires when the event is triggered
         /// </summary>
         event EventHandler EventTriggered;
+
+        /// <summary>
+        ///     Resets the trigger count and history of this data model event
+        /// </summary>
+        void Reset();
     }
 }

src/Artemis.Core/Services/CoreService.cs

@@ -146,7 +146,7 @@ namespace Artemis.Core.Services
         {
             JsonConvert.DefaultSettings = () => new JsonSerializerSettings
             {
-                Converters = new List<JsonConverter> {new SKColorConverter()}
+                Converters = new List<JsonConverter> {new SKColorConverter(), new ForgivingIntConverter()}
             };
         }