不要となっていたプロパティを削除

[kcd/KCD.git] / KCD / CombileViewController.swift

diff --git a/KCD/CombileViewController.swift b/KCD/CombileViewController.swift
index 003724f..7172d4e 100644 (file)
--- a/KCD/CombileViewController.swift
+++ b/KCD/CombileViewController.swift
@@ -13,25 +13,31 @@ final class CombileViewController: NSViewController {
     let fleet1 = FleetViewController(viewType: .miniVierticalType)!
     let fleet2 = FleetViewController(viewType: .miniVierticalType)!
     
-    @IBOutlet weak var placeholder1: NSView!
-    @IBOutlet weak var placeholder2: NSView!
+    @IBOutlet private weak var placeholder1: NSView!
+    @IBOutlet private weak var placeholder2: NSView!
     
     @objc dynamic var fleet1TPValue: Int = 0 {
+        
         willSet {
+            
             willChangeValue(forKey: #keyPath(TPValue))
             willChangeValue(forKey: #keyPath(BRankTPValue))
         }
         didSet {
+            
             didChangeValue(forKey: #keyPath(TPValue))
             didChangeValue(forKey: #keyPath(BRankTPValue))
         }
     }
     @objc dynamic var fleet2TPValue: Int = 0 {
+        
         willSet {
+            
             willChangeValue(forKey: #keyPath(TPValue))
             willChangeValue(forKey: #keyPath(BRankTPValue))
         }
         didSet {
+            
             didChangeValue(forKey: #keyPath(TPValue))
             didChangeValue(forKey: #keyPath(BRankTPValue))
         }
@@ -40,41 +46,60 @@ final class CombileViewController: NSViewController {
     @objc dynamic var BRankTPValue: Int { return Int(floor(Double(TPValue) * 0.7)) }
     
     @objc dynamic var fleet1Seiku: Int = 0 {
+        
         willSet {
+            
             willChangeValue(forKey: #keyPath(seiku))
         }
         didSet {
+            
             didChangeValue(forKey: #keyPath(seiku))
         }
     }
     @objc dynamic var fleet2Seiku: Int = 0 {
+        
         willSet {
+            
             willChangeValue(forKey: #keyPath(seiku))
         }
         didSet {
+            
             didChangeValue(forKey: #keyPath(seiku))
         }
     }
     @objc dynamic var seiku: Int { return fleet1Seiku + fleet2Seiku }
     
     @objc dynamic var fleet1CalculatedSeiku: Int = 0 {
+        
         willSet {
+            
             willChangeValue(forKey: #keyPath(seiku))
         }
         didSet {
+            
             didChangeValue(forKey: #keyPath(seiku))
         }
     }
     @objc dynamic var fleet2CalculatedSeiku: Int = 0 {
+        
         willSet {
+            
             willChangeValue(forKey: #keyPath(calculatedSeiku))
         }
         didSet {
+            
             didChangeValue(forKey: #keyPath(calculatedSeiku))
         }
     }
     @objc dynamic var calculatedSeiku: Int { return fleet1CalculatedSeiku + fleet2CalculatedSeiku }
     
+    var combineType: CombineType? {
+        
+        willSet { willChangeValue(forKey: #keyPath(combineTypeName)) }
+        didSet { didChangeValue(forKey: #keyPath(combineTypeName)) }
+    }
+    @objc dynamic var combineTypeName: String? { return combineType?.displayName() }
+    
     override var nibName: NSNib.Name {
         
         return .nibName(instanceOf: self)
@@ -86,12 +111,15 @@ final class CombileViewController: NSViewController {
         
         let placeholders: [NSView] = [placeholder1, placeholder2]
         let fleets = [fleet1, fleet2]
-        zip(placeholders, fleets).enumerated().forEach {
+        zip(placeholders, fleets).forEach { placeholder, fleet in
+            
+            fleet.view.frame = placeholder.frame
+            fleet.view.autoresizingMask = placeholder.autoresizingMask
+            placeholder.superview?.replaceSubview(placeholder, with: fleet.view)
+        }
+        fleets.enumerated().forEach { offset, fleet in
             
-            $0.element.1.view.frame = $0.element.0.frame
-            $0.element.1.view.autoresizingMask = $0.element.0.autoresizingMask
-            $0.element.0.superview?.replaceSubview($0.element.0, with: $0.element.1.view)
-            $0.element.1.fleetNumber = $0.offset + 1
+            fleet.fleetNumber = offset + 1
         }
         
         bind(NSBindingName(#keyPath(fleet1TPValue)), to: fleet1, withKeyPath: #keyPath(FleetViewController.totalTPValue))
@@ -102,6 +130,13 @@ final class CombileViewController: NSViewController {
         
         bind(NSBindingName(#keyPath(fleet1CalculatedSeiku)), to: fleet1, withKeyPath: #keyPath(FleetViewController.totalCalclatedSeiku))
         bind(NSBindingName(#keyPath(fleet2CalculatedSeiku)), to: fleet2, withKeyPath: #keyPath(FleetViewController.totalCalclatedSeiku))
+        
+        NotificationCenter.default
+            .addObserver(forName: .CombinedDidCange, object: nil, queue: .main) { notification in
+                
+                let type = notification.userInfo?[CombinedCommand.userInfoKey] as? CombineType
+                self.combineType = type
+        }
     }
     
     deinit {