Skip to content

Commit f97d1d4

Browse files
eskrocheskroch
committed
Changed the function datasource to keep a strong reference to its plot so it can remove notification observers properly.
1 parent bd38425 commit f97d1d4

14 files changed

Lines changed: 26 additions & 30 deletions

‎MacOS/_c_p_t_function_data_source_8h_source.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<div class="line"><a name="l00018"></a><span class="lineno"> 18</span>&#160;</div>
8484
<div class="line"><a name="l00019"></a><span class="lineno"><a class="line" href="interface_c_p_t_function_data_source.html#a17536bddb94c77a06329cfcd8b9e88cf"> 19</a></span>&#160;<span class="keyword">@property</span> (nonatomic, readonly) <a class="code" href="_c_p_t_function_data_source_8h.html#a29a7f029b704696455108863d5cb1034">CPTDataSourceFunction</a> <a class="code" href="interface_c_p_t_function_data_source.html#a17536bddb94c77a06329cfcd8b9e88cf">dataSourceFunction</a>;</div>
8585
<div class="line"><a name="l00020"></a><span class="lineno"><a class="line" href="interface_c_p_t_function_data_source.html#aef292c08881127fae76185e475eb90ef"> 20</a></span>&#160;<span class="keyword">@property</span> (nonatomic, readonly) <a class="code" href="_c_p_t_function_data_source_8h.html#a1a200e46cfff27e7cb0638622f45cddb">CPTDataSourceBlock</a> <a class="code" href="interface_c_p_t_function_data_source.html#aef292c08881127fae76185e475eb90ef">dataSourceBlock</a>;</div>
86-
<div class="line"><a name="l00021"></a><span class="lineno"><a class="line" href="interface_c_p_t_function_data_source.html#ace6581fc728bd3bcb8228748f8baf1a4"> 21</a></span>&#160;<span class="keyword">@property</span> (nonatomic, readonly, <a class="code" href="_c_p_t_definitions_8h.html#a1133842e0f1c9446242d6a2ce34728ee">cpt_weak_property</a>) <a class="code" href="_c_p_t_definitions_8h.html#abd26af4304957387867e6e9e8cef1576">__cpt_weak</a> <a class="code" href="interface_c_p_t_plot.html">CPTPlot</a> *<a class="code" href="interface_c_p_t_function_data_source.html#ace6581fc728bd3bcb8228748f8baf1a4">dataPlot</a>;</div>
86+
<div class="line"><a name="l00021"></a><span class="lineno"><a class="line" href="interface_c_p_t_function_data_source.html#aa6824984763176eeb31c6f68e19cc862"> 21</a></span>&#160;<span class="keyword">@property</span> (nonatomic, readonly) <a class="code" href="interface_c_p_t_plot.html">CPTPlot</a> *<a class="code" href="interface_c_p_t_function_data_source.html#aa6824984763176eeb31c6f68e19cc862">dataPlot</a>;</div>
8787
<div class="line"><a name="l00022"></a><span class="lineno"> 22</span>&#160;</div>
8888
<div class="line"><a name="l00023"></a><span class="lineno"><a class="line" href="interface_c_p_t_function_data_source.html#a9df6e8ee353b75f2715ebcc9e24ec0e2"> 23</a></span>&#160;<span class="keyword">@property</span> (nonatomic, readwrite) CGFloat <a class="code" href="interface_c_p_t_function_data_source.html#a9df6e8ee353b75f2715ebcc9e24ec0e2">resolution</a>;</div>
8989
<div class="line"><a name="l00024"></a><span class="lineno"><a class="line" href="interface_c_p_t_function_data_source.html#a2d779ae217a7e95cbb301bbf3e8c2511"> 24</a></span>&#160;<span class="keyword">@property</span> (nonatomic, readwrite, strong) <a class="code" href="interface_c_p_t_plot_range.html">CPTPlotRange</a> *<a class="code" href="interface_c_p_t_function_data_source.html#a2d779ae217a7e95cbb301bbf3e8c2511">dataRange</a>;</div>
@@ -105,10 +105,8 @@
105105
<div class="ttc" id="interface_c_p_t_function_data_source_html"><div class="ttname"><a href="interface_c_p_t_function_data_source.html">CPTFunctionDataSource</a></div><div class="ttdoc">A datasource class that automatically creates scatter plot data from a function or Objective-C block...</div><div class="ttdef"><b>Definition:</b> CPTFunctionDataSource.h:17</div></div>
106106
<div class="ttc" id="interface_c_p_t_plot_html"><div class="ttname"><a href="interface_c_p_t_plot.html">CPTPlot</a></div><div class="ttdoc">An abstract plot class. </div><div class="ttdef"><b>Definition:</b> CPTPlot.h:242</div></div>
107107
<div class="ttc" id="interface_c_p_t_function_data_source_html_a2d779ae217a7e95cbb301bbf3e8c2511"><div class="ttname"><a href="interface_c_p_t_function_data_source.html#a2d779ae217a7e95cbb301bbf3e8c2511">CPTFunctionDataSource::dataRange</a></div><div class="ttdeci">CPTPlotRange * dataRange</div><div class="ttdoc">The maximum range of x-values that will be plotted. If nil (the default), the function will be plotte...</div><div class="ttdef"><b>Definition:</b> CPTFunctionDataSource.h:24</div></div>
108-
<div class="ttc" id="_c_p_t_definitions_8h_html_abd26af4304957387867e6e9e8cef1576"><div class="ttname"><a href="_c_p_t_definitions_8h.html#abd26af4304957387867e6e9e8cef1576">__cpt_weak</a></div><div class="ttdeci">#define __cpt_weak</div><div class="ttdoc">A custom definition for automatic reference counting (ARC) weak references that falls back to __unsaf...</div><div class="ttdef"><b>Definition:</b> CPTDefinitions.h:43</div></div>
108+
<div class="ttc" id="interface_c_p_t_function_data_source_html_aa6824984763176eeb31c6f68e19cc862"><div class="ttname"><a href="interface_c_p_t_function_data_source.html#aa6824984763176eeb31c6f68e19cc862">CPTFunctionDataSource::dataPlot</a></div><div class="ttdeci">CPTPlot * dataPlot</div><div class="ttdoc">The plot that will display the function values. Must be an instance of CPTScatterPlot. </div><div class="ttdef"><b>Definition:</b> CPTFunctionDataSource.h:21</div></div>
109109
<div class="ttc" id="_c_p_t_plot_8h_html"><div class="ttname"><a href="_c_p_t_plot_8h.html">CPTPlot.h</a></div></div>
110-
<div class="ttc" id="interface_c_p_t_function_data_source_html_ace6581fc728bd3bcb8228748f8baf1a4"><div class="ttname"><a href="interface_c_p_t_function_data_source.html#ace6581fc728bd3bcb8228748f8baf1a4">CPTFunctionDataSource::dataPlot</a></div><div class="ttdeci">__cpt_weak CPTPlot * dataPlot</div><div class="ttdoc">The plot that will display the function values. Must be an instance of CPTScatterPlot. </div><div class="ttdef"><b>Definition:</b> CPTFunctionDataSource.h:21</div></div>
111-
<div class="ttc" id="_c_p_t_definitions_8h_html_a1133842e0f1c9446242d6a2ce34728ee"><div class="ttname"><a href="_c_p_t_definitions_8h.html#a1133842e0f1c9446242d6a2ce34728ee">cpt_weak_property</a></div><div class="ttdeci">#define cpt_weak_property</div><div class="ttdoc">A custom definition for automatic reference counting (ARC) weak properties that falls back to assign ...</div><div class="ttdef"><b>Definition:</b> CPTDefinitions.h:45</div></div>
112110
<div class="ttc" id="_c_p_t_function_data_source_8h_html_a29a7f029b704696455108863d5cb1034"><div class="ttname"><a href="_c_p_t_function_data_source_8h.html#a29a7f029b704696455108863d5cb1034">CPTDataSourceFunction</a></div><div class="ttdeci">double(* CPTDataSourceFunction)(double)</div><div class="ttdoc">A function called to generate plot data in a CPTFunctionDataSource datasource. </div><div class="ttdef"><b>Definition:</b> CPTFunctionDataSource.h:10</div></div>
113111
</div><!-- fragment --></div><!-- contents -->
114112
</div><!-- doc-content -->

