Deprecate condition element category

bonsai-rx · Sep 28, 2022 · 3bc166e · 3bc166e
1 parent aaad3bb
commit 3bc166e
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 15 deletions.
diff --git a/Bonsai.Core/ElementCategory.cs b/Bonsai.Core/ElementCategory.cs
@@ -1,4 +1,6 @@
-namespace Bonsai
+using System;
+
+namespace Bonsai
 {
     /// <summary>
     /// Specifies the category of a workflow element.
@@ -14,6 +16,7 @@ public enum ElementCategory
         /// A combinator that propagates only the elements of an observable sequence
         /// matching some specific condition.
         /// </summary>
+        [Obsolete]
         Condition,
 
         /// <summary>

diff --git a/Bonsai.Core/Expressions/ConditionBuilder.cs b/Bonsai.Core/Expressions/ConditionBuilder.cs
@@ -11,7 +11,6 @@ namespace Bonsai.Expressions
     /// </summary>
     [Obsolete]
     [ProxyType(typeof(Condition))]
-    [WorkflowElementCategory(ElementCategory.Condition)]
     [XmlType("Condition", Namespace = Constants.XmlNamespace)]
     [Description("Filters the elements of an observable sequence according to a condition specified by the encapsulated workflow.")]
     public class ConditionBuilder : Condition

diff --git a/Bonsai.Core/Reactive/Condition.cs b/Bonsai.Core/Reactive/Condition.cs
@@ -13,7 +13,6 @@ namespace Bonsai.Reactive
     /// Represents an expression builder which filters the elements of an observable
     /// sequence according to a condition specified by the encapsulated workflow.
     /// </summary>
-    [WorkflowElementCategory(ElementCategory.Condition)]
     [XmlType(Namespace = Constants.ReactiveXmlNamespace)]
     [Description("Filters the elements of an observable sequence according to a condition specified by the encapsulated workflow.")]
     public class Condition : SingleArgumentWorkflowExpressionBuilder

diff --git a/Bonsai.Design/ExpressionBuilderTypeConverter.cs b/Bonsai.Design/ExpressionBuilderTypeConverter.cs
@@ -68,8 +68,6 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
                 {
                     case ElementCategory.Source:
                         return disabled ? HatchBrushes.DiagonalViolet : obsolete ? HatchBrushes.CrossViolet : Brushes.Violet;
-                    case ElementCategory.Condition:
-                        return disabled ? HatchBrushes.DiagonalLightGreen : obsolete ? HatchBrushes.CrossLightGreen : Brushes.LightGreen;
                     case ElementCategory.Transform:
                         return disabled ? HatchBrushes.DiagonalWhite : obsolete ? HatchBrushes.CrossWhite : Brushes.White;
                     case ElementCategory.Sink:

diff --git a/Bonsai.Editor/EditorForm.cs b/Bonsai.Editor/EditorForm.cs
@@ -663,7 +663,9 @@ void InitializeToolboxCategory(string categoryName, IEnumerable<WorkflowElementD
                     }
 
                     if (typeCategory == ElementCategory.Workflow ||
+#pragma warning disable CS0612 // Type or member is obsolete
                         typeCategory == ElementCategory.Condition ||
+#pragma warning restore CS0612 // Type or member is obsolete
                         typeCategory == ElementCategory.Property)
                     {
                         typeCategory = ElementCategory.Combinator;

diff --git a/Bonsai.Editor/GraphModel/ElementIcon.cs b/Bonsai.Editor/GraphModel/ElementIcon.cs
@@ -11,7 +11,6 @@ namespace Bonsai.Editor.GraphModel
     class ElementIcon
     {
         static readonly ElementIcon Source = new ElementIcon(ElementCategory.Source);
-        static readonly ElementIcon Condition = new ElementIcon(ElementCategory.Condition);
         static readonly ElementIcon Transform = new ElementIcon(ElementCategory.Transform);
         static readonly ElementIcon Sink = new ElementIcon(ElementCategory.Sink);
         static readonly ElementIcon Nested = new ElementIcon(ElementCategory.Nested);
@@ -274,11 +273,13 @@ public static ElementIcon FromElementCategory(ElementCategory category)
             switch (category)
             {
                 case ElementCategory.Source: return Source;
-                case ElementCategory.Condition: return Condition;
                 case ElementCategory.Transform: return Transform;
                 case ElementCategory.Sink: return Sink;
                 case ElementCategory.Nested: return Nested;
                 case ElementCategory.Property: return Property;
+#pragma warning disable CS0612 // Type or member is obsolete
+                case ElementCategory.Condition:
+#pragma warning restore CS0612 // Type or member is obsolete
                 case ElementCategory.Combinator: return Combinator;
                 case ElementCategory.Workflow: return Workflow;
                 default: throw new ArgumentException("Invalid category.");

diff --git a/Bonsai.Editor/GraphModel/GraphNode.cs b/Bonsai.Editor/GraphModel/GraphNode.cs
@@ -96,7 +96,6 @@ public Color FillColor
                 switch (Category)
                 {
                     case ElementCategory.Source: return CategoryColors.Source;
-                    case ElementCategory.Condition: return CategoryColors.Combinator;
                     case ElementCategory.Transform: return CategoryColors.Transform;
                     case ElementCategory.Sink: return CategoryColors.Sink;
                     case ElementCategory.Nested:

diff --git a/Bonsai.Editor/Resources/ElementCategory/Condition.svg b/Bonsai.Editor/Resources/ElementCategory/Condition.svg
diff --git a/Bonsai.Scripting.Expressions/ExpressionCondition.cs b/Bonsai.Scripting.Expressions/ExpressionCondition.cs
@@ -14,7 +14,6 @@ namespace Bonsai.Scripting.Expressions
     /// of an observable sequence.
     /// </summary>
     [DefaultProperty(nameof(Expression))]
-    [WorkflowElementCategory(ElementCategory.Condition)]
     [TypeDescriptionProvider(typeof(ExpressionConditionTypeDescriptionProvider))]
     [Description("An expression script used to filter the elements of the sequence.")]
     public class ExpressionCondition : SingleArgumentExpressionBuilder, IScriptingElement

diff --git a/Bonsai.Scripting/ExpressionCondition.cs b/Bonsai.Scripting/ExpressionCondition.cs
@@ -15,7 +15,6 @@ namespace Bonsai.Scripting
     /// </summary>
     [Obsolete]
     [DefaultProperty(nameof(Expression))]
-    [WorkflowElementCategory(ElementCategory.Condition)]
     [TypeDescriptionProvider(typeof(ExpressionConditionTypeDescriptionProvider))]
     [Description("An expression script used to filter the elements of the sequence.")]
     public class ExpressionCondition : SingleArgumentExpressionBuilder, IScriptingElement

diff --git a/Bonsai.Scripting/PythonCondition.cs b/Bonsai.Scripting/PythonCondition.cs
@@ -11,7 +11,6 @@ namespace Bonsai.Scripting
     /// </summary>
     [Obsolete]
     [DefaultProperty(nameof(Script))]
-    [WorkflowElementCategory(ElementCategory.Condition)]
     [Description("A Python script used to determine which elements of the input sequence are accepted.")]
     public class PythonCondition : Combinator
     {