@@ -1,2 +1,3 @@ */build *.pbxuser +*.perspectivev3 .gitignore @@ -15,6 +15,12 @@ // The advance space ratio for hanzi #define kFontAdvanceRatio 1.1 +// The initial capacity of PYMarkerItem array +#define kMarkerItemsInitialCapacity 10 + +// The space between each marker item +#define kMarkerItemInterspacing 20 + @interface PYMarkerItem : NSObject { NSString *_han; @@ -30,19 +36,25 @@ pinyin: (NSArray *) pinyin type: (int) type; ++ (id) itemWithHanzi: (NSString *) hanzi + pinyin: (NSArray *) pinyin + type: (int) type; + @end @interface PYView : NSView { - PYMarkerItem *_item; - NSDictionary *_hanAttributes; - NSDictionary *_pyAttributes; - float _size; - float _pinyinSize; - float _advance; + NSMutableArray *_items; + NSDictionary *_hanAttributes; + NSDictionary *_pyAttributes; + float _size; + float _pinyinSize; + float _advance; } -- (void) setMarkerItem: (PYMarkerItem *) item; +- (void) appendMarkerItem: (PYMarkerItem *) item; +- (void) clearMarkerItems; + - (id) initWithFrame: (NSRect) frameRect fontName: (NSString *) name color: (NSColor *) color; PYView.h @@ -5,6 +5,15 @@ @implementation PYMarkerItem ++ (id) itemWithHanzi: (NSString *) hanzi + pinyin: (NSArray *) pinyin + type: (int) type +{ + return [[[PYMarkerItem alloc] initWithHanzi: hanzi + pinyin: pinyin + type: type] autorelease]; +} + - (id) initWithHanzi: (NSString *) hanzi pinyin: (NSArray *) pinyin type: (int) type @@ -15,7 +24,7 @@ { _han = [hanzi retain]; _py = [pinyin retain]; - type = type; + _type = type; } return self; @@ -60,8 +69,6 @@ kPinyinHanziLeading) / (1 + kPinyinFontSizeRatio); _advance = size * kFontAdvanceRatio; - NSLog(@"size = %g", size); - NSDictionary *fontAttributes = [NSDictionary dictionaryWithObjectsAndKeys: name, NSFontNameAttribute, @@ -90,56 +97,75 @@ _size = size; // Relax for a few more pixels _pinyinSize = kPinyinFontSizeRatio * size + 3; + + _items = [[NSMutableArray alloc] initWithCapacity: kMarkerItemsInitialCapacity]; } - + return self; } -- (void) drawRect: (NSRect) rect +- (float) drawItem: (PYMarkerItem *) item + atPoint: (NSPoint) point { - [[NSColor blackColor] set]; - NSRectFill(rect); + NSString *hanzi = [item hanzi]; - if (_item && [_item hanzi]) - { - NSString *hanzi = [_item hanzi]; - - [hanzi drawAtPoint: NSMakePoint(kPinyinViewBorder, kPinyinViewBorder) - withAttributes: _hanAttributes]; + [hanzi drawAtPoint: point + withAttributes: _hanAttributes]; - NSArray *pinyin = [_item pinyin]; + NSArray *pinyin = [item pinyin]; - if (pinyin) - { - NSEnumerator *enumerator = [pinyin objectEnumerator]; - NSString *py; + float x = point.x; + float y = point.y + _size + kPinyinHanziLeading; - float y = kPinyinViewBorder + _size + kPinyinHanziLeading; - float x = kPinyinViewBorder; + if (pinyin) + { + NSEnumerator *enumerator = [pinyin objectEnumerator]; + NSString *py; - while (py = [enumerator nextObject]) - { - // Center the pinyin - float shift = (_advance - [py sizeWithAttributes: _pyAttributes].width) / 2; + while (py = [enumerator nextObject]) + { + // Center the pinyin + float shift = (_advance - [py sizeWithAttributes: _pyAttributes].width) / 2; - [py drawAtPoint: NSMakePoint(x + shift, y) - withAttributes: _pyAttributes]; + [py drawAtPoint: NSMakePoint(x + shift, y) + withAttributes: _pyAttributes]; - x += _advance; - } + x += _advance; } } + + return x; +} + +- (void) drawRect: (NSRect) rect +{ + [[NSColor blackColor] set]; + NSRectFill(rect); + + NSEnumerator *enumerator = [_items objectEnumerator]; + PYMarkerItem *item; + + NSPoint p = NSMakePoint(kPinyinViewBorder, + kPinyinViewBorder); + + while (item = [enumerator nextObject]) + if ([item type] == 1) + p.x = [self drawItem: item atPoint: p] + kMarkerItemInterspacing; +} + +- (void) appendMarkerItem: (PYMarkerItem *) item +{ + [_items addObject: item]; } -- (void) setMarkerItem: (PYMarkerItem *) item +- (void) clearMarkerItems { - [_item release]; - _item = [item retain]; + [_items removeAllObjects]; } - (void) dealloc { - [_item release]; + [_items release]; [_hanAttributes release]; [_pyAttributes release]; PYView.m @@ -104,13 +104,18 @@ int main(int argc, char *argv[]) view = [[PYView alloc] initWithFrame: viewRect fontName: @"FZKai-Z03" color: [NSColor whiteColor]]; - NSArray *pinyin = [NSArray arrayWithObjects: @"nǐ", @"hǎo", @"zhōng", @"huá", - @"rén", @"mín", @"gòng", @"hé", @"guó", nil]; - PYMarkerItem *item = [[PYMarkerItem alloc] initWithHanzi: @"你好中华人民共和国" - pinyin: pinyin - type: 1]; - [view setMarkerItem: item]; - [item release]; + + NSArray *pinyin1 = [NSArray arrayWithObjects: @"nǐ", @"hǎo", nil]; + NSArray *pinyin2 = [NSArray arrayWithObjects: @"zhōng", @"huá", + @"rén", @"mín", @"gòng", @"hé", @"guó", nil]; + + + [view appendMarkerItem: [PYMarkerItem itemWithHanzi: @"你好" + pinyin: pinyin1 + type: 1]]; + [view appendMarkerItem: [PYMarkerItem itemWithHanzi: @"中华人民共和国" + pinyin: pinyin2 + type: 1]]; [[window contentView] addSubview: view]; [window makeFirstResponder: view]; PYViewTest/main.m @@ -16,13 +16,18 @@ Basically, PYView can be embeded into your app like this: view = [[PYView alloc] initWithFrame: viewRect fontName: @"FZKai-Z03" color: [NSColor whiteColor]]; - NSArray *pinyin = [NSArray arrayWithObjects: @"nǐ", @"hǎo", @"zhōng", @"huá", - @"rén", @"mín", @"gòng", @"hé", @"guó", nil]; - PYMarkerItem *item = [[PYMarkerItem alloc] initWithHanzi: @"你好中华人民共和国" - pinyin: pinyin - type: 1]; - [view setMarkerItem: item]; - [item release]; + + NSArray *pinyin1 = [NSArray arrayWithObjects: @"nǐ", @"hǎo", nil]; + NSArray *pinyin2 = [NSArray arrayWithObjects: @"zhōng", @"huá", + @"rén", @"mín", @"gòng", @"hé", @"guó", nil]; + + + [view appendMarkerItem: [PYMarkerItem itemWithHanzi: @"你好" + pinyin: pinyin1 + type: 1]]; + [view appendMarkerItem: [PYMarkerItem itemWithHanzi: @"中华人民共和国" + pinyin: pinyin2 + type: 1]]; For more details, check the PYViewTest project. README.markdown 1d8c868d26b559d534fcac09e795629514c024a5 Jjgod Jiang gzjjgod@gmail.com http://github.com/jjgod/pinyinview/commit/33d7d3ede7a250c2d8f1eeb293a1800f8a6b3533 33d7d3ede7a250c2d8f1eeb293a1800f8a6b3533 2008-07-25T02:26:43-07:00 2008-07-25T02:26:43-07:00 Add show multiple marker item. e4286c19dfd4b5703b86375cbad395980bdd915a Jjgod Jiang gzjjgod@gmail.com