‎MacOS/class_c_p_t_function_data_source-members.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<tr class="even"><td class="entry">-&#160;</td><td><a class="el" href="protocol_c_p_t_plot_data_source-p.html#afd985f5b9616bed3bb52046c62d44483">dataForPlot:recordIndexRange:</a></td><td class="entry"><a class="el" href="protocol_c_p_t_plot_data_source-p.html">&lt;CPTPlotDataSource&gt;</a></td><td class="entry"></td></tr>
8585
<tr><td class="entry">-&#160;</td><td><a class="el" href="protocol_c_p_t_plot_data_source-p.html#a040b56efe34d3d31ef94052120cb2999">dataLabelForPlot:recordIndex:</a></td><td class="entry"><a class="el" href="protocol_c_p_t_plot_data_source-p.html">&lt;CPTPlotDataSource&gt;</a></td><td class="entry"></td></tr>
8686
<tr class="even"><td class="entry">-&#160;</td><td><a class="el" href="protocol_c_p_t_plot_data_source-p.html#abc9085d1b4dd104b130f362e21ff00ea">dataLabelsForPlot:recordIndexRange:</a></td><td class="entry"><a class="el" href="protocol_c_p_t_plot_data_source-p.html">&lt;CPTPlotDataSource&gt;</a></td><td class="entry"></td></tr>
87-
<tr><td class="entry"></td><td class="entry"><a class="el" href="interface_c_p_t_function_data_source.html#ace6581fc728bd3bcb8228748f8baf1a4">dataPlot</a></td><td class="entry"><a class="el" href="interface_c_p_t_function_data_source.html">CPTFunctionDataSource</a></td><td class="entry"></td></tr>
87+
<tr><td class="entry"></td><td class="entry"><a class="el" href="interface_c_p_t_function_data_source.html#aa6824984763176eeb31c6f68e19cc862">dataPlot</a></td><td class="entry"><a class="el" href="interface_c_p_t_function_data_source.html">CPTFunctionDataSource</a></td><td class="entry"></td></tr>
8888
<tr class="even"><td class="entry"></td><td class="entry"><a class="el" href="interface_c_p_t_function_data_source.html#a2d779ae217a7e95cbb301bbf3e8c2511">dataRange</a></td><td class="entry"><a class="el" href="interface_c_p_t_function_data_source.html">CPTFunctionDataSource</a></td><td class="entry"></td></tr>
8989
<tr><td class="entry"></td><td class="entry"><a class="el" href="interface_c_p_t_function_data_source.html#aef292c08881127fae76185e475eb90ef">dataSourceBlock</a></td><td class="entry"><a class="el" href="interface_c_p_t_function_data_source.html">CPTFunctionDataSource</a></td><td class="entry"></td></tr>
9090
<tr class="even"><td class="entry">+&#160;</td><td><a class="el" href="interface_c_p_t_function_data_source.html#ac15eb191f0c70613d56f6166140c1b28">dataSourceForPlot:withBlock:</a></td><td class="entry"><a class="el" href="interface_c_p_t_function_data_source.html">CPTFunctionDataSource</a></td><td class="entry"><span class="mlabel">static</span></td></tr>

