出撃海域を表示するようにした

diff --git a/KCD/HMDocksViewController.m b/KCD/HMDocksViewController.m
index 3a2740b..1559f83 100644 (file)
--- a/KCD/HMDocksViewController.m
+++ b/KCD/HMDocksViewController.m
@@ -15,6 +15,9 @@
 #import "HMKenzoDockStatus.h"
 
 
+#import "HMTemporaryDataStore.h"
+
+
 @interface HMDocksViewController ()
 
 @property (strong) HMMissionStatus *mission2Status;
@@ -32,6 +35,11 @@
 @property (strong) HMKenzoDockStatus *kdock4Status;
 
 
+@property (readonly) NSManagedObjectContext *battleManagedObjectController;
+@property (nonatomic, weak) IBOutlet NSObjectController *battleContoller;
+@property (readonly) NSManagedObject *battle;
+
+
 @end
 
 @implementation HMDocksViewController
@@ -100,6 +108,7 @@
                _kdock4Status = [[HMKenzoDockStatus alloc] initWithDockNumber:4];
                _kdock4Status.managedObjectContext = self.managedObjectContext;
                [self bind:@"kDock4Time" toObject:self.kdock4Status withKeyPath:@"time" options:nil];
+               
        }
        return self;
 }
@@ -111,6 +120,13 @@
                                                                   selector:@selector(fire:)
                                                                   userInfo:nil
                                                                        repeats:YES];
+       
+       
+       //
+       [self.battleContoller addObserver:self
+                                                  forKeyPath:@"selection"
+                                                         options:0
+                                                         context:NULL];
 }
 
 
@@ -132,19 +148,74 @@
        [self.mission2Status update];
        [self.mission3Status update];
        [self.mission4Status update];
+       
 }
 
-- (NSString *)firstFleetName
+- (NSManagedObjectContext *)battleManagedObjectController
 {
-       return @"First Fleet Name";
+       return [[HMTemporaryDataStore defaultManager] managedObjectContext];
 }
