save gestures

dabaopku · Mar 10, 2012 · 7ce8267 · 7ce8267
1 parent a1dd297
commit 7ce8267
Show file tree

Hide file tree

Showing 7 changed files with 110 additions and 16 deletions.
diff --git a/iStroke/Action.hh b/iStroke/Action.hh
@@ -24,4 +24,7 @@
 
 -(id) initWithStroke:(Stroke *)s;
 
+-(NSDictionary *) save;
+-(id) initWithDict:(NSDictionary *)dict;
+
 @end
diff --git a/iStroke/Action.mm b/iStroke/Action.mm
@@ -32,11 +32,35 @@ - (id)initWithStroke:(iStroke::Stroke *)s
 
 - (void)dealloc
 {
-	[gesture release];
-    [image release];
-    [name release];
-    [cmd release];
+	if(gesture) [gesture release];
+    if(image) [image release];
+    if(name) [name release];
+    if(cmd) [cmd release];
     [super dealloc];
 }
 
+-(NSDictionary *) save
+{
+    NSMutableDictionary *dict=[NSMutableDictionary new];
+    [dict setObject:name forKey:@"name"];
+    [dict setObject:@"nil" forKey:@"cmd"];
+    [dict setObject:[gesture save] forKey:@"gesture"];
+
+    return dict;
+}
+
+-(id) initWithDict:(NSDictionary *)dict
+{
+    self=[super init];
+    if(self)
+    {
+        self.name=[dict objectForKey:@"name"];
+        self.gesture=[[Gesture alloc] initWithDict:[dict objectForKey:@"gesture"]];
+        cmd=nil;
+        self.image=[gesture loadImage];
+    }
+
+    return self;
+}
+
 @end
diff --git a/iStroke/Application.mm b/iStroke/Application.mm
@@ -99,6 +99,15 @@ -(NSDictionary *) save
         }
         [childArray release];
     }
+
+    if ([actions count]>0) {
+        NSMutableArray *actionArray=[NSMutableArray new];
+        [dict setObject:actionArray forKey:@"action"];
+        for (NSUInteger i=0,n=[actions count]; i<n; ++i) {
+            [actionArray addObject:[(Action*)[actions objectAtIndex:i] save]];
+        }
+        [actionArray release];
+    }
     return dict;
 }
 
@@ -110,7 +119,7 @@ -(id) initWithDict:(NSDictionary *)dict
         self.parent=nil;
         self.name=[dict objectForKey:@"name"];
         if (!name) {
-            return nil;
+            self.name=@"No name";
         }
 
         self.identifier=[dict objectForKey:@"id"];
@@ -119,16 +128,27 @@ -(id) initWithDict:(NSDictionary *)dict
             return nil;
         }
 
+        self.actions=[NSMutableArray new];
         self.children=[NSMutableArray new];
+
         NSArray *childArray=[dict objectForKey:@"child"];
-        if (!childArray) {
-            return self;
+        if (childArray) {        
+            for (NSUInteger i=0,n=[childArray count]; i<n; ++i) {
+                Application *app=[[Application alloc] initWithDict:[childArray objectAtIndex:i]];
+                if (app) {
+                    [self addChildApplication:app];
+                    [app release];
+                }
+            }
         }
-
-        for (NSUInteger i=0,n=[childArray count]; i<n; ++i) {
-            Application *app=[[Application alloc] initWithDict:[childArray objectAtIndex:i]];
-            if (app) {
-                [self addChildApplication:app];
+        NSArray *actionArray=[dict objectForKey:@"action"];
+        if (actionArray) {
+            for (NSUInteger i=0,n=[actionArray count]; i<n; ++i) {
+                Action *act=[[Action alloc] initWithDict:[actionArray objectAtIndex:i]];
+                if (act) {
+                    [actions addObject:act];
+                    [act release];
+                }
             }
         }
     }

diff --git a/iStroke/ApplicationManager.mm b/iStroke/ApplicationManager.mm
@@ -145,6 +145,9 @@ -(void) load
         app.parent=nil;
         [applications addObject:app];
     }
+
+    if([applications count]>0)
+        curApp=[applications objectAtIndex:0];
 }
 
 #pragma mark - NSOutlineView

diff --git a/iStroke/Gesture.hh b/iStroke/Gesture.hh
@@ -6,8 +6,6 @@
 //  Copyright 2012年 PKU. All rights reserved.
 //
 
-#include <vector>
-#include <string>
 #import "Stroke.hh"
 using namespace iStroke;
 
@@ -18,7 +16,6 @@ using namespace iStroke;
 
 @private
     Stroke * stroke;
-    std::string name;
     long key;
 }
 @property(assign) long key;
@@ -29,4 +26,7 @@ using namespace iStroke;
 -(bool) saveImage;
 -(NSImage *) loadImage;
 
+-(NSDictionary *) save;
+-(id) initWithDict:(NSDictionary *)dict;
+
 @end
diff --git a/iStroke/Gesture.mm b/iStroke/Gesture.mm
@@ -102,4 +102,48 @@ -(NSImage *) loadImage
     NSImage *img=[[NSImage alloc] initWithContentsOfFile:file];
     return img;
 }
+
+-(NSDictionary *) save
+{
+    NSMutableDictionary *dict=[NSMutableDictionary new];
+    [dict setObject:[NSNumber numberWithLong:key] forKey:@"key"];
+
+    NSMutableArray *stk=[NSMutableArray new];
+    [dict setObject:stk forKey:@"stoke"];
+
+    for (int i=0,n=stroke->size(); i<n; ++i) {
+        [stk addObject:[NSNumber numberWithDouble:stroke->x(i)]];
+        [stk addObject:[NSNumber numberWithDouble:stroke->y(i)]];
+    }
+
+    [stk release];
+    return dict;
+}
+
+-(id) initWithDict:(NSDictionary *)dict
+{
+    self=[super init];
+    if(self)
+    {
+        NSNumber *num=[dict objectForKey:@"key"];
+        if(!num)
+            return nil;
+        self.key=[num longValue];
+
+        NSArray *arr=[dict objectForKey:@"stoke"];
+        self.stroke=new iStroke::Stroke;
+        if(arr)
+        {
+            for (NSInteger i=0,n=[arr count]/2; i<n; ++i) {
+                double x=[[arr objectAtIndex:2*i] doubleValue];
+                double y=[[arr objectAtIndex:2*i+1] doubleValue];
+                self.stroke->addPoint(x, y);
+            }
+            self.stroke->finish();
+        }
+    }
+
+    return self;
+}
+
 @end
diff --git a/iStroke/iStrokeAppDelegate.mm b/iStroke/iStrokeAppDelegate.mm
@@ -41,7 +41,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 
 
     [applicationOutlineView registerForDraggedTypes:
-     [NSArray arrayWithObject:ApplicationPasteType] ];
+        [NSArray arrayWithObject:ApplicationPasteType] ];
 
 }