‎MacOS/functions_d.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ <h3><a class="anchor" id="index_d"></a>- d -</h3><ul>
156156
: <a class="el" href="interface_c_p_t_numeric_data.html#a80ed84478c645ee348e5fceaa8f31b59">CPTNumericData</a>
157157
</li>
158158
<li>dataPlot
159-
: <a class="el" href="interface_c_p_t_function_data_source.html#ace6581fc728bd3bcb8228748f8baf1a4">CPTFunctionDataSource</a>
159+
: <a class="el" href="interface_c_p_t_function_data_source.html#aa6824984763176eeb31c6f68e19cc862">CPTFunctionDataSource</a>
160160
</li>
161161
<li>dataRange
162162
: <a class="el" href="interface_c_p_t_function_data_source.html#a2d779ae217a7e95cbb301bbf3e8c2511">CPTFunctionDataSource</a>

‎MacOS/functions_prop_d.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ <h3><a class="anchor" id="index_d"></a>- d -</h3><ul>
122122
: <a class="el" href="interface_c_p_t_numeric_data.html#a80ed84478c645ee348e5fceaa8f31b59">CPTNumericData</a>
123123
</li>
124124
<li>dataPlot
125-
: <a class="el" href="interface_c_p_t_function_data_source.html#ace6581fc728bd3bcb8228748f8baf1a4">CPTFunctionDataSource</a>
125+
: <a class="el" href="interface_c_p_t_function_data_source.html#aa6824984763176eeb31c6f68e19cc862">CPTFunctionDataSource</a>
126126
</li>
127127
<li>dataRange
128128
: <a class="el" href="interface_c_p_t_function_data_source.html#a2d779ae217a7e95cbb301bbf3e8c2511">CPTFunctionDataSource</a>

