Authored by Thomas Rasch

o Minor cleanup

... ... @@ -54,16 +54,17 @@
@property (assign) BOOL enableDragging;
@property (assign) BOOL enableRotation;
@property (nonatomic, retain) NSObject* data;
@property (nonatomic, retain) UIView* label;
@property(nonatomic,retain) UIColor *textForegroundColor;
@property(nonatomic,retain) UIColor *textBackgroundColor;
@property (nonatomic, retain) NSObject *data;
@property (nonatomic, retain) UIView *label;
@property (nonatomic, retain) UIColor *textForegroundColor;
@property (nonatomic, retain) UIColor *textBackgroundColor;
/// the font used for labels when another font is not explicitly requested; currently [UIFont systemFontOfSize:15]
+ (UIFont *)defaultFont;
/// returns RMMarker initialized with #image, and the default anchor point (0.5, 0.5)
- (id)initWithUIImage:(UIImage*) image;
/// \brief returns RMMarker initialized with provided image and anchorPoint.
/// #anchorPoint x and y range from 0 to 1, normalized to the width and height of image,
/// referenced to upper left corner, y increasing top to bottom. To put the image's upper right corner on the marker's
... ... @@ -72,10 +73,13 @@
/// changes the labelView to a UILabel with supplied #text and default marker font, using existing text foreground/background color.
- (void)changeLabelUsingText:(NSString *)text;
/// changes the labelView to a UILabel with supplied #text and default marker font, positioning the text some weird way i don't understand yet. Uses existing text color/background color.
- (void)changeLabelUsingText:(NSString *)text position:(CGPoint)position;
/// changes the labelView to a UILabel with supplied #text and default marker font, changing this marker's text foreground/background colors for this and future text strings.
- (void)changeLabelUsingText:(NSString *)text font:(UIFont *)font foregroundColor:(UIColor *)textColor backgroundColor:(UIColor *)backgroundColor;
/// changes the labelView to a UILabel with supplied #text and default marker font, changing this marker's text foreground/background colors for this and future text strings; modifies position as in #changeLabelUsingText:position.
- (void)changeLabelUsingText:(NSString *)text position:(CGPoint)position font:(UIFont *)font foregroundColor:(UIColor *)textColor backgroundColor:(UIColor *)backgroundColor;
... ...
... ... @@ -80,6 +80,17 @@
return self;
}
- (void)dealloc
{
self.data = nil;
self.label = nil;
self.textForegroundColor = nil;
self.textBackgroundColor = nil;
[super dealloc];
}
#pragma mark -
- (void)replaceUIImage:(UIImage *)image
{
[self replaceUIImage:image anchorPoint:defaultMarkerAnchorPoint];
... ... @@ -179,15 +190,6 @@
}
}
- (void)dealloc
{
self.data = nil;
self.label = nil;
self.textForegroundColor = nil;
self.textBackgroundColor = nil;
[super dealloc];
}
- (void)zoomByFactor:(float)zoomFactor near:(CGPoint)center
{
if (enableDragging) {
... ...