Merge branch 'dev'

ExNihilo.sln

@@ -17,13 +17,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{38
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WPF", "Examples\WPF\WPF.csproj", "{B5964E1E-5078-4D61-936E-1AF3FE685159}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdvancedCaptcha", "Examples\AdvancedCaptcha\AdvancedCaptcha.csproj", "{0CF5A815-8D18-45C1-BD0E-D0781AEFAB04}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TwoLanguage", "Examples\TwoLanguage\TwoLanguage.csproj", "{944DE844-71E2-48A7-AD57-A814343817D6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MathCaptcha", "Examples\MathCaptcha\MathCaptcha.csproj", "{CEF1EF14-3D6E-4E5E-A56E-C73C60A1B947}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AdvancedCaptcha", "Examples\AdvancedCaptcha\AdvancedCaptcha.csproj", "{B9DFA6C8-51E6-44F4-AC4F-F98C9E2733BC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleCaptcha", "Examples\SimpleCaptcha\SimpleCaptcha.csproj", "{EEE37AEA-43CE-4B17-B256-ACAF3CE6D6AC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TwoLanguageCaptcha", "Examples\TwoLanguageCaptcha\TwoLanguageCaptcha.csproj", "{8B55D8EC-AB3E-4213-B794-EBF650132D24}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Simple", "Examples\Simple\Simple.csproj", "{2FDB71EA-C086-493F-8126-789EF156A0AD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -43,32 +41,27 @@ Global
 		{B5964E1E-5078-4D61-936E-1AF3FE685159}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B5964E1E-5078-4D61-936E-1AF3FE685159}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5964E1E-5078-4D61-936E-1AF3FE685159}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0CF5A815-8D18-45C1-BD0E-D0781AEFAB04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0CF5A815-8D18-45C1-BD0E-D0781AEFAB04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0CF5A815-8D18-45C1-BD0E-D0781AEFAB04}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0CF5A815-8D18-45C1-BD0E-D0781AEFAB04}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CEF1EF14-3D6E-4E5E-A56E-C73C60A1B947}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CEF1EF14-3D6E-4E5E-A56E-C73C60A1B947}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CEF1EF14-3D6E-4E5E-A56E-C73C60A1B947}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CEF1EF14-3D6E-4E5E-A56E-C73C60A1B947}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEE37AEA-43CE-4B17-B256-ACAF3CE6D6AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEE37AEA-43CE-4B17-B256-ACAF3CE6D6AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEE37AEA-43CE-4B17-B256-ACAF3CE6D6AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEE37AEA-43CE-4B17-B256-ACAF3CE6D6AC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8B55D8EC-AB3E-4213-B794-EBF650132D24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B55D8EC-AB3E-4213-B794-EBF650132D24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B55D8EC-AB3E-4213-B794-EBF650132D24}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8B55D8EC-AB3E-4213-B794-EBF650132D24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{944DE844-71E2-48A7-AD57-A814343817D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{944DE844-71E2-48A7-AD57-A814343817D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{944DE844-71E2-48A7-AD57-A814343817D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{944DE844-71E2-48A7-AD57-A814343817D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9DFA6C8-51E6-44F4-AC4F-F98C9E2733BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9DFA6C8-51E6-44F4-AC4F-F98C9E2733BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9DFA6C8-51E6-44F4-AC4F-F98C9E2733BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9DFA6C8-51E6-44F4-AC4F-F98C9E2733BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2FDB71EA-C086-493F-8126-789EF156A0AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FDB71EA-C086-493F-8126-789EF156A0AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FDB71EA-C086-493F-8126-789EF156A0AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2FDB71EA-C086-493F-8126-789EF156A0AD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{B5964E1E-5078-4D61-936E-1AF3FE685159} = {38EA41D3-C785-41B5-84CF-61954FAB20CA}
-		{0CF5A815-8D18-45C1-BD0E-D0781AEFAB04} = {38EA41D3-C785-41B5-84CF-61954FAB20CA}
-		{CEF1EF14-3D6E-4E5E-A56E-C73C60A1B947} = {38EA41D3-C785-41B5-84CF-61954FAB20CA}
-		{EEE37AEA-43CE-4B17-B256-ACAF3CE6D6AC} = {38EA41D3-C785-41B5-84CF-61954FAB20CA}
-		{8B55D8EC-AB3E-4213-B794-EBF650132D24} = {38EA41D3-C785-41B5-84CF-61954FAB20CA}
+		{944DE844-71E2-48A7-AD57-A814343817D6} = {38EA41D3-C785-41B5-84CF-61954FAB20CA}
+		{B9DFA6C8-51E6-44F4-AC4F-F98C9E2733BC} = {38EA41D3-C785-41B5-84CF-61954FAB20CA}
+		{2FDB71EA-C086-493F-8126-789EF156A0AD} = {38EA41D3-C785-41B5-84CF-61954FAB20CA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6D1DE49F-00C5-4ADB-A183-3CD6E02E38BB}

ExNihilo/Base/Properties/BrushProperty.cs

@@ -64,7 +64,7 @@ public BrushProperty WithRandomizedColor(Color[] palette)
         return this;
     }
 
-    private IBrush GetBrush() => Type.Value switch
+    private Brush GetBrush() => Type.Value switch
     {
         BrushType.Vertical => Brushes.Vertical(Color),
         BrushType.Horizontal => Brushes.Horizontal(Color),
@@ -82,9 +82,9 @@ public override void Randomize(Random r, bool force = false)
         Color.Randomize(r);
     }
 
-    public IBrush Value { get => GetValue(); }
+    public Brush Value { get => GetValue(); }
 
-    public IBrush GetValue() => Type.Value switch
+    public Brush GetValue() => Type.Value switch
     {
         BrushType.Vertical => Brushes.Vertical(Color),
         BrushType.Horizontal => Brushes.Horizontal(Color),
@@ -96,7 +96,7 @@ public override void Randomize(Random r, bool force = false)
         _ => Brushes.Solid(Color)
     };
 
-    //public static implicit operator IBrush(BrushProperty brushProperty)
+    //public static implicit operator Brush(BrushProperty brushProperty)
     //{
     //    return brushProperty.Type.Value switch
     //    {

ExNihilo/Base/Properties/PenProperty.cs

@@ -83,7 +83,7 @@ public override void Randomize(Random r, bool force = false)
         Color.Randomize(r);
     }
 
-    public IPen GetValue()
+    public Pen GetValue()
     {
         return Type.Value switch
         {
@@ -94,5 +94,5 @@ public IPen GetValue()
             _ => Pens.Solid(Color, Width)
         };
     }
-    public IPen Value { get => GetValue(); }
+    public Pen Value { get => GetValue(); }
 }

ExNihilo/Base/Visuals/Effect.cs

@@ -1,5 +1,8 @@
 namespace ExNihilo.Base;
 
+public enum EffectType { Color, Convultional, Distort, Noise, Transform};
+
 public abstract class Effect : Renderable
 {
+    public abstract EffectType EffectType { get; }
 }

ExNihilo/Effects/Color/AdaptiveThreshold.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class AdaptiveThreshold : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     /// <summary>
     /// Threshold limit (0.0-1.0) to consider for binarization.
     /// </summary>

ExNihilo/Effects/Color/BinaryThreshold.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class BinaryThreshold : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     /// <summary>
     /// Threshold limit (0.0-1.0) to consider for binarization.
     /// </summary>

ExNihilo/Effects/Color/BlackWhite.cs

@@ -9,6 +9,8 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class BlackWhite : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
+
     public override void Render(Image image, GraphicsOptions graphicsOptions) =>
         image.Mutate(x => x.BlackWhite());
 }