‎MacOS/interface_c_p_t_function_data_source.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@
202202
<tr class="memitem:aef292c08881127fae76185e475eb90ef"><td class="memItemLeft" align="right" valign="top"><a class="el" href="_c_p_t_function_data_source_8h.html#a1a200e46cfff27e7cb0638622f45cddb">CPTDataSourceBlock</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="interface_c_p_t_function_data_source.html#aef292c08881127fae76185e475eb90ef">dataSourceBlock</a></td></tr>
203203
<tr class="memdesc:aef292c08881127fae76185e475eb90ef"><td class="mdescLeft">&#160;</td><td class="mdescRight">The Objective-C block used to generate plot data. <a href="#aef292c08881127fae76185e475eb90ef">More...</a><br /></td></tr>
204204
<tr class="separator:aef292c08881127fae76185e475eb90ef"><td class="memSeparator" colspan="2">&#160;</td></tr>
205-
<tr class="memitem:ace6581fc728bd3bcb8228748f8baf1a4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="_c_p_t_definitions_8h.html#abd26af4304957387867e6e9e8cef1576">__cpt_weak</a> <a class="el" href="interface_c_p_t_plot.html">CPTPlot</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="interface_c_p_t_function_data_source.html#ace6581fc728bd3bcb8228748f8baf1a4">dataPlot</a></td></tr>
206-
<tr class="memdesc:ace6581fc728bd3bcb8228748f8baf1a4"><td class="mdescLeft">&#160;</td><td class="mdescRight">The plot that will display the function values. Must be an instance of <a class="el" href="interface_c_p_t_scatter_plot.html" title="A two-dimensional scatter plot. ">CPTScatterPlot</a>. <a href="#ace6581fc728bd3bcb8228748f8baf1a4">More...</a><br /></td></tr>
207-
<tr class="separator:ace6581fc728bd3bcb8228748f8baf1a4"><td class="memSeparator" colspan="2">&#160;</td></tr>
205+
<tr class="memitem:aa6824984763176eeb31c6f68e19cc862"><td class="memItemLeft" align="right" valign="top"><a class="el" href="interface_c_p_t_plot.html">CPTPlot</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="interface_c_p_t_function_data_source.html#aa6824984763176eeb31c6f68e19cc862">dataPlot</a></td></tr>
206+
<tr class="memdesc:aa6824984763176eeb31c6f68e19cc862"><td class="mdescLeft">&#160;</td><td class="mdescRight">The plot that will display the function values. Must be an instance of <a class="el" href="interface_c_p_t_scatter_plot.html" title="A two-dimensional scatter plot. ">CPTScatterPlot</a>. <a href="#aa6824984763176eeb31c6f68e19cc862">More...</a><br /></td></tr>
207+
<tr class="separator:aa6824984763176eeb31c6f68e19cc862"><td class="memSeparator" colspan="2">&#160;</td></tr>
208208
<tr class="memitem:a9df6e8ee353b75f2715ebcc9e24ec0e2"><td class="memItemLeft" align="right" valign="top"><a class="elRef" href="https://developer.apple.com/library/mac/#documentation/GraphicsImaging/Reference/CGGeometry/Reference/reference.html#//apple_ref/c/tdef/CGFloat">CGFloat</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="interface_c_p_t_function_data_source.html#a9df6e8ee353b75f2715ebcc9e24ec0e2">resolution</a></td></tr>
209209
<tr class="memdesc:a9df6e8ee353b75f2715ebcc9e24ec0e2"><td class="mdescLeft">&#160;</td><td class="mdescRight">The maximum number of pixels between data points on the plot. Default is <code>1.0</code>. <a href="#a9df6e8ee353b75f2715ebcc9e24ec0e2">More...</a><br /></td></tr>
210210
<tr class="separator:a9df6e8ee353b75f2715ebcc9e24ec0e2"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -360,20 +360,20 @@
360360
</div>
361361
</div>
362362
<h2 class="groupheader">Property Documentation</h2>
363-
<a class="anchor" id="ace6581fc728bd3bcb8228748f8baf1a4"></a>
363+
<a class="anchor" id="aa6824984763176eeb31c6f68e19cc862"></a>
364364
<div class="memitem">
365365
<div class="memproto">
366366
<table class="mlabels">
367367
<tr>
368368
<td class="mlabels-left">
369369
<table class="memname">
370370
<tr>
371-
<td class="memname">- (<a class="el" href="_c_p_t_definitions_8h.html#abd26af4304957387867e6e9e8cef1576">__cpt_weak</a> <a class="el" href="interface_c_p_t_plot.html">CPTPlot</a> *) dataPlot</td>
371+
<td class="memname">- (<a class="el" href="interface_c_p_t_plot.html">CPTPlot</a> *) dataPlot</td>
372372
</tr>
373373
</table>
374374
</td>
375375
<td class="mlabels-right">
376-
<span class="mlabels"><span class="mlabel">read</span><span class="mlabel">nonatomic</span><span class="mlabel">weak</span></span> </td>
376+
<span class="mlabels"><span class="mlabel">read</span><span class="mlabel">nonatomic</span><span class="mlabel">assign</span></span> </td>
377377
</tr>
378378
</table>
379379
</div><div class="memdoc">

