register filter with display name

YuAo · Jan 31, 2016 · eb96e53 · eb96e53
1 parent 9268bd7
commit eb96e53
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 22 deletions.
diff --git a/Sources/YUCIColorLookup.m b/Sources/YUCIColorLookup.m
@@ -18,7 +18,8 @@ + (void)load {
             if ([CIFilter respondsToSelector:@selector(registerFilterName:constructor:classAttributes:)]) {
                 [CIFilter registerFilterName:NSStringFromClass([YUCIColorLookup class])
                                  constructor:[YUCIFilterConstructor constructor]
-                             classAttributes:@{kCIAttributeFilterCategories: @[kCICategoryStillImage,kCICategoryVideo,kCICategoryColorEffect,kCICategoryInterlaced,kCICategoryNonSquarePixels]}];
+                             classAttributes:@{kCIAttributeFilterCategories: @[kCICategoryStillImage,kCICategoryVideo,kCICategoryColorEffect,kCICategoryInterlaced,kCICategoryNonSquarePixels],
+                                               kCIAttributeFilterDisplayName: @"Color Lookup"}];
             }
         }
     });

diff --git a/Sources/YUCIRGBToneCurve.m b/Sources/YUCIRGBToneCurve.m
@@ -31,7 +31,8 @@ + (void)load {
             if ([CIFilter respondsToSelector:@selector(registerFilterName:constructor:classAttributes:)]) {
                 [CIFilter registerFilterName:NSStringFromClass([YUCIRGBToneCurve class])
                                  constructor:[YUCIFilterConstructor constructor]
-                             classAttributes:@{kCIAttributeFilterCategories: @[kCICategoryStillImage,kCICategoryVideo, kCICategoryColorAdjustment,kCICategoryInterlaced]}];
+                             classAttributes:@{kCIAttributeFilterCategories: @[kCICategoryStillImage,kCICategoryVideo, kCICategoryColorAdjustment,kCICategoryInterlaced],
+                                               kCIAttributeFilterDisplayName: @"RGB Tone Curve"}];
             }
         }
     });

diff --git a/VividDemo/VividDemo/FilterStore.swift b/VividDemo/VividDemo/FilterStore.swift
@@ -8,34 +8,24 @@
 
 import CoreImage
 
-class FilterItem {
-    let name: String
-    let filter: CIFilter?
-
-    init(name: String, filter: CIFilter?) {
-        self.name = name
-        self.filter = filter
-    }
-}
-
 class FilterStore {
-    static let filters: [FilterItem] = {
-        var filters = [FilterItem]()
+    static let filters: [CIFilter?] = {
+        var filters = [CIFilter?]()
 
-        filters.append(FilterItem(name: "No Filter", filter: nil))
+        filters.append(nil)
 
-        filters.append(FilterItem(name: "Color Lookup", filter: CIFilter(
+        filters.append(CIFilter(
             name: "YUCIColorLookup",
             withInputParameters:[
                 "inputColorLookupTable": CIImage(contentsOfURL: NSBundle.mainBundle().URLForResource("color_lookup_miss_etikate", withExtension: "png")!)!
-            ]))
+            ])
         )
 
-        filters.append(FilterItem(name: "RGB Tone Curve", filter: CIFilter(
+        filters.append(CIFilter(
             name: "YUCIRGBToneCurve",
             withInputParameters:[
                 "inputRGBCompositeControlPoints": [CIVector(x: 0, y: 0),CIVector(x: 0.5, y: 0.7), CIVector(x: 1, y: 1)]
-            ]))
+            ])
         )
 
         return filters

diff --git a/VividDemo/VividDemo/MainWindowController.swift b/VividDemo/VividDemo/MainWindowController.swift
@@ -19,9 +19,10 @@ class MainWindowController: NSWindowController {
 
         self.filtersToolbarItem.minSize.height = 32
         self.filtersPopUpButton.menu?.removeAllItems()
-        for filterItem in FilterStore.filters {
-            let menuItem = NSMenuItem(title: filterItem.name, action: nil, keyEquivalent: "")
-            menuItem.representedObject = filterItem.filter
+        for filter in FilterStore.filters {
+            let filterName = (filter?.attributes[kCIAttributeFilterDisplayName] as? String) ?? "Unknown"
+            let menuItem = NSMenuItem(title: (filter != nil ? filterName : "No Filter"), action: nil, keyEquivalent: "")
+            menuItem.representedObject = filter
             self.filtersPopUpButton.menu?.addItem(menuItem)
         }
     }