Data model conditions - Added UI for event trigger modes

src/Artemis.Core/Models/Profile/Conditions/DataModelConditionGroup.cs

@@ -21,6 +21,8 @@ namespace Artemis.Core
         {
             Parent = parent;
             Entity = new DataModelConditionGroupEntity();
+            ChildAdded += OnChildrenChanged;
+            ChildRemoved += OnChildrenChanged;
         }
 
         /// <summary>
@@ -49,6 +51,10 @@ namespace Artemis.Core
                 else if (childEntity is DataModelConditionEventPredicateEntity eventPredicateEntity)
                     AddChild(new DataModelConditionEventPredicate(this, eventPredicateEntity));
             }
+
+            ContainsEvents = Children.Any(c => c is DataModelConditionEvent);
+            ChildAdded += OnChildrenChanged;
+            ChildRemoved += OnChildrenChanged;
         }
 
         /// <summary>
@@ -56,6 +62,11 @@ namespace Artemis.Core
         /// </summary>
         public BooleanOperator BooleanOperator { get; set; }
 
+        /// <summary>
+        ///     Gets whether this group contains any events
+        /// </summary>
+        public bool ContainsEvents { get; private set; }
+
         internal DataModelConditionGroupEntity Entity { get; set; }
 
         /// <inheritdoc />
@@ -137,6 +148,11 @@ namespace Artemis.Core
         {
             return Entity;
         }
+
+        private void OnChildrenChanged(object? sender, EventArgs e)
+        {
+            ContainsEvents = Children.Any(c => c is DataModelConditionEvent);
+        }
     }
 
     /// <summary>

src/Artemis.Core/Models/Profile/Folder.cs

@@ -127,11 +127,13 @@ namespace Artemis.Core
             if (!Enabled)
                 return;
 