‎MacOS/interface_c_p_t_function_data_source.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var interface_c_p_t_function_data_source =
22
[
33
[ "initForPlot:withBlock:", "interface_c_p_t_function_data_source.html#a1396b938ef6b3d5b271add1120172885", null ],
44
[ "initForPlot:withFunction:", "interface_c_p_t_function_data_source.html#af5932934f87cf33e31a7c873fbd2cc09", null ],
5-
[ "dataPlot", "interface_c_p_t_function_data_source.html#ace6581fc728bd3bcb8228748f8baf1a4", null ],
5+
[ "dataPlot", "interface_c_p_t_function_data_source.html#aa6824984763176eeb31c6f68e19cc862", null ],
66
[ "dataRange", "interface_c_p_t_function_data_source.html#a2d779ae217a7e95cbb301bbf3e8c2511", null ],
77
[ "dataSourceBlock", "interface_c_p_t_function_data_source.html#aef292c08881127fae76185e475eb90ef", null ],
88
[ "dataSourceFunction", "interface_c_p_t_function_data_source.html#a17536bddb94c77a06329cfcd8b9e88cf", null ],

‎MacOS/navtreeindex4.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ var NAVTREEINDEX4 =
215215
"interface_c_p_t_function_data_source.html#a17536bddb94c77a06329cfcd8b9e88cf":[2,0,30,5],
216216
"interface_c_p_t_function_data_source.html#a2d779ae217a7e95cbb301bbf3e8c2511":[2,0,30,3],
217217
"interface_c_p_t_function_data_source.html#a9df6e8ee353b75f2715ebcc9e24ec0e2":[2,0,30,6],
218-
"interface_c_p_t_function_data_source.html#ace6581fc728bd3bcb8228748f8baf1a4":[2,0,30,2],
218+
"interface_c_p_t_function_data_source.html#aa6824984763176eeb31c6f68e19cc862":[2,0,30,2],
219219
"interface_c_p_t_function_data_source.html#aef292c08881127fae76185e475eb90ef":[2,0,30,4],
220220
"interface_c_p_t_function_data_source.html#af5932934f87cf33e31a7c873fbd2cc09":[2,0,30,1],
221221
"interface_c_p_t_gradient.html":[2,0,31],

0 commit comments

Comments
 (0)