Working v1.0

Author: julzerinos

winforms-image-processor/winforms-image-processor/Filters/FilterManager.cs

@@ -28,17 +28,23 @@ static class FilterManager
             { "Emboss",                 (bmp) => bmp.ApplyFilter(ApplyKernel, Kernel.EmbossKernel) },
             { "Outline",                (bmp) => bmp.ApplyFilter(ApplyKernel, Kernel.OutlineKernel) },
 
-            { "Custom Kernel",          (bmp) => bmp.ApplyFilter(ApplyKernel, Kernel.customKernel) },
+            //{ "Custom Kernel",          (bmp) => bmp.ApplyFilter(ApplyKernel, Kernel.customKernel) },
         };
 
+        public static void UpdateFilterMapping(string filter)
+        {
+            filterMapping.Add(
+                filter,
+                (bmp) => bmp.ApplyFilter(ApplyKernel, Kernel.customKernels[filter])
+                );
+        }
+
         public static Bitmap RecreateFilterStateFromState(Bitmap originalImage, List<string> state)
         {
             Debug.Print("Recreating filter state");
 
             foreach (string filter in state)
-            {
                 originalImage = filterMapping[filter](originalImage);
-            }
 
             return originalImage;
         }

winforms-image-processor/winforms-image-processor/Filters/Kernel.cs

@@ -1,4 +1,5 @@
-using System.Diagnostics;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.Text;
 
@@ -51,7 +52,8 @@ public override string ToString()
 
     public static class Kernel
     {
-        public static CustomKernel customKernel = new CustomKernel(new double[3, 3] { { 0, 0, 0 }, { 0, 1, 0 }, { 0, 0, 0 } }, 1, 0, Point.Empty);
+        public static Dictionary<string, CustomKernel> customKernels = new Dictionary<string, CustomKernel>();
+        // public static CustomKernel customKernel = new CustomKernel(new double[3, 3] { { 0, 0, 0 }, { 0, 1, 0 }, { 0, 0, 0 } }, 1, 0, Point.Empty);
 
         public static CustomKernel SharpenKernel = new CustomKernel(new double[3, 3] { { 0, -1, 0 }, { -1, 5, -1 }, { 0, -1, 0 } }, 1, 0, Point.Empty);
         public static CustomKernel OutlineKernel = new CustomKernel(new double[3, 3] { { -1, -1, -1 }, { -1, 8, -1 }, { -1, -1, -1 } }, 1, 0, Point.Empty);

winforms-image-processor/winforms-image-processor/Form/ImageProcessorForm.Designer.cs

@@ -17,6 +17,8 @@ public ImageProcessorForm()
         {
             InitializeComponent();
 
+            Console.WriteLine("test" + 1);
+
             foreach (var filter in FilterManager.filterMapping)
             {
                 ToolStripMenuItem subItem = new ToolStripMenuItem(filter.Key);
@@ -100,7 +102,19 @@ private void SaveImageFileMenu_Click(object sender, EventArgs e)
 
         private void customKernelToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            KernelEditor kernelEditor = new KernelEditor(this);
+            //KernelEditor kernelEditor = new KernelEditor(this);
+            //if (kernelEditor.ShowDialog() == DialogResult.Cancel) return;
+
+            //CacheManager.ResetCache((Bitmap)OrgPictureBox.Image);
+            //UpdateCacheIfEmpty();
+
+            //FltPictureBox.Image = CacheManager.GetBitmapForFilterState();
+        }
+
+        public void OpenKernelEditor(object sender, EventArgs e)
+        {
+            ToolStripMenuItem ts = sender as ToolStripMenuItem;
+            KernelEditor kernelEditor = new KernelEditor(this, ts.OwnerItem.Text);
             if (kernelEditor.ShowDialog() == DialogResult.Cancel) return;
 
             CacheManager.ResetCache((Bitmap)OrgPictureBox.Image);
@@ -113,5 +127,28 @@ private void copyToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Clipboard.SetImage(FltPictureBox.Image);
         }
+
+        static public int customKernelCounter = 0;
+
+        private void addToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            string name = "Custom Kernel " + ++customKernelCounter;
+            ToolStripMenuItem ts = new ToolStripMenuItem(name);
+
+            ToolStripMenuItem tsEdit = new ToolStripMenuItem("Edit");
+
+            tsEdit.Click += OpenKernelEditor;
+
+            ts.CheckOnClick = true;
+            ts.CheckedChanged += StateChange;
+
+            ts.DropDownItems.Add(tsEdit);
+
+            Kernel.customKernels.Add(name, new CustomKernel(new double[3, 3] { { 0, 0, 0 }, { 0, 1, 0 }, { 0, 0, 0 } }, 1, 0, Point.Empty));
+
+            FilterManager.UpdateFilterMapping(name);
+
+            filtersToolStripMenuItem.DropDownItems.Add(ts);
+        }
     }
 }

winforms-image-processor/winforms-image-processor/Form/ImageProcessorForm.cs

@@ -14,9 +14,11 @@ public KernelEditor()
         }
 
         private ImageProcessorForm imageProcessorForm;
-        public KernelEditor(Form callingForm)
+        private string kernel;
+        public KernelEditor(Form callingForm, string filter)
         {
             imageProcessorForm = callingForm as ImageProcessorForm;
+            kernel = filter;
             InitializeComponent();
             SetUpKernelEditor();
         }
@@ -33,7 +35,8 @@ public KernelEditor(Form callingForm)
 
         public void SetUpKernelEditor()
         {
-            CustomKernel customKernel = Kernel.customKernel;
+            Console.WriteLine(kernel);
+            CustomKernel customKernel = Kernel.customKernels[kernel];
 
             CBFilterType.DataSource = filterTypes;
 
@@ -121,7 +124,7 @@ public void SetKernelFromEditor()
             if (value == 0)
                 NUDDivisor.Value = 1;
 
-            Kernel.customKernel = new CustomKernel(
+            Kernel.customKernels[this.kernel] = new CustomKernel(
                 kernel,
                 value,
                 (int)NUDOffset.Value,