+            // If the condition is event-based, never display continuously
+            bool displayContinuously = (DisplayCondition == null || !DisplayCondition.ContainsEvents) && DisplayContinuously;
             TimeSpan beginTime = TimelinePosition;
 
             if (stickToMainSegment)
             {
-                if (!DisplayContinuously)
+                if (!displayContinuously)
                 {
                     TimeSpan position = timeOverride + StartSegmentLength;
                     if (position > StartSegmentLength + EndSegmentLength)

src/Artemis.Core/Models/Profile/Layer.cs

@@ -301,11 +301,13 @@ namespace Artemis.Core
             bool wasApplyingDataBindings = ApplyDataBindingsEnabled;
             ApplyDataBindingsEnabled = false;
 
+            // If the condition is event-based, never display continuously
+            bool displayContinuously = (DisplayCondition == null || !DisplayCondition.ContainsEvents) && DisplayContinuously;
             TimeSpan beginTime = TimelinePosition;
 
             if (stickToMainSegment)
             {
-                if (!DisplayContinuously)
+                if (!displayContinuously)
                 {
                     TimelinePosition = StartSegmentLength + timeOverride;
                 }

src/Artemis.Core/Models/Profile/RenderProfileElement.cs

@@ -228,6 +228,16 @@ namespace Artemis.Core
 
         protected double UpdateTimeline(double deltaTime)
         {
+            bool displayContinuously = DisplayContinuously;
+            bool alwaysFinishTimeline = AlwaysFinishTimeline;
+
+            // If the condition is event-based, never display continuously and always finish the timeline
+            if (DisplayCondition != null && DisplayCondition.ContainsEvents)
+            {
+                displayContinuously = false;
+                alwaysFinishTimeline = true;
+            }
+            
             TimeSpan oldPosition = _timelinePosition;
             TimeSpan deltaTimeSpan = TimeSpan.FromSeconds(deltaTime);
             TimeSpan mainSegmentEnd = StartSegmentLength + MainSegmentLength;
@@ -237,13 +247,13 @@ namespace Artemis.Core
             if (DisplayConditionMet)
             {
                 // If we are at the end of the main timeline, wrap around back to the beginning
-                if (DisplayContinuously && TimelinePosition >= mainSegmentEnd)
+                if (displayContinuously && TimelinePosition >= mainSegmentEnd)
                     TimelinePosition = StartSegmentLength;
             }
             else
             {
                 // Skip to the last segment if conditions are no longer met
-                if (!AlwaysFinishTimeline && TimelinePosition < mainSegmentEnd)
+                if (!alwaysFinishTimeline && TimelinePosition < mainSegmentEnd)
                     TimelinePosition = mainSegmentEnd;
             }
 

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml

@@ -56,9 +56,9 @@
             </materialDesign:Card>
         </Grid>
 
-        <Grid Grid.Row="3">
+        <Grid Grid.Row="3" Visibility="{Binding IsEventCondition, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}, Mode=OneWay}">
             <Grid.RowDefinitions>
-                <RowDefinition Height="20" />
+                <RowDefinition Height="18" />
                 <RowDefinition />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
@@ -67,9 +67,7 @@
             </Grid.ColumnDefinitions>
 
             <!-- Play mode -->
-            <StackPanel Grid.Column="0" Orientation="Horizontal">
+            <TextBlock Grid.Column="0" Text="Play mode">
-                <materialDesign:PackIcon Kind="PlayOutline" VerticalAlignment="Center" />
-                <TextBlock Text="Play mode" VerticalAlignment="Center">
                 <TextBlock.ToolTip>
                     <ToolTip Placement="Center" VerticalOffset="-30">
                         <TextBlock>
@@ -78,8 +76,6 @@
                     </ToolTip>
                 </TextBlock.ToolTip>
             </TextBlock>
-            </StackPanel>
-
             <materialDesign:ColorZone Grid.Row="1" Grid.Column="0" Mode="Standard" CornerRadius="3" Margin="0 0 2 0">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -98,10 +94,10 @@
                                 </TextBlock>
                             </ToolTip>
                         </RadioButton.ToolTip>
-                        <StackPanel Orientation="Horizontal">
+                        <TextBlock VerticalAlignment="Center" FontSize="12">
-                            <materialDesign:PackIcon Kind="Repeat" VerticalAlignment="Center" />
+                            <materialDesign:PackIcon Kind="Repeat" VerticalAlignment="Center" Margin="-3 0 0 -3" />
-                            <TextBlock FontSize="12" VerticalAlignment="Center">REPEAT</TextBlock>
+                            REPEAT
-                        </StackPanel>
+                        </TextBlock>
                     </RadioButton>
                     <RadioButton Grid.Column="1"
                                  Style="{StaticResource MaterialDesignTabRadioButton}"
@@ -115,18 +111,16 @@
                                 </TextBlock>
                             </ToolTip>
                         </RadioButton.ToolTip>
-                        <StackPanel Orientation="Horizontal">
+                        <TextBlock VerticalAlignment="Center" FontSize="12">
-                            <materialDesign:PackIcon Kind="StopwatchOutline" VerticalAlignment="Center" />
+                            <materialDesign:PackIcon Kind="StopwatchOutline" VerticalAlignment="Center" Margin="-3 0 0 -3" />
-                            <TextBlock FontSize="12" VerticalAlignment="Center">ONCE</TextBlock>
+                            ONCE
-                        </StackPanel>
+                        </TextBlock>
                     </RadioButton>
                 </Grid>
             </materialDesign:ColorZone>
 
             <!-- Stop mode -->
-            <StackPanel Grid.Column="1" Orientation="Horizontal">
+            <TextBlock Grid.Row="0" Grid.Column="1" Text="Stop mode">
-                <materialDesign:PackIcon Kind="Stop" VerticalAlignment="Center" />
-                <TextBlock Text="Stop mode" VerticalAlignment="Center">
                 <TextBlock.ToolTip>
                     <ToolTip Placement="Center" VerticalOffset="-30">
                         <TextBlock>
@@ -135,7 +129,6 @@
                     </ToolTip>
                 </TextBlock.ToolTip>
             </TextBlock>
-            </StackPanel>
             <materialDesign:ColorZone Grid.Row="1" Grid.Column="1" Mode="Standard" CornerRadius="3" Margin="2 0 0 0" HorizontalAlignment="Stretch">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -154,10 +147,10 @@
                                 </TextBlock>
                             </ToolTip>
                         </RadioButton.ToolTip>
-                        <StackPanel Orientation="Horizontal">
+                        <TextBlock VerticalAlignment="Center" FontSize="12">
-                            <materialDesign:PackIcon Kind="PlayOutline" VerticalAlignment="Center" />
+                            <materialDesign:PackIcon Kind="PlayOutline" VerticalAlignment="Center" Margin="-3 0 0 -3" />
-                            <TextBlock FontSize="12" VerticalAlignment="Center">FINISH</TextBlock>
+                            FINISH
-                        </StackPanel>
+                        </TextBlock>
                     </RadioButton>
                     <RadioButton Grid.Column="1"
                                  Style="{StaticResource MaterialDesignTabRadioButton}"
@@ -171,25 +164,85 @@
                                 </TextBlock>
                             </ToolTip>
                         </RadioButton.ToolTip>
-                        <StackPanel Orientation="Horizontal">
+                        <TextBlock VerticalAlignment="Center" FontSize="12">
-                            <materialDesign:PackIcon Kind="SkipNextOutline" VerticalAlignment="Center" />
+                            <materialDesign:PackIcon Kind="SkipNextOutline" VerticalAlignment="Center" Margin="-3 0 0 -3" />
-                            <TextBlock FontSize="12" VerticalAlignment="Center">SKIP TO END</TextBlock>
+                            SKIP TO END
-                        </StackPanel>
+                        </TextBlock>
                     </RadioButton>
                 </Grid>
             </materialDesign:ColorZone>
         </Grid>
 
-        <!-- Indicator for events, overlaps the previous grid -->
+        <Grid Grid.Row="3" Visibility="{Binding IsEventCondition, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}">
-        <materialDesign:Card Grid.Row="3" 
+            <Grid.RowDefinitions>
-                             Grid.Column="0" 
+                <RowDefinition Height="18" />
-                             Margin="-10 0 -10 -10" 
+                <RowDefinition />
-                             Opacity="0.95"
+            </Grid.RowDefinitions>
-                             Background="{DynamicResource MaterialDesignPaper}"
+
-                             Visibility="{Binding IsEventCondition, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}">
+            <!-- Trigger mode -->
-            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="14">
+            <TextBlock Grid.Column="0" Text="Rapid trigger mode">
-                <materialDesign:PackIcon Kind="FlashAlert" Height="20" Width="20" Margin="0 -5" /> Timeline modes not available to event-based conditions
+                <TextBlock.ToolTip>
+                    <ToolTip Placement="Center" VerticalOffset="-30">
+                        <TextBlock>
+                            Configure how the layer should act when the event(s) trigger before the timeline finishes
                         </TextBlock>
-        </materialDesign:Card>
+                    </ToolTip>
+                </TextBlock.ToolTip>
+            </TextBlock>
+            <materialDesign:ColorZone Grid.Row="1" Grid.Column="0" Mode="Standard" CornerRadius="3">
+                <Grid HorizontalAlignment="Stretch">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <RadioButton Grid.Column="0"
+                                 Style="{StaticResource MaterialDesignTabRadioButton}"
+                                 IsChecked="True">
+                        <TextBlock VerticalAlignment="Center" FontSize="12">
+                            <materialDesign:PackIcon Kind="Repeat" VerticalAlignment="Center" Margin="-3 0 0 -3" />
+                            RESTART
+                        </TextBlock>
+                        <RadioButton.ToolTip>
+                            <ToolTip Placement="Center" VerticalOffset="-40">
+                                <TextBlock>
+                                    Stop the current run and restart the timeline
+                                </TextBlock>
+                            </ToolTip>
+                        </RadioButton.ToolTip>
+                    </RadioButton>
+                    <RadioButton Grid.Column="1"
+                                 Style="{StaticResource MaterialDesignTabRadioButton}"
+                                 IsChecked="False">
+                        <TextBlock VerticalAlignment="Center" FontSize="12">
+                            <materialDesign:PackIcon Kind="EarHearingOff" VerticalAlignment="Center" Margin="-3 0 0 -3" />
+                            IGNORE
+                        </TextBlock>
+                        <RadioButton.ToolTip>
+                            <ToolTip Placement="Center" VerticalOffset="-40">
+                                <TextBlock>
+                                    Ignore subsequent event fires until the timeline finishes
+                                </TextBlock>
+                            </ToolTip>
+                        </RadioButton.ToolTip>
+                    </RadioButton>
+                    <RadioButton Grid.Column="2"
+                                 Style="{StaticResource MaterialDesignTabRadioButton}"
+                                 IsChecked="False">
+                        <TextBlock VerticalAlignment="Center" FontSize="12">
+                            <materialDesign:PackIcon Kind="ContentCopy" VerticalAlignment="Center" Margin="-3 0 0 -3" />
+                            COPY
+                        </TextBlock>
+                        <RadioButton.ToolTip>
+                            <ToolTip Placement="Center" VerticalOffset="-40">
+                                <TextBlock>
+                                    Play another copy of the timeline on top of the current run
+                                </TextBlock>
+                            </ToolTip>
+                        </RadioButton.ToolTip>
+                    </RadioButton>
+                </Grid>
+            </materialDesign:ColorZone>
+        </Grid>
     </Grid>
 </UserControl>

src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/PluginDataModelExpansion.cs

@@ -13,7 +13,7 @@ namespace Artemis.Plugins.DataModelExpansions.TestData
         {
             _rand = new Random();
             AddTimedUpdate(TimeSpan.FromSeconds(1), TimedUpdate);
-            AddTimedUpdate(TimeSpan.FromSeconds(5), TriggerEvent);
+            AddTimedUpdate(TimeSpan.FromSeconds(0.5), TriggerEvent);
         }
 
         private void TriggerEvent(double obj)