ExNihilo/Effects/Color/ColorBlindness.cs

@@ -9,6 +9,8 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class ColorBlindness : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
+
     /// <summary>
     /// The type of color blindness simulator to apply.
     /// </summary>

ExNihilo/Effects/Color/Contrast.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Contrast : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     /// <summary>
     /// The proportion of the conversion. Must be greater than or equal to 0.
     /// </summary>

ExNihilo/Effects/Color/Dithering.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Dithering : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     public override void Render(Image image, GraphicsOptions graphicsOptions) =>
         image.Mutate(x => x.Dither());
 }

ExNihilo/Effects/Color/FilterMatrix.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class FilterMatrix : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     /// <summary>
     /// The filter color matrix
     /// </summary>

ExNihilo/Effects/Color/Glow.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Glow : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     /// <summary>
     /// The radius of the glow
     /// </summary>

ExNihilo/Effects/Color/GrayScale.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class GrayScale : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     public override void Render(Image image, GraphicsOptions graphicsOptions) =>
         image.Mutate(x => x.Grayscale());
 }

ExNihilo/Effects/Color/HSBCorrection.cs

@@ -10,6 +10,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class HSBCorrection : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     /// <summary>
     /// Hue shift value (-255 - 255)
     /// </summary>

ExNihilo/Effects/Color/HistogramEqualization.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class HistogramEqualization : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     public override void Render(Image image, GraphicsOptions graphicsOptions) =>
         image.Mutate(x => x.HistogramEqualization());
 }

ExNihilo/Effects/Color/Invert.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Invert : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     public override void Render(Image image, GraphicsOptions graphicsOptions) =>
         image.Mutate(x => x.Invert());
 }

ExNihilo/Effects/Color/KodaChrome.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class KodaChrome : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     public override void Render(Image image, GraphicsOptions graphicsOptions) =>
         image.Mutate(x => x.Kodachrome());
 }

ExNihilo/Effects/Color/Lightness.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Lightness : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     /// <summary>
     /// The proportion of the conversion. Must be greater than or equal to 0.
     /// </summary>

ExNihilo/Effects/Color/Lomograph.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Lomograph : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     public override void Render(Image image, GraphicsOptions graphicsOptions) =>
         image.Mutate(x => x.Lomograph());
 }

ExNihilo/Effects/Color/Opacity.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Opacity : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     /// <summary>
     /// The proportion of the conversion. Must be between 0 and 1.
     /// </summary>

