changed RMMarker to use accessors for the labelView. Removed labelView=nil in re…
…placeImage:anchorPoint:. Closes Issue 42
Showing
1 changed file
with
19 additions
and
22 deletions
@@ -63,7 +63,7 @@ static CGImageRef _markerBlue = nil; | @@ -63,7 +63,7 @@ static CGImageRef _markerBlue = nil; | ||
63 | self.anchorPoint = _anchorPoint; | 63 | self.anchorPoint = _anchorPoint; |
64 | 64 | ||
65 | self.masksToBounds = NO; | 65 | self.masksToBounds = NO; |
66 | - labelView = nil; | 66 | + self.labelView = nil; |
67 | 67 | ||
68 | return self; | 68 | return self; |
69 | } | 69 | } |
@@ -75,7 +75,6 @@ static CGImageRef _markerBlue = nil; | @@ -75,7 +75,6 @@ static CGImageRef _markerBlue = nil; | ||
75 | self.anchorPoint = _anchorPoint; | 75 | self.anchorPoint = _anchorPoint; |
76 | 76 | ||
77 | self.masksToBounds = NO; | 77 | self.masksToBounds = NO; |
78 | - labelView = nil; | ||
79 | } | 78 | } |
80 | 79 | ||
81 | - (id) initWithUIImage: (UIImage*) image | 80 | - (id) initWithUIImage: (UIImage*) image |
@@ -106,21 +105,20 @@ static CGImageRef _markerBlue = nil; | @@ -106,21 +105,20 @@ static CGImageRef _markerBlue = nil; | ||
106 | 105 | ||
107 | - (void) setLabel: (UIView*)aView | 106 | - (void) setLabel: (UIView*)aView |
108 | { | 107 | { |
109 | - if (labelView == aView) { | 108 | + if (self.labelView == aView) { |
110 | return; | 109 | return; |
111 | } | 110 | } |
112 | 111 | ||
113 | if (labelView != nil) | 112 | if (labelView != nil) |
114 | { | 113 | { |
115 | - [[labelView layer] removeFromSuperlayer]; | ||
116 | - [labelView release]; | ||
117 | - labelView = nil; | 114 | + [[self.labelView layer] removeFromSuperlayer]; |
115 | + self.labelView = nil; | ||
118 | } | 116 | } |
119 | 117 | ||
120 | if (aView != nil) | 118 | if (aView != nil) |
121 | { | 119 | { |
122 | - labelView = [aView retain]; | ||
123 | - [self addSublayer:[labelView layer]]; | 120 | + self.labelView = [aView retain]; |
121 | + [self addSublayer:[self.labelView layer]]; | ||
124 | } | 122 | } |
125 | } | 123 | } |
126 | 124 | ||
@@ -154,22 +152,21 @@ static CGImageRef _markerBlue = nil; | @@ -154,22 +152,21 @@ static CGImageRef _markerBlue = nil; | ||
154 | 152 | ||
155 | - (void) removeLabel | 153 | - (void) removeLabel |
156 | { | 154 | { |
157 | - if (labelView != nil) | 155 | + if (self.labelView != nil) |
158 | { | 156 | { |
159 | - [[labelView layer] removeFromSuperlayer]; | ||
160 | - [labelView release]; | ||
161 | - labelView = nil; | 157 | + [[self.labelView layer] removeFromSuperlayer]; |
158 | + self.labelView = nil; | ||
162 | } | 159 | } |
163 | 160 | ||
164 | } | 161 | } |
165 | 162 | ||
166 | - (void) toggleLabel | 163 | - (void) toggleLabel |
167 | { | 164 | { |
168 | - if (labelView == nil) { | 165 | + if (self.labelView == nil) { |
169 | return; | 166 | return; |
170 | } | 167 | } |
171 | 168 | ||
172 | - if ([labelView isHidden]) { | 169 | + if ([self.labelView isHidden]) { |
173 | [self showLabel]; | 170 | [self showLabel]; |
174 | } else { | 171 | } else { |
175 | [self hideLabel]; | 172 | [self hideLabel]; |
@@ -178,26 +175,26 @@ static CGImageRef _markerBlue = nil; | @@ -178,26 +175,26 @@ static CGImageRef _markerBlue = nil; | ||
178 | 175 | ||
179 | - (void) showLabel | 176 | - (void) showLabel |
180 | { | 177 | { |
181 | - if ([labelView isHidden]) { | 178 | + if ([self.labelView isHidden]) { |
182 | // Using addSublayer will animate showing the label, whereas setHidden is not animated | 179 | // Using addSublayer will animate showing the label, whereas setHidden is not animated |
183 | - [self addSublayer:[labelView layer]]; | ||
184 | - [labelView setHidden:NO]; | 180 | + [self addSublayer:[self.labelView layer]]; |
181 | + [self.labelView setHidden:NO]; | ||
185 | } | 182 | } |
186 | } | 183 | } |
187 | 184 | ||
188 | - (void) hideLabel | 185 | - (void) hideLabel |
189 | { | 186 | { |
190 | - if (![labelView isHidden]) { | 187 | + if (![self.labelView isHidden]) { |
191 | // Using removeFromSuperlayer will animate hiding the label, whereas setHidden is not animated | 188 | // Using removeFromSuperlayer will animate hiding the label, whereas setHidden is not animated |
192 | - [[labelView layer] removeFromSuperlayer]; | ||
193 | - [labelView setHidden:YES]; | 189 | + [[self.labelView layer] removeFromSuperlayer]; |
190 | + [self.labelView setHidden:YES]; | ||
194 | } | 191 | } |
195 | } | 192 | } |
196 | 193 | ||
197 | - (void) dealloc | 194 | - (void) dealloc |
198 | { | 195 | { |
199 | - [labelView release]; | ||
200 | - [data release]; | 196 | + self.labelView = nil; |
197 | + self.data = nil; | ||
201 | [super dealloc]; | 198 | [super dealloc]; |
202 | } | 199 | } |
203 | 200 |
-
Please register or login to post a comment