Changes in trunk/MacFaceLibrary/FaceDef.cs [30:19]

File:

• trunk/MacFaceLibrary/FaceDef.cs (modified) (7 diffs)

trunk/MacFaceLibrary/FaceDef.cs

@@ -18 +18 @@
         public class FaceDef
         {
-                // ƒpƒ^[ƒ“ƒXƒC[ƒgID
                 public enum PatternSuite
                 {
@@ -26 +25 @@
                 }
 
-                public const int PatternCount = 11;
-                public const int ImageWidth   = 128;
-                public const int ImageHeight  = 128;
-
-                // ƒ}[ƒJ[
                 public const int MarkerNone    = 0x00;
                 public const int MarkerPageIn  = 0x01;
                 public const int MarkerPageOut = 0x02;
 
-                // Šçƒpƒ^[ƒ“’è‹`ƒvƒƒpƒeƒBƒŠƒXƒgƒtƒ@ƒCƒ‹–¼
                 private const string FaceDefName = "faceDef.plist";
-
-                // Šçƒpƒ^[ƒ“’è‹`‚̃L[–¼Ì
-                private const string KeyInfoTitle       = "title";
-                private const string KeyInfoAuthor      = "author";
-                private const string KeyInfoVersion     = "version";
-                private const string KeyInfoSiteURL     = "web site";
-                
-                private const string KeyDefParts        = "parts";
-                private const string KeyDefPatterns     = "pattern";
-                private const string KeyDefMarkers      = "markers";
-                private const string KeyDefTitlePattern = "title pattern";
-
-                private const string KeyPartImage       = "filename";
-                private const string KeyPartPosX        = "pos x";
-                private const string KeyPartPosY        = "pos y";
-
-                //
+                private const int PatternCols = 11;
+                private const int PatternRows = 3;
+                private const int ImageWidth = 128;
+                private const int ImageHeight = 128;
+
                 private string _path;
                 private string _title;
@@ -77 +58 @@
                         // î•ñ
                         _path = path;
-                        _title = ReadInfoString(def, KeyInfoTitle);
-                        _author = ReadInfoString(def, KeyInfoAuthor);
-                        _version = ReadInfoString(def, KeyInfoVersion);
-
-                        if (def.ContainsKey(KeyInfoSiteURL))
+                        _title = (def.ContainsKey("title") ? def["title"] as string : String.Empty);
+                        _author = (def.ContainsKey("author") ? def["author"] as string : String.Empty);
+                        _version = (def.ContainsKey("version") ? def["version"] as string : String.Empty);
+
+                        if (def.ContainsKey("web site"))
                         {
                                 try 
                                 {
-                                        _webSite = new Uri(def[KeyInfoSiteURL] as string);
+                                        _webSite = new Uri(def["web site"] as string);
                                 } 
                                 catch (UriFormatException) {}
@@ -92 +73 @@
 
                         // ƒp[ƒc‚̓ǂݍž‚Ý
-                        ArrayList partDefList = (ArrayList)def[KeyDefParts];
+                        ArrayList partDefList = (ArrayList)def["parts"];
                         if (partDefList == null) 
                         {
@@ -101 +82 @@
                         for (int i = 0; i < partDefList.Count; i++)
                         {
-                                _parts[i] = ReadPart(path, (Hashtable)partDefList[i]);
-            }
+                                Hashtable partDef = (Hashtable)partDefList[i];
+                                string filename = (String)partDef["filename"];
+                                int x = (int)partDef["pos x"];
+                                int y = (int)partDef["pos y"];
+                                _parts[i] = new Part(System.IO.Path.Combine(path, filename), x, y);
+                        }
 
                         // ƒpƒ^[ƒ“‚̓ǂݍž‚Ý
-            int suiteCount = PatternSuite.GetNames(typeof(PatternSuite)).Length;
-            ;
-            ArrayList suiteDefList = (ArrayList)def[KeyDefPatterns];
-            _patternSuites = new Part[suiteCount][][];
-            for (int i = 0; i < suiteCount; i++)
-            {
-                                _patternSuites[i] = ReadPatternSuite(_parts, (ArrayList)suiteDefList[i]);
+                        ArrayList suiteDefList = (ArrayList)def["pattern"];
+                        _patternSuites = new Part[PatternRows][][];
+                        for (int i = 0; i < PatternRows; i++) 
+                        {
+                                ArrayList suiteDef = (ArrayList)suiteDefList[i];
+                                Part[][] suite = new Part[PatternCols][];
+                                for (int j = 0; j < PatternCols; j++) 
+                                {
+                                        ArrayList patternDef = (ArrayList)suiteDef[j];
+                                        Part[] pattern = new Part[patternDef.Count];
+                                        for (int k = 0; k < patternDef.Count; k++) 
+                                        {
+                                                pattern[k] = _parts[(int)patternDef[k]];
+                                        }
+                                        suite[j] = pattern;
+                                }
+                                _patternSuites[i] = suite;
                         }
 
                         // ƒ}[ƒJ[‚̓ǂݍž‚Ý
-                        ArrayList markerDefList = (ArrayList)def[KeyDefMarkers];
+                        ArrayList markerDefList = (ArrayList)def["markers"];
                         _markers = new Part[markerDefList.Count];
                         for (int i = 0; i < markerDefList.Count; i++)
@@ -123 +118 @@
 
                         // ƒ^ƒCƒgƒ‹ƒpƒ^[ƒ“‚̓ǂݍž‚Ý
-                        _titlePattern = ReadPattern(_parts, (ArrayList)def[KeyDefTitlePattern]);
-                }
-
-                private string ReadInfoString(Hashtable def, string key)
-                {
-                        string str = def[key] as string;
-                        return str != null ? str : "";
-                }
-
-                private Part ReadPart(string path, Hashtable partDef)
-                {
-                        string filename = (String)partDef[KeyPartImage];
-                        string imgPath = System.IO.Path.Combine(path, filename);
-                        Image img = Image.FromFile(imgPath);
-
-                        int x = (int)partDef[KeyPartPosX];
-                        int y = ImageHeight - (int)partDef[KeyPartPosY] - img.Height;
-
-                        return new Part(imgPath, img, x, y);
-                }
-
-                private Part[] ReadPattern(Part[] parts, ArrayList patternDef)
-                {
-                        Part[] pattern = new Part[patternDef.Count];
-                        for (int i = 0; i < patternDef.Count; i++) 
-                        {
-                                pattern[i] = _parts[(int)patternDef[i]];
-                        }
-                        return pattern;
-                }
-
-                private Part[][] ReadPatternSuite(Part[] parts, ArrayList suiteDef)
-                {
-                        Part[][] suite = new Part[PatternCount][];
-                        for (int i = 0; i < PatternCount; i++) 
-                        {
-                                suite[i] = ReadPattern(_parts, (ArrayList)suiteDef[i]);
-                        }
-                        return suite;
-                }
-
-
-        public string Path
-        {
-            get { return _path; }
-        }
-
-        public string Title
-        {
-            get { return _title; }
-        }
-
-        public string Author
-        {
-            get { return _author; }
-        }
-
-        public string Version
-        {
-            get { return _version; }
-        }
-
-        public Uri WebSite
-        {
+                        ArrayList titlePatternDef = (ArrayList)def["title pattern"];
+                        _titlePattern = new Part[titlePatternDef.Count];
+                        for (int i = 0; i < titlePatternDef.Count; i++) 
+                        {
+                                _titlePattern[i] = _parts[(int)titlePatternDef[i]];
+                        }
+                }
+
+                public Uri WebSite
+                {
                         get { return _webSite; }
                 }
 
-                public Image TitleImage
-                {
-                        get 
-                        {
-                                Bitmap image = new Bitmap(ImageWidth, ImageHeight);
-                                Graphics g = Graphics.FromImage(image);
-
-                                foreach (Part part in _titlePattern)
-                                {
-                                        g.DrawImage(part.Image,
-                                                part.Point.X, part.Point.Y,
-                                                part.Image.Size.Width, part.Image.Size.Height);
-                                }
-
-                                g.Dispose();
-                                return image;
-                        }
-                }
-
-                public void DrawPatternImage(Graphics g, PatternSuite suite, int no, int markers, float rate)
-                {
-                        Part[] pattern = _patternSuites[(int)suite][no];
-                        foreach (Part part in pattern)
+                public string /*Version*/ Version
+                {
+                        get { return _version; }
+                }
+
+                public string Author
+                {
+                        get { return _author; }
+                }
+
+                public string Title
+                {
+                        get { return _title; }
+                }
+
+                public string Path
+                {
+                        get { return _path; }
+                }
+
+                public Image TitleImage()
+                {
+                        Bitmap image = new Bitmap(ImageWidth, ImageHeight);
+                        Graphics g = Graphics.FromImage(image);
+
+                        foreach (Part part in _titlePattern)
                         {
                                 g.DrawImage(part.Image,
-                                        part.Point.X * rate, part.Point.Y * rate,
-                                        part.Image.Size.Width * rate, part.Image.Size.Height * rate);
-                        }
-
-                        if (markers != 0)
-                        {
-                                for (int i = 0; i < 8; i++)
-                                {
-                                        if ((markers & (1 << i)) != 0)
-                                        {
-                                                Part part = _markers[i];
-                                                g.DrawImage(part.Image,
-                                                        part.Point.X * rate, part.Point.Y * rate,
-                                                        part.Image.Size.Width * rate, part.Image.Size.Height * rate);
-                                        }
-                                }
-                        }
+                                        part.Point.X, part.Point.Y,
+                                        part.Image.Size.Width, part.Image.Size.Height);
+                        }
+
+                        g.Dispose();
+                        return image;
                 }
 
@@ -273 +206 @@
         }
 }