ExNihilo/Effects/Color/Polaroid.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Polaroid : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     public override void Render(Image image, GraphicsOptions graphicsOptions) =>
         image.Mutate(x => x.Polaroid());
 }

ExNihilo/Effects/Color/Sepia.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Sepia : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     public override void Render(Image image, GraphicsOptions graphicsOptions) =>
         image.Mutate(x => x.Sepia());
 }

ExNihilo/Effects/Color/Vignette.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Vignette : Effect
 {
+    public override EffectType EffectType => EffectType.Color;
     public override void Render(Image image, GraphicsOptions graphicsOptions) =>
         image.Mutate(x => x.Vignette());
 }

ExNihilo/Effects/Convultional/BokehBlur.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class BokehBlur : Effect
 {
+    public override EffectType EffectType => EffectType.Convultional;
     /// <summary>  The 'radius' value representing the size of the area to sample. </summary>
     public IntProperty Radius = new(1, int.MaxValue, 32);
     /// <summary>  The 'components' value representing the number of kernels to use to approximate the bokeh effect. </summary>

ExNihilo/Effects/Convultional/BoxBlur.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class BoxBlur : Effect
 {
+    public override EffectType EffectType => EffectType.Convultional;
     /// <summary>  The 'radius' value representing the size of the area to sample. </summary>
     public IntProperty Radius = new(1, int.MaxValue, 32);
 

ExNihilo/Effects/Convultional/Crystallize.cs

@@ -10,6 +10,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Crystallize : Effect
 {
+    public override EffectType EffectType => EffectType.Convultional;
     /// <summary>
     /// The number of crystals into which the image will be divided. Must be gretear then 1
     /// </summary>

ExNihilo/Effects/Convultional/EdgeDetection.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class EdgeDetection : Effect
 {
+    public override EffectType EffectType => EffectType.Convultional;
     public override void Render(Image image, GraphicsOptions graphicsOptions) =>
         image.Mutate(x => x.DetectEdges());
 }

ExNihilo/Effects/Convultional/GaussianBlur.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class GaussianBlur : Effect
 {
+    public override EffectType EffectType => EffectType.Convultional;
     /// <summary>
     /// The 'sigma' (0.0-1.0) value representing the weight of the blur.
     /// </summary>

ExNihilo/Effects/Convultional/GaussianSharpen.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class GaussianSharpen : Effect
 {
+    public override EffectType EffectType => EffectType.Convultional;
     /// <summary>
     /// The 'sigma' (0.0-1.0) value representing the weight of the blur.
     /// </summary>

ExNihilo/Effects/Convultional/OilPaint.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class OilPaint : Effect
 {
+    public override EffectType EffectType => EffectType.Convultional;
     /// <summary> The number of intensity levels. Higher values result in a broader range of color intensities forming part of the result image. </summary>
     public IntProperty Levels = new(1, int.MaxValue, 10);
     /// <summary> The number of neighboring pixels used in calculating each individual pixel value. </summary>

ExNihilo/Effects/Convultional/Pixelate.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Pixelate : Effect
 {
+    public override EffectType EffectType => EffectType.Convultional;
     /// <summary>
     /// The size of the pixels. Must be greater then 1
     /// </summary>

ExNihilo/Effects/Convultional/Quantize.cs

@@ -9,6 +9,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Quantize : Effect
 {
+    public override EffectType EffectType => EffectType.Convultional;
     public override void Render(Image image, GraphicsOptions graphicsOptions) =>
         image.Mutate(x => x.Quantize());
 }

ExNihilo/Effects/Distort/Bulge.cs

@@ -10,6 +10,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Bulge : Effect
 {
+    public override EffectType EffectType => EffectType.Distort;
     /// <summary>
     /// Center of bulge effect
     /// </summary>

ExNihilo/Effects/Distort/RgbShift.cs

@@ -10,6 +10,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class RgbShift : Effect
 {
+    public override EffectType EffectType => EffectType.Distort;
     /// <summary>
     /// Shift offset value by all channel. 
     /// </summary>

ExNihilo/Effects/Distort/Ripple.cs

@@ -10,6 +10,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Ripple : Effect
 {
+    public override EffectType EffectType => EffectType.Distort;
     /// <summary>
     /// Coordinates of effect center.
     /// </summary>

ExNihilo/Effects/Distort/Slices.cs

@@ -10,6 +10,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Slices : Effect
 {
+    public override EffectType EffectType => EffectType.Distort;
     /// <summary>
     /// Seed value
     /// </summary>

ExNihilo/Effects/Distort/SlitScan.cs

@@ -10,6 +10,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class SlitScan : Effect
 {
+    public override EffectType EffectType => EffectType.Distort;
     /// <summary>
     /// SlitScan time value. Must be greater then 0.
     /// </summary>

ExNihilo/Effects/Distort/Swirl.cs

@@ -10,6 +10,7 @@ namespace ExNihilo.Effects;
 /// </summary>
 public class Swirl : Effect
 {
+    public override EffectType EffectType => EffectType.Distort;
     /// <summary>
     /// Coordinates of effect center.
     /// </summary>