-- (NSString *)areaName
+- (NSManagedObject *)battle
 {
-       return @"ABCDEFGHIJKLMN";
+       HMTemporaryDataStore *store = [HMTemporaryDataStore defaultManager];
+       NSArray *array  = [store objectsWithEntityName:@"Battle" predicate:nil error:NULL];
+       return array.count > 0 ? array[0] : nil;
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+       if([keyPath isEqualToString:@"selection"]) {
+               [self willChangeValueForKey:@"fleetName"];
+               [self didChangeValueForKey:@"fleetName"];
+//             [self willChangeValueForKey:@"areaName"];
+//             [self didChangeValueForKey:@"areaName"];
+//             [self willChangeValueForKey:@"areaNumber"];
+//             [self didChangeValueForKey:@"areaNumber"];
+               
+               return;
+       }
+       
+       return [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+}
+
+- (NSString *)fleetName
+{
+       HMServerDataStore *store = [HMServerDataStore defaultManager];
+       
+       NSError *error = nil;
+       id deckId = [self.battleContoller valueForKeyPath:@"content.deckId"];
+       NSArray *array = [store objectsWithEntityName:@"Deck"
+                                                                                       error:&error
+                                                                 predicateFormat:@"id = %@", deckId];
+       if(error) {
+               NSLog(@"%s error: %@", __PRETTY_FUNCTION__, error);
+       }
+       if(array.count == 0) return @"";
+       
+       return [NSString stringWithFormat:@"%@", [array[0] valueForKey:@"name"]];
 }
 - (NSString *)areaNumber
 {
-       return @"5-5";
+       return [NSString stringWithFormat:@"%@-%@",
+                       [self.battleContoller valueForKeyPath:@"content.mapArea"],
+                       [self.battleContoller valueForKeyPath:@"content.mapInfo"]];
+}
+- (NSString *)areaName
+{
+       HMServerDataStore *store = [HMServerDataStore defaultManager];
+       
+       NSError *error = nil;
+       id mapAreaId = [self.battleContoller valueForKeyPath:@"content.mapArea"];
+       id mapInfoId = [self.battleContoller valueForKeyPath:@"content.mapInfo"];
+       NSArray *array = [store objectsWithEntityName:@"MasterMapInfo"
+                                                                                       error:&error
+                                                                 predicateFormat:@"maparea_id = %@ AND %K = %@", mapAreaId, @"no", mapInfoId];
+       if(error) {
+               NSLog(@"%s error: %@", __PRETTY_FUNCTION__, error);
+       }
+       if(array.count == 0) return @"";
+       
+       return [NSString stringWithFormat:@"%@", [array[0] valueForKey:@"name"]];
 }
 
 @end

diff --git a/KCD/ja.lproj/HMDocksViewController.xib b/KCD/ja.lproj/HMDocksViewController.xib
index 808cd50..e84de1c 100644 (file)
--- a/KCD/ja.lproj/HMDocksViewController.xib
+++ b/KCD/ja.lproj/HMDocksViewController.xib
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6245"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HMDocksViewController">
             <connections>
+                <outlet property="battleContoller" destination="sje-58-fiD" id="4Qx-Ag-AL2"/>
                 <outlet property="view" destination="vGg-MO-rzn" id="Z4V-4O-pqr"/>
             </connections>
         </customObject>
@@ -432,21 +433,21 @@ ffff</string>
                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                             <connections>
-                                <binding destination="-2" name="displayPatternValue1" keyPath="firstFleetName" id="4xB-VQ-EzV">
+                                <binding destination="-2" name="displayPatternValue1" keyPath="fleetName" id="FQD-vL-yW8">
                                     <dictionary key="options">
                                         <string key="NSDisplayPattern">%{value1}@が
 （%{value3}@）%{value2}@ 
 に出撃中</string>
                                     </dictionary>
                                 </binding>
-                                <binding destination="-2" name="displayPatternValue2" keyPath="areaName" previousBinding="4xB-VQ-EzV" id="qEs-oE-kTe">
+                                <binding destination="-2" name="displayPatternValue2" keyPath="areaName" previousBinding="FQD-vL-yW8" id="BZg-S2-j1n">
                                     <dictionary key="options">
                                         <string key="NSDisplayPattern">%{value1}@が
 （%{value3}@）%{value2}@ 
 に出撃中</string>
                                     </dictionary>
                                 </binding>
-                                <binding destination="-2" name="displayPatternValue3" keyPath="areaNumber" previousBinding="qEs-oE-kTe" id="j2B-gw-Fad">
+                                <binding destination="-2" name="displayPatternValue3" keyPath="areaNumber" previousBinding="BZg-S2-j1n" id="xti-tJ-Fc2">
                                     <dictionary key="options">
                                         <string key="NSDisplayPattern">%{value1}@が
 （%{value3}@）%{value2}@ 
@@ -459,5 +460,10 @@ ffff</string>
                 </customView>
             </subviews>
         </customView>
+        <objectController mode="entity" entityName="Battle" automaticallyPreparesContent="YES" id="sje-58-fiD">
+            <connections>
+                <binding destination="-2" name="managedObjectContext" keyPath="battleManagedObjectController" id="i82-8p-b9t"/>
+            </connections>
+        </objectController>
     </objects>
 </document>

diff --git a/KCD/ja.lproj/HMShipWindowController.xib b/KCD/ja.lproj/HMShipWindowController.xib
index ed18c51..ef46b21 100644 (file)
--- a/KCD/ja.lproj/HMShipWindowController.xib
+++ b/KCD/ja.lproj/HMShipWindowController.xib
@@ -429,7 +429,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <connections>
-                                                <binding destination="AzW-Cs-1fg" name="value" keyPath="arrangedObjects.sally_flag_0" id="JwC-WQ-pK7"/>
+                                                <binding destination="AzW-Cs-1fg" name="value" keyPath="arrangedObjects.maparea_id" id="ojW-LB-pF4"/>
                                             </connections>
                                         </tableColumn>
                                         <tableColumn width="269" minWidth="10" maxWidth="3.4028234663852886e+38" id="iHO-Ms-gwT">
@@ -865,6 +865,9 @@
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="OOA-0T-5OQ" name="value" keyPath="arrangedObjects.onslot_0" id="Ztu-tw-8Ca"/>
+                                            </connections>
                                         </tableColumn>
                                         <tableColumn width="46" minWidth="10" maxWidth="3.4028234663852886e+38" id="abY-CE-Tjv">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
@@ -879,7 +882,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <connections>
-                                                <binding destination="OOA-0T-5OQ" name="value" keyPath="arrangedObjects.bull" id="OtN-7s-1vl"/>
+                                                <binding destination="OOA-0T-5OQ" name="value" keyPath="arrangedObjects.onslot_1" id="01s-Cm-hDg"/>
                                             </connections>
                                         </tableColumn>
                                         <tableColumn width="52" minWidth="10" maxWidth="3.4028234663852886e+38" id="Sd6-Fs-0Fa">
@@ -895,7 +898,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <connections>
-                                                <binding destination="OOA-0T-5OQ" name="value" keyPath="arrangedObjects.master_ship.bull_max" id="rSz-WH-MW1"/>
+                                                <binding destination="OOA-0T-5OQ" name="value" keyPath="arrangedObjects.slot_0" id="ejN-a4-o3t"/>
                                             </connections>
                                         </tableColumn>
                                         <tableColumn width="40" minWidth="10" maxWidth="3.4028234663852886e+38" id="9nU-cW-3gD">
@@ -905,14 +908,13 @@
                                                 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                             </tableHeaderCell>
                                             <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="6Sp-6k-ePo">
-                                                <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="NsR-MD-hFI"/>
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <connections>
-                                                <binding destination="OOA-0T-5OQ" name="value" keyPath="arrangedObjects.sally_area" id="xUY-58-RKN"/>
+                                                <binding destination="OOA-0T-5OQ" name="value" keyPath="arrangedObjects.slot_1" id="veb-cU-FhS"/>
                                             </connections>
                                         </tableColumn>
                                     </tableColumns>