+
+
+/*
+#import <Cocoa/Cocoa.h>
+
+//
+#define FACE_ROWMAX     3
+#define FACE_COLMAX     11
+#define FACE_PATMAX     8
+#define FACE_IMGW       128
+#define FACE_IMGH       128
+#define FACE_IMGSIZE    (NSMakeSize(128,128))
+
+// ƒ}[ƒJ[ƒrƒbƒgƒ}ƒXƒN
+#define FDMARKER_PAGEIN         0x0001
+#define FDMARKER_PAGEOUT        0x0002
+
+//
+#define FACE_INFO_TITLE         @"title"
+#define FACE_INFO_AUTHOR        @"author"
+#define FACE_INFO_VERSION       @"version"
+#define FACE_INFO_SITE_URL      @"web site"
+
+#define FACE_INFO_PARTS         @"parts"
+#define FACE_INFO_PATTERN       @"pattern"
+#define FACE_INFO_MARKER        @"markers"
+#define FACE_INFO_TITLE_PATTERN @"title pattern"
+#define FACE_INFO_MARK_PGOUT    @"pagein pattern"
+#define FACE_INFO_MARK_PGIN     @"pageout pattern"
+
+#define FACE_PART_IMAGE         @"filename"
+#define FACE_PART_POSX          @"pos x"
+#define FACE_PART_POSY          @"pos y"
+
+typedef struct {
+    NSString *filename;
+    NSImage *image;
+    NSPoint pos;
+} PartDef;
+
+typedef struct {
+    unsigned count;
+    int parts[FACE_PATMAX];
+} PatternDef;
+
+
+@interface FaceDef : NSObject
+{
+    NSString *packagePath;
+    NSDictionary *definition;
+    int partCount;
+    PartDef *parts;
+    PatternDef patterns[FACE_ROWMAX][FACE_COLMAX];
+    int markers[8];
+    PatternDef titlePattern;
+}
+
++ (NSDictionary*)infoAtPath:(NSString*)path;
+
++ (id)faceDefWithContentOfFile:(NSString*)path;
+
+- (id)initWithContentOfFile:(NSString*)path;
+
+- (NSString*)path;
+
+- (NSString*)title;
+- (NSString*)author;
+- (NSString*)version;
+- (NSString*)siteURL;
+
+- (NSImage*)titleImage;
+
+- (int)partCount;
+- (const PartDef*)partOfIndex:(int)index;
+- (const PatternDef*)patternOfRow:(int)row col:(int)col;
+- (int)patternCountOfRow:(int)row col:(int)col;
+- (int)patternNoOfRow:(int)row col:(int)col index:(int)index;
+
+- (NSImage*)imageOfRow:(int)row col:(int)col marker:(int)marker;
+
+- (void)drawImageOfRow:(int)row col:(int)col marker:(int)marker atPoint:(NSPoint)pt;
+- (void)drawPart:(PartDef*)part atPoint:(NSPoint)point;
+
+- (void)dumpPattern:(NSString*)path;
+
+@end
+
+@implementation FaceDef
+
++ (NSDictionary*)infoAtPath:(NSString*)path
+{
+    NSDictionary *info;
+
+    info = [NSDictionary dictionaryWithContentsOfFile:
+        [path stringByAppendingPathComponent:@"faceDef.plist"]];
+
+    return info;
+}
+
++ (id)faceDefWithContentOfFile:(NSString*)path
+{
+    return [[[self alloc] initWithContentOfFile:path] autorelease];
+}
+
+- (id)initWithContentOfFile:(NSString*)path
+{
+    NSDictionary *partDefDict;
+    NSArray *partArray,*patternArray,*colArray,*elemArray;
+    NSEnumerator *enumerator;
+    NSString *imagePath;
+    NSNumber *value;
+    int i,count;
+    int row,col,no;
+    int maxPartNo;
+
+    [super init];
+
+    NS_DURING
+        definition = [FaceDef infoAtPath:path];
+
+        if (definition == nil) {
+            [NSException raise:@"FaceDefInfoLoadException" format:@"failuer loading faceDef.plist"];
+        }
+
+        [definition retain];
+
+        packagePath = [path retain];
+
+        // ƒp[ƒc’è‹`‚̓ǂݍž‚Ý
+        partArray = [definition objectForKey:FACE_INFO_PARTS];
+
+        if ([partArray isMemberOfClass:[NSArray class]]) {
+            [NSException raise:@"FaceDefPartListLoadException" format:@"failed in reading part list."];
+        }
+
+        parts = calloc([partArray count],sizeof(PartDef));
+        count = [partArray count];
+
+        for (partCount = 0; partCount < count; partCount++){
+            partDefDict = [partArray objectAtIndex:partCount];
+            parts[partCount].filename = [[partDefDict objectForKey:FACE_PART_IMAGE] retain];
+            parts[partCount].pos.x = [(NSNumber*)[partDefDict objectForKey:FACE_PART_POSX] floatValue];
+            parts[partCount].pos.y = [(NSNumber*)[partDefDict objectForKey:FACE_PART_POSY] floatValue];
+            imagePath = [path stringByAppendingPathComponent:parts[partCount].filename];
+            parts[partCount].image = [[NSImage alloc]initWithContentsOfFile:imagePath];
+
+            if (parts[partCount].image == nil){ // ‰æ‘œ‚ª“ǂݍž‚ß‚È‚©‚Á‚½
+                [NSException raise:@"FaceDefPartLoadException"
+                    format:@"failed in loading of image '%@'",parts[partCount].filename];
+            }
+        }
+
+        maxPartNo = count - 1;
+
+        // ƒpƒ^[ƒ“’è‹`‚̓ǂݍž‚Ý
+        patternArray = [definition objectForKey:FACE_INFO_PATTERN];
+
+        for (row = 0; row < FACE_ROWMAX; row++){
+            colArray = [patternArray objectAtIndex:row];
+
+            if ([colArray count] != FACE_COLMAX) {
+                [NSException raise:@"FaceDefPatternLoadException"
+                    format:@"number of pattern columns is not 10 at row %d",row];
+            }
+
+            for (col = 0; col < FACE_COLMAX; col++){
+                elemArray = [colArray objectAtIndex:col];
+                enumerator = [[colArray objectAtIndex:col] objectEnumerator];
+                for (i = 0; i <= FACE_PATMAX && (value = [enumerator nextObject]) != nil; i++){
+                    no = [value intValue];
+                    patterns[row][col].parts[i] = no;
+                    if (0 > no || no > maxPartNo) { // ƒp[ƒc”ԍ†ƒ`ƒFƒbƒN
+                        [NSException raise:@"FaceDefPatternLoadException"
+                            format:@"illigal part no %d in patterns[%d,%d,%d]",no,row,col,i];
+                    }
+                }
+                patterns[row][col].count = i;
+            }
+        }
+
+        // ƒ}[ƒJ[ƒŠƒXƒg‚̓ǂݍž‚Ý
+        enumerator = [[definition objectForKey:FACE_INFO_MARKER] objectEnumerator];
+        for (i = 0; i < 8 && (value = [enumerator nextObject]) != nil; i++){
+            markers[i] = [value intValue];
+        }
+
+        // ‘ã•\‰æ‘œƒpƒ^[ƒ“‚̓ǂݍž‚Ý
+        enumerator = [[definition objectForKey:FACE_INFO_TITLE_PATTERN] objectEnumerator];
+        for (i = 0; i <= FACE_PATMAX && (value = [enumerator nextObject]) != nil; i++){
+            no = [value intValue];
+            titlePattern.parts[i] = no;
+            if (0 > no || no > maxPartNo) { // ƒp[ƒc”ԍ†ƒ`ƒFƒbƒN
+                [NSException raise:@"FaceDefPatternLoadException"
+                    format:@"illigal part no %d in title pattern",no];
+            }
+        }
+        titlePattern.count = i;
+    NS_HANDLER
+        NSLog(@"FaceDef load error: %@",localException);
+        [self dealloc];
+        self = nil;
+    NS_ENDHANDLER
+
+    return self;
+}
+
+- (void)dealloc
+{
+    int i;
+
+    [packagePath release];
+    [definition release];
+
+    if (parts != nil) {
+        for (i = 0; i < partCount; i++){
+            [parts[i].filename release];
+            [parts[i].image release];
+        }
+        free(parts);
+    }
+}
+
+-(NSString*)path
+{
+    return packagePath;
+}
+
+-(NSString*)title
+{
+    NSString *str;
+    str = [definition objectForKey:@"title"];
+    return  (str != nil) ? str : @"";
+}
+
+-(NSString*)author
+{
+    NSString *str;
+    str = [definition objectForKey:@"author"];
+    return  (str != nil) ? str : @"";
+}
+
+-(NSString*)version
+{
+    NSString *str;
+    str = [definition objectForKey:@"version"];
+    return  (str != nil) ? str : @"";
+}
+
+- (NSString*)siteURL
+{
+    NSString *str;
+    str = [definition objectForKey:@"web site"];
+    return  (str != nil) ? str : @"";
+}
+
+- (NSImage*)titleImage
+{
+    NSImage *image;
+    int i;
+
+    image = [[NSImage alloc] initWithSize:FACE_IMGSIZE];
+    [image lockFocus];
+
+    if (titlePattern.count > 0) {
+        for (i=0; i<titlePattern.count; i++) {
+            [self drawPart:&parts[titlePattern.parts[i]] atPoint:NSMakePoint(0,0)];
+        }
+    } else {
+        [self drawImageOfRow:0 col:FACE_COLMAX marker:0 atPoint:NSMakePoint(0,0)];
+    }
+
+    [image unlockFocus];
+    return [image autorelease];
+}
+
+- (int)partCount
+{
+    return partCount;
+}
+
+- (const PartDef*)partOfIndex:(int)index
+{
+    if (0 <= index && index < partCount) return &parts[index];
+    else return nil;
+}
+
+- (const PatternDef*)patternOfRow:(int)row col:(int)col
+{
+    if (0 <= row && row < FACE_ROWMAX
+     && 0 <= col && col < FACE_COLMAX) return &patterns[row][col];
+    else return nil;
+}
+
+- (int)patternCountOfRow:(int)row col:(int)col
+{
+    if (0 <= row && row < FACE_ROWMAX
+     && 0 <= col && col < FACE_COLMAX) return patterns[row][col].count;
+    else return -1;
+}
+
+- (int)patternNoOfRow:(int)row col:(int)col index:(int)index
+{
+    if (0 <= row && row < FACE_ROWMAX
+     && 0 <= col && col < FACE_COLMAX
+     && 0 <= index && index < patterns[row][col].count) return patterns[row][col].parts[index];
+    else return -1;
+}
+
+- (NSImage*)imageOfRow:(int)row col:(int)col marker:(int)marker
+{
+    NSImage *image;
+    image = [[NSImage alloc] initWithSize:FACE_IMGSIZE];
+    [image lockFocus];
+    [self drawImageOfRow:row col:col marker:marker atPoint:NSMakePoint(0,0)];
+    [image unlockFocus];
+    return [image autorelease];
+}
+
+- (void)drawImageOfRow:(int)row col:(int)col marker:(int)marker atPoint:(NSPoint)point
+{
+    int count;
+    int i;
+
+    count = patterns[row][col].count;
+    for (i=0; i<count; i++){
+        [self drawPart:&parts[patterns[row][col].parts[i]] atPoint:point];
+    };
+
+    if (marker != 0) {
+        for (i=0; i<8; i++) {
+            if (marker & (1<<i)) {
+                [self drawPart:&parts[markers[i]] atPoint:point];
+            }
+        }
+    }
+}
+
+- (void)drawPart:(PartDef*)part atPoint:(NSPoint)point
+{
+    point.x += part->pos.x;
+    point.y += part->pos.y;
+    [part->image compositeToPoint:point operation:NSCompositeSourceOver];
+}
+
+-(void)dumpPattern:(NSString*)path;
+{
+    NSImage *img;
+    NSSize imgSize;
+    NSPoint pos;
+    float offset;
+    int i,j,rows;
+    NSMutableDictionary *attr;
+    NSString *str;
+
+    rows = partCount / FACE_COLMAX + 1;
+    offset = rows * FACE_IMGW + 10;
+    imgSize.width = FACE_IMGW * FACE_COLMAX;
+    imgSize.height = FACE_IMGH * FACE_ROWMAX + offset + 14;
+
+    img = [[NSImage alloc] initWithSize:imgSize];
+    if (img == nil) {
+        NSLog(@"failure dump pattern!");
+        return;
+    }
+
+    [img lockFocus];
+    [[NSColor whiteColor] set];
+    NSRectFill(NSMakeRect(0,0,imgSize.width,imgSize.height));
+
+    [[NSColor blackColor] set];
+    NSRectFill(NSMakeRect(0,offset-6,imgSize.width,2));
+
+    attr = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
+                [NSFont systemFontOfSize:14.0], NSFontAttributeName,
+                [NSColor blackColor], NSForegroundColorAttributeName,
+                nil];
+
+    for (i = 0; i <= partCount; i++) {
+        pos.x = (i % FACE_COLMAX) * FACE_IMGW;
+        pos.y = (rows-1 - i / FACE_COLMAX) * FACE_IMGH;
+        [self drawPart:&parts[i] atPoint:pos];
+
+        str = [NSString stringWithFormat:@"%d",i];
+        pos.x = (i % FACE_COLMAX) * FACE_IMGW;
+        pos.y = (rows-1 - i / FACE_COLMAX) * FACE_IMGH + FACE_IMGH - 12;
+        [str drawAtPoint:pos withAttributes:attr];
+    }
+
+    for (i = 0; i < FACE_ROWMAX; i++) {
+        pos.y = (FACE_ROWMAX-1 - i) * FACE_IMGH + offset;
+        for (j=0; j<FACE_COLMAX; j++) {
+            pos.x = j * FACE_IMGW;
+            [self drawImageOfRow:i col:j marker:0 atPoint:pos];
+        }
+    }
+
+    pos.y = imgSize.height - 14;
+    for (i = 0; i < FACE_COLMAX-1; i++) {
+        str = [NSString stringWithFormat:@"%d-%d%%",i*10,(i+1)*10-1];
+        pos.x = i * FACE_IMGW;
+        [str drawAtPoint:pos withAttributes:attr];
+    }
+    str = [NSString stringWithFormat:@"%d%%",100];
+    pos.x = (FACE_COLMAX-1) * FACE_IMGW;
+    [str drawAtPoint:pos withAttributes:attr];
+
+    [img unlockFocus];
+
+    [[img TIFFRepresentation] writeToFile:path atomically:NO];
+    [img release];
+}
+
+@end
+
+*/