DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 20:06:33 +00:00
Code Issues Releases Wiki Activity

Data model - Improved encapsulation

Browse Source 
Conditions - Renamed from DisplayConditions to DataModelConditions to better match their nature
Core - More documentation
This commit is contained in:
SpoinkyNL committed 2020-09-19 11:43:49 +02:00
1 parent d5ecba52fa
commit f1e222efb1
39 files changed
+581 -355
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.Core/Models/Profile/RenderProfileElement.cs
+10 -10
View File
@@ -49,9 +49,9 @@ namespace Artemis.Core
DisplayContinuously = RenderElementEntity.DisplayContinuously;
AlwaysFinishTimeline = RenderElementEntity.AlwaysFinishTimeline;
DisplayConditionGroup = RenderElementEntity.RootDisplayCondition != null
? new DisplayConditionGroup(null, RenderElementEntity.RootDisplayCondition)
: new DisplayConditionGroup(null);
DataModelConditionGroup = RenderElementEntity.RootDisplayCondition != null
? new DataModelConditionGroup(null, RenderElementEntity.RootDisplayCondition)
: new DataModelConditionGroup(null);
ActivateEffects();
}
@@ -82,8 +82,8 @@ namespace Artemis.Core
}
// Conditions
RenderElementEntity.RootDisplayCondition = DisplayConditionGroup?.Entity;
DisplayConditionGroup?.Save();
RenderElementEntity.RootDisplayCondition = DataModelConditionGroup?.Entity;
DataModelConditionGroup?.Save();
}
#region Properties
@@ -392,22 +392,22 @@ namespace Artemis.Core
private set => SetAndNotify(ref _displayConditionMet, value);
}
private DisplayConditionGroup _displayConditionGroup;
private DataModelConditionGroup _dataModelConditionGroup;
private TimeSpan _timelinePosition;
private bool _displayConditionMet;
/// <summary>
/// Gets or sets the root display condition group
/// </summary>
public DisplayConditionGroup DisplayConditionGroup
public DataModelConditionGroup DataModelConditionGroup
{
get => _displayConditionGroup;
set => SetAndNotify(ref _displayConditionGroup, value);
get => _dataModelConditionGroup;
set => SetAndNotify(ref _dataModelConditionGroup, value);
}
public void UpdateDisplayCondition()
{
var conditionMet = DisplayConditionGroup == null || DisplayConditionGroup.Evaluate();
var conditionMet = DataModelConditionGroup == null || DataModelConditionGroup.Evaluate();
if (conditionMet && !DisplayConditionMet)
TimelinePosition = TimeSpan.Zero;