git-svn-id: https://svn.code.sf.net/p/freetel/code@712 01035d8c-6547-0410-b346-abe4f9...

diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk
index 42ef6bb7482ae4accf203f5c99403467ef282c60..376a9c671a091ee97ae08eac45e19281748be7c4 100644 (file)
--- a/fdmdv2/build/fdmdv2.mk
+++ b/fdmdv2/build/fdmdv2.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=OFA-Staff\r
-Date                   :=9/11/2012\r
+Date                   :=9/14/2012\r
 CodeLitePath           :="C:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
@@ -50,8 +50,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW/m
 AR       := ar rcus\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"658\"  $(Preprocessors)\r
-CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"658\"  $(Preprocessors)\r
+CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"674\"  $(Preprocessors)\r
+CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"674\"  $(Preprocessors)\r
 \r
 \r
 ##\r

diff --git a/fdmdv2/build/fdmdv2.project b/fdmdv2/build/fdmdv2.project
index c84814c0e1e83a8d8065a4ffbbf10e46f071f8d6..41c2d74d11212cf359b8b85371e0333c07e8eb45 100644 (file)
--- a/fdmdv2/build/fdmdv2.project
+++ b/fdmdv2/build/fdmdv2.project
@@ -179,4 +179,6 @@
       </Completion>
     </Configuration>
   </Settings>
+  <Dependencies Name="Debug"/>
+  <Dependencies Name="Release"/>
 </CodeLite_Project>

diff --git a/fdmdv2/fdmdv2-doc/html/annotated.html b/fdmdv2/fdmdv2-doc/html/annotated.html
index 4adf81c6f1b40f51633efee624c4a18f2b6b4ae9..03c66977a8b23265d3a3f4d91b5a6a94ea4dc9ba 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/annotated.html
+++ b/fdmdv2/fdmdv2-doc/html/annotated.html
@@ -52,30 +52,29 @@
 <table class="directory">
 <tr id="row_0_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_about_dlg.html" target="_self">AboutDlg</a></td><td class="desc"></td></tr>
 <tr id="row_1_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_audio_dlg.html" target="_self">AudioDlg</a></td><td class="desc"></td></tr>
-<tr id="row_2_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_audio_stream.html" target="_self">AudioStream</a></td><td class="desc"></td></tr>
-<tr id="row_3_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_c_o_m_p.html" target="_self">COMP</a></td><td class="desc"></td></tr>
-<tr id="row_4_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_com_ports_dlg.html" target="_self">ComPortsDlg</a></td><td class="desc"></td></tr>
-<tr id="row_5_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_about.html" target="_self">DlgAbout</a></td><td class="desc"></td></tr>
-<tr id="row_6_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_audio.html" target="_self">DlgAudio</a></td><td class="desc"></td></tr>
-<tr id="row_7_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_com_ports.html" target="_self">DlgComPorts</a></td><td class="desc"></td></tr>
-<tr id="row_8_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_options.html" target="_self">DlgOptions</a></td><td class="desc"></td></tr>
-<tr id="row_9_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_main_app.html" target="_self">MainApp</a></td><td class="desc"></td></tr>
-<tr id="row_10_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_main_frame.html" target="_self">MainFrame</a></td><td class="desc"></td></tr>
-<tr id="row_11_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_options_dlg.html" target="_self">OptionsDlg</a></td><td class="desc"></td></tr>
-<tr id="row_12_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structpa_call_back_data.html" target="_self">paCallBackData</a></td><td class="desc"></td></tr>
-<tr id="row_13_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_panel.html" target="_self">PlotPanel</a></td><td class="desc"></td></tr>
-<tr id="row_14_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_scalar.html" target="_self">PlotScalar</a></td><td class="desc"></td></tr>
-<tr id="row_15_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_scatter.html" target="_self">PlotScatter</a></td><td class="desc"></td></tr>
-<tr id="row_16_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_spectrum.html" target="_self">PlotSpectrum</a></td><td class="desc"></td></tr>
-<tr id="row_17_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_waterfall.html" target="_self">PlotWaterfall</a></td><td class="desc"></td></tr>
-<tr id="row_18_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_port_audio_wrap.html" target="_self">PortAudioWrap</a></td><td class="desc"></td></tr>
-<tr id="row_19_"><td class="entry"><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_top_frame.html" target="_self">TopFrame</a></td><td class="desc"></td></tr>
+<tr id="row_2_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_c_o_m_p.html" target="_self">COMP</a></td><td class="desc"></td></tr>
+<tr id="row_3_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_com_ports_dlg.html" target="_self">ComPortsDlg</a></td><td class="desc"></td></tr>
+<tr id="row_4_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_about.html" target="_self">DlgAbout</a></td><td class="desc"></td></tr>
+<tr id="row_5_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_audio.html" target="_self">DlgAudio</a></td><td class="desc"></td></tr>
+<tr id="row_6_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_com_ports.html" target="_self">DlgComPorts</a></td><td class="desc"></td></tr>
+<tr id="row_7_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_options.html" target="_self">DlgOptions</a></td><td class="desc"></td></tr>
+<tr id="row_8_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_main_app.html" target="_self">MainApp</a></td><td class="desc"></td></tr>
+<tr id="row_9_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_main_frame.html" target="_self">MainFrame</a></td><td class="desc"></td></tr>
+<tr id="row_10_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_options_dlg.html" target="_self">OptionsDlg</a></td><td class="desc"></td></tr>
+<tr id="row_11_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structpa_call_back_data.html" target="_self">paCallBackData</a></td><td class="desc"></td></tr>
+<tr id="row_12_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_panel.html" target="_self">PlotPanel</a></td><td class="desc"></td></tr>
+<tr id="row_13_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_scalar.html" target="_self">PlotScalar</a></td><td class="desc"></td></tr>
+<tr id="row_14_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_scatter.html" target="_self">PlotScatter</a></td><td class="desc"></td></tr>
+<tr id="row_15_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_spectrum.html" target="_self">PlotSpectrum</a></td><td class="desc"></td></tr>
+<tr id="row_16_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_waterfall.html" target="_self">PlotWaterfall</a></td><td class="desc"></td></tr>
+<tr id="row_17_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_port_audio_wrap.html" target="_self">PortAudioWrap</a></td><td class="desc"></td></tr>
+<tr id="row_18_" class="even"><td class="entry"><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_top_frame.html" target="_self">TopFrame</a></td><td class="desc"></td></tr>
 </table>
 </div><!-- directory -->
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_about_dlg-members.html b/fdmdv2/fdmdv2-doc/html/class_about_dlg-members.html
index 21485c2cd617552dfcc19f9698260190f6808553..45b5d8f091ebc18ebc536b3efa63cec157b85cce 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_about_dlg-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_about_dlg-members.html
@@ -63,7 +63,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_about_dlg.html b/fdmdv2/fdmdv2-doc/html/class_about_dlg.html
index c59cee41d9e9783f342e0295963ef5d6c96e8155..f7e604744dd35245a2f60132795ff3d259947c95 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_about_dlg.html
+++ b/fdmdv2/fdmdv2-doc/html/class_about_dlg.html
@@ -127,7 +127,7 @@ wxButton *&#160;</td><td class="memItemRight" valign="bottom"><b>m_button9</b></
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_audio_dlg-members.html b/fdmdv2/fdmdv2-doc/html/class_audio_dlg-members.html
index cf1dbedf0039101a1d4361e614b993f61bc47edd..bc98782b5e873de31ebacd4c6a39fa823d2a226f 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_audio_dlg-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_audio_dlg-members.html
@@ -98,7 +98,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_audio_dlg.html b/fdmdv2/fdmdv2-doc/html/class_audio_dlg.html
index 316669b820fa5fec852fb36c7605729a13fc98f5..47c7b2c5d638138fbad07876210c6503c8a6dd91 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_audio_dlg.html
+++ b/fdmdv2/fdmdv2-doc/html/class_audio_dlg.html
@@ -231,7 +231,7 @@ wxButton *&#160;</td><td class="memItemRight" valign="bottom"><b>m_sdbSizer3Canc
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_com_ports_dlg-members.html b/fdmdv2/fdmdv2-doc/html/class_com_ports_dlg-members.html
index ba73d92c285346d2f07cc7930376438b3b09ca44..edf183b451f727a69b211e6bd4eca98d8113477f 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_com_ports_dlg-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_com_ports_dlg-members.html
@@ -65,7 +65,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_com_ports_dlg.html b/fdmdv2/fdmdv2-doc/html/class_com_ports_dlg.html
index 51bde42c16cf878bfb8e00ed096c0a7c735b19d0..4d7d3a6b6b63ba123476877a8e37293cad631683 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_com_ports_dlg.html
+++ b/fdmdv2/fdmdv2-doc/html/class_com_ports_dlg.html
@@ -132,7 +132,7 @@ wxButton *&#160;</td><td class="memItemRight" valign="bottom"><b>m_sdbSizer3Canc
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_about-members.html b/fdmdv2/fdmdv2-doc/html/class_dlg_about-members.html
index 1f0bf6c7c79a802517e81de5db0c6f7820fbd498..34e8920a7e8ffddb675c65b6c2cd52d22e017616 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_dlg_about-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_dlg_about-members.html
@@ -62,7 +62,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_about.html b/fdmdv2/fdmdv2-doc/html/class_dlg_about.html
index dc5424927cc718f64f7b8a12f2e40297a6be9869..78ac21530f63c4dd03da2ae5ea443a0223f69c37 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_dlg_about.html
+++ b/fdmdv2/fdmdv2-doc/html/class_dlg_about.html
@@ -107,7 +107,7 @@ wxButton *&#160;</td><td class="memItemRight" valign="bottom"><b>m_button9</b></
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_audio-members.html b/fdmdv2/fdmdv2-doc/html/class_dlg_audio-members.html
index 520a0eb8ec20cba5cddf6e39d971deb676b75ba8..cbbb1e12b41be022e2ccfc0a866b9a4fa9396d38 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_dlg_audio-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_dlg_audio-members.html
@@ -95,7 +95,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_audio.html b/fdmdv2/fdmdv2-doc/html/class_dlg_audio.html
index ec3df70e248b47ecee74f415e6d90ee434789455..96fdd552c3efe3b910b978015fcde49b2255cf2f 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_dlg_audio.html
+++ b/fdmdv2/fdmdv2-doc/html/class_dlg_audio.html
@@ -206,7 +206,7 @@ wxButton *&#160;</td><td class="memItemRight" valign="bottom"><b>m_sdbSizer3Canc
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_com_ports-members.html b/fdmdv2/fdmdv2-doc/html/class_dlg_com_ports-members.html
index 8dbdd13c13eb2545de895186664df55bf0d3c439..51328631260c9655d48d539756439ed1fc142fb8 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_dlg_com_ports-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_dlg_com_ports-members.html
@@ -64,7 +64,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_com_ports.html b/fdmdv2/fdmdv2-doc/html/class_dlg_com_ports.html
index 142ccc3a8d1c9d9075d651153202dbe88b534aba..6c019a70a0c29a95f1133a5ef37fe9806ccf22c3 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_dlg_com_ports.html
+++ b/fdmdv2/fdmdv2-doc/html/class_dlg_com_ports.html
@@ -113,7 +113,7 @@ wxButton *&#160;</td><td class="memItemRight" valign="bottom"><b>m_sdbSizer3Canc
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_options-members.html b/fdmdv2/fdmdv2-doc/html/class_dlg_options-members.html
index ae95079b98c4e625f5facb18fd8022f4c5f327aa..7d2d769f79f30c69d4e2e3ba7a2a297a7c9f3b33 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_dlg_options-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_dlg_options-members.html
@@ -73,7 +73,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_options.html b/fdmdv2/fdmdv2-doc/html/class_dlg_options.html
index 4edfcfbdbee2f14cc65cd71210fd83242419fb49..ddd031710024430e013a0b4e0478dbf567dfe4e6 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_dlg_options.html
+++ b/fdmdv2/fdmdv2-doc/html/class_dlg_options.html
@@ -140,7 +140,7 @@ wxButton *&#160;</td><td class="memItemRight" valign="bottom"><b>m_sdbSizer4Canc
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_main_app-members.html b/fdmdv2/fdmdv2-doc/html/class_main_app-members.html
index 0ced29ddaba74cc4c72128d4a511f2d10f5a028c..bc1c79572b4be1a2376b7d5557625a0954174418 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_main_app-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_main_app-members.html
@@ -51,12 +51,14 @@
 
 <p>This is the complete list of members for <a class="el" href="class_main_app.html">MainApp</a>, including all inherited members.</p>
 <table class="directory">
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>g_config</b> (defined in <a class="el" href="class_main_app.html">MainApp</a>)</td><td class="entry"><a class="el" href="class_main_app.html">MainApp</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>loadConfig</b>() (defined in <a class="el" href="class_main_app.html">MainApp</a>)</td><td class="entry"><a class="el" href="class_main_app.html">MainApp</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnExit</b>() (defined in <a class="el" href="class_main_app.html">MainApp</a>)</td><td class="entry"><a class="el" href="class_main_app.html">MainApp</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>OnInit</b>() (defined in <a class="el" href="class_main_app.html">MainApp</a>)</td><td class="entry"><a class="el" href="class_main_app.html">MainApp</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_main_app.html b/fdmdv2/fdmdv2-doc/html/class_main_app.html
index 66d9974f57b9b446bbb8cb32df3070acf05074fe..5f67ed6e99a9a8b148acb4135b3bc2420fb17c34 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_main_app.html
+++ b/fdmdv2/fdmdv2-doc/html/class_main_app.html
@@ -46,6 +46,7 @@
 <div class="header">
   <div class="summary">
 <a href="#pub-methods">Public Member Functions</a> &#124;
+<a href="#pro-attribs">Protected Attributes</a> &#124;
 <a href="class_main_app-members.html">List of all members</a>  </div>
   <div class="headertitle">
 <div class="title">MainApp Class Reference</div>  </div>
@@ -70,6 +71,15 @@ virtual bool&#160;</td><td class="memItemRight" valign="bottom"><b>OnInit</b> ()
 <tr class="memitem:aff49a6bb4a0494d717a3136e9fe17351"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aff49a6bb4a0494d717a3136e9fe17351"></a>
 virtual int&#160;</td><td class="memItemRight" valign="bottom"><b>OnExit</b> ()</td></tr>
 <tr class="separator:aff49a6bb4a0494d717a3136e9fe17351"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:af06cc098b89d1c606aa94ad87d6b0105"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af06cc098b89d1c606aa94ad87d6b0105"></a>
+bool&#160;</td><td class="memItemRight" valign="bottom"><b>loadConfig</b> ()</td></tr>
+<tr class="separator:af06cc098b89d1c606aa94ad87d6b0105"><td class="memSeparator" colspan="2">&#160;</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pro-attribs"></a>
+Protected Attributes</h2></td></tr>
+<tr class="memitem:ae6022a31caf96dbcc2f519fc5fdc0bbe"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae6022a31caf96dbcc2f519fc5fdc0bbe"></a>
+wxConfig *&#160;</td><td class="memItemRight" valign="bottom"><b>g_config</b></td></tr>
+<tr class="separator:ae6022a31caf96dbcc2f519fc5fdc0bbe"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <hr/>The documentation for this class was generated from the following files:<ul>
 <li>C:/bin/Projects/Radio/fdmdv2/src/<a class="el" href="fdmdv2__main_8h_source.html">fdmdv2_main.h</a></li>
@@ -78,7 +88,7 @@ virtual int&#160;</td><td class="memItemRight" valign="bottom"><b>OnExit</b> ()<
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_main_frame-members.html b/fdmdv2/fdmdv2-doc/html/class_main_frame-members.html
index 1c70b6a81521d0e3f6181fe01758bc2836833e49..1e7f7f9420bd8edd110c883985c878ad3d7ac1b0 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_main_frame-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_main_frame-members.html
@@ -53,75 +53,79 @@
 <table class="directory">
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>abortRxStream</b>() (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>abortTxStream</b>() (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>edit</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>file</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>help</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>LoadUserImage</b>(wxImage &amp;image) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_auiNbookCtrl</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_btnTogTX</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_ckboxSQ</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_gaugeLevel</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_gaugeSNR</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_menubarMain</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_panelDefaultA</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_panelScalar</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_panelScatter</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_panelSpectrum</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_panelWaterfall</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_RXCodec2</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rxDevIn</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rxDevOut</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rxErr</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rxPa</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_RxRunning</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_sliderSQ</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_sound</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_SquelchActive</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_statusBar1</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_textSNR</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_togBtnALC</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_togBtnAnalog</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_togBtnOnOff</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_togBtnSplit</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_togRxID</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_togTxID</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_TXCodec2</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_txDevIn</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_txDevOut</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_txErr</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_txPa</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_TxRunning</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_txtCtrl</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>MainFrame</b>(wxWindow *parent) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnCaptureRxStream</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnCaptureTxStream</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnCheckSQClick</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnClose</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnClose</b>(wxCloseEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnCloseFrame</b>(wxCloseEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnCloseUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnCmdSliderScroll</b>(wxScrollEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnCmdSliderScrollChanged</b>(wxScrollEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnCopy</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnCopyUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnCut</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnCutUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnExit</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnExitClick</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnHelpAbout</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnHelpCheckUpdates</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnHelpCheckUpdatesUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnOpen</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnOpenUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnPaint</b>(wxPaintEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnPaste</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnPasteUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnPlayAudioFile</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnSave</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnSaveUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnSize</b>(wxSizeEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnSliderScrollBottom</b>(wxScrollEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnSliderScrollTop</b>(wxScrollEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>averageData</b>(float mag_dB[]) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>edit</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>file</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>help</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>LoadUserImage</b>(wxImage &amp;image) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_auiNbookCtrl</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_btnTogTX</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_ckboxSQ</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_gaugeLevel</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_gaugeSNR</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_menubarMain</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_panelDefaultA</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_panelScalar</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_panelScatter</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_panelSpectrum</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_panelWaterfall</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_pFDMDV_state</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_plotTimer</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_RXCodec2</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rxDevIn</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rxDevOut</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rxErr</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rxPa</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_RxRunning</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_sliderSQ</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_sound</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_SquelchActive</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_statusBar1</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_textSNR</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_togBtnALC</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_togBtnAnalog</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_togBtnOnOff</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_togBtnSplit</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_togRxID</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_togTxID</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_TXCodec2</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_txDevIn</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_txDevOut</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_txErr</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_txPa</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_TxRunning</b> (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_txtCtrl</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>MainFrame</b>(wxWindow *parent) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnCaptureRxStream</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnCaptureTxStream</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnCheckSQClick</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnClose</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnClose</b>(wxCloseEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnCloseFrame</b>(wxCloseEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnCloseUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnCmdSliderScroll</b>(wxScrollEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnCmdSliderScrollChanged</b>(wxScrollEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnCopy</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnCopyUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnCut</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnCutUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnExit</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnExitClick</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnHelpAbout</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnHelpCheckUpdates</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnHelpCheckUpdatesUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnOpen</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnOpenUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnPaint</b>(wxPaintEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnPaste</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnPasteUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnPlayAudioFile</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnSave</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnSaveUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnSize</b>(wxSizeEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnSliderScrollBottom</b>(wxScrollEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnSliderScrollTop</b>(wxScrollEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnTimer</b>(wxTimerEvent &amp;evt) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>OnTogBtnALCClick</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnTogBtnAnalogClick</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>OnTogBtnOnOff</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
@@ -136,24 +140,25 @@
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnToolsOptions</b>(wxCommandEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>OnToolsOptionsUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>rxCallback</b>(const void *inBuffer, void *outBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo *outTime, PaStreamCallbackFlags statusFlags, void *userData) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>startRxStream</b>() (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>startTxStream</b>() (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>stopRxStream</b>() (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>stopTxStream</b>() (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>tools</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>TopFrame</b>(wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &amp;title=_(&quot;FDMDV2&quot;), const wxPoint &amp;pos=wxDefaultPosition, const wxSize &amp;size=wxSize(761, 500), long style=wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL) (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>topFrame_OnClose</b>(wxCloseEvent &amp;event) (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>topFrame_OnPaint</b>(wxPaintEvent &amp;event) (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>topFrame_OnSize</b>(wxSizeEvent &amp;event) (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>topFrame_OnUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>txCallback</b>(const void *inBuffer, void *outBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo *outTime, PaStreamCallbackFlags statusFlags, void *userData) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>~MainFrame</b>() (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>~TopFrame</b>() (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>per_frame_rx_processing</b>(short output_buf[], int *n_output_buf, int codec_bits[], short input_buf[], int *n_input_buf, int *nin, int *state, struct CODEC2 *c2) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>rxCallback</b>(const void *inBuffer, void *outBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo *outTime, PaStreamCallbackFlags statusFlags, void *userData) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>startRxStream</b>() (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>startTxStream</b>() (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>stopRxStream</b>() (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>stopTxStream</b>() (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>tools</b> (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>TopFrame</b>(wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &amp;title=_(&quot;FDMDV2&quot;), const wxPoint &amp;pos=wxDefaultPosition, const wxSize &amp;size=wxSize(761, 500), long style=wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL) (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>topFrame_OnClose</b>(wxCloseEvent &amp;event) (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>topFrame_OnPaint</b>(wxPaintEvent &amp;event) (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>topFrame_OnSize</b>(wxSizeEvent &amp;event) (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>topFrame_OnUpdateUI</b>(wxUpdateUIEvent &amp;event) (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>txCallback</b>(const void *inBuffer, void *outBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo *outTime, PaStreamCallbackFlags statusFlags, void *userData) (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">static</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>~MainFrame</b>() (defined in <a class="el" href="class_main_frame.html">MainFrame</a>)</td><td class="entry"><a class="el" href="class_main_frame.html">MainFrame</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>~TopFrame</b>() (defined in <a class="el" href="class_top_frame.html">TopFrame</a>)</td><td class="entry"><a class="el" href="class_top_frame.html">TopFrame</a></td><td class="entry"></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_main_frame.html b/fdmdv2/fdmdv2-doc/html/class_main_frame.html
index 2534dd6d66213b6f06356d719f43ccec1722697f..81fcac7fa20fb1c0a16d3c633626091d094e57f5 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_main_frame.html
+++ b/fdmdv2/fdmdv2-doc/html/class_main_frame.html
@@ -74,6 +74,9 @@ Public Member Functions</h2></td></tr>
 <tr class="memitem:a394b51dbf31b7430ecad3f6ee1007e22"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a394b51dbf31b7430ecad3f6ee1007e22"></a>
 &#160;</td><td class="memItemRight" valign="bottom"><b>MainFrame</b> (wxWindow *parent)</td></tr>
 <tr class="separator:a394b51dbf31b7430ecad3f6ee1007e22"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:af9f4cfb8469872efd9c057d1bc215f08"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af9f4cfb8469872efd9c057d1bc215f08"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><b>per_frame_rx_processing</b> (short output_buf[], int *n_output_buf, int codec_bits[], short input_buf[], int *n_input_buf, int *nin, int *state, struct CODEC2 *c2)</td></tr>
+<tr class="separator:af9f4cfb8469872efd9c057d1bc215f08"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_methods_class_top_frame"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_class_top_frame')"><img src="closed.png" alt="-"/>&#160;Public Member Functions inherited from <a class="el" href="class_top_frame.html">TopFrame</a></td></tr>
 <tr class="memitem:af89867621f7fa66c9865f09a1245153c inherit pub_methods_class_top_frame"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af89867621f7fa66c9865f09a1245153c"></a>
 &#160;</td><td class="memItemRight" valign="bottom"><b>TopFrame</b> (wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &amp;title=_(&quot;FDMDV2&quot;), const wxPoint &amp;pos=wxDefaultPosition, const wxSize &amp;size=wxSize(761, 500), long style=wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL)</td></tr>
@@ -147,6 +150,12 @@ PaError&#160;</td><td class="memItemRight" valign="bottom"><b>m_txErr</b></td></
 <tr class="memitem:a6458de14647c34b3ae5ace81992710d6"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6458de14647c34b3ae5ace81992710d6"></a>
 wxSound *&#160;</td><td class="memItemRight" valign="bottom"><b>m_sound</b></td></tr>
 <tr class="separator:a6458de14647c34b3ae5ace81992710d6"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aae86bcc3a14e94ddc496b9cce6a63c56"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aae86bcc3a14e94ddc496b9cce6a63c56"></a>
+struct FDMDV *&#160;</td><td class="memItemRight" valign="bottom"><b>m_pFDMDV_state</b></td></tr>
+<tr class="separator:aae86bcc3a14e94ddc496b9cce6a63c56"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aabe58bef730ca69b342f8ac663c3d70d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aabe58bef730ca69b342f8ac663c3d70d"></a>
+wxTimer&#160;</td><td class="memItemRight" valign="bottom"><b>m_plotTimer</b></td></tr>
+<tr class="separator:aabe58bef730ca69b342f8ac663c3d70d"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_attribs_class_top_frame"><td colspan="2" onclick="javascript:toggleInherit('pub_attribs_class_top_frame')"><img src="closed.png" alt="-"/>&#160;Public Attributes inherited from <a class="el" href="class_top_frame.html">TopFrame</a></td></tr>
 <tr class="memitem:af2bf3b05c2e23a16d9b74d8689c83dca inherit pub_attribs_class_top_frame"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af2bf3b05c2e23a16d9b74d8689c83dca"></a>
 wxAuiNotebook *&#160;</td><td class="memItemRight" valign="bottom"><b>m_auiNbookCtrl</b></td></tr>
@@ -160,6 +169,9 @@ virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>OnCloseFrame<
 <tr class="memitem:ab9ed8ca71402b68b41fd5a7cedb20928"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab9ed8ca71402b68b41fd5a7cedb20928"></a>
 virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>OnExitClick</b> (wxCommandEvent &amp;event)</td></tr>
 <tr class="separator:ab9ed8ca71402b68b41fd5a7cedb20928"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a31585b905eee875973b106f4e79c263f"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a31585b905eee875973b106f4e79c263f"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><b>averageData</b> (float mag_dB[])</td></tr>
+<tr class="separator:a31585b905eee875973b106f4e79c263f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:af01eb2c59f1a9bcee0b956f8a72004c0"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af01eb2c59f1a9bcee0b956f8a72004c0"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>startTxStream</b> ()</td></tr>
 <tr class="separator:af01eb2c59f1a9bcee0b956f8a72004c0"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -301,6 +313,9 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>OnSize</b> (wxSizeEve
 <tr class="memitem:a4757c5d7d0e9b2c98dc34336f1dce49e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4757c5d7d0e9b2c98dc34336f1dce49e"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>OnUpdateUI</b> (wxUpdateUIEvent &amp;event)</td></tr>
 <tr class="separator:a4757c5d7d0e9b2c98dc34336f1dce49e"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a9ad22e55c7a3c93f9c071d366ae760d6"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9ad22e55c7a3c93f9c071d366ae760d6"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><b>OnTimer</b> (wxTimerEvent &amp;evt)</td></tr>
+<tr class="separator:a9ad22e55c7a3c93f9c071d366ae760d6"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a2577b78ec0105922e5356287519d2e54"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2577b78ec0105922e5356287519d2e54"></a>
 wxString&#160;</td><td class="memItemRight" valign="bottom"><b>LoadUserImage</b> (wxImage &amp;image)</td></tr>
 <tr class="separator:a2577b78ec0105922e5356287519d2e54"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -386,7 +401,7 @@ wxStatusBar *&#160;</td><td class="memItemRight" valign="bottom"><b>m_statusBar1
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_options_dlg-members.html b/fdmdv2/fdmdv2-doc/html/class_options_dlg-members.html
index 27ab1a57a9a2315f20bddf27c4d292b19ff03dce..884eb78bf51d305cbf0ea97dee006ac8556c0ab7 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_options_dlg-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_options_dlg-members.html
@@ -74,7 +74,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_options_dlg.html b/fdmdv2/fdmdv2-doc/html/class_options_dlg.html
index bcc74c06bd49a58d525ccc4ef5ffab318abeb0e0..d6e52bf9af90b8fe7ccae6f6a99efd7c776c65cb 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_options_dlg.html
+++ b/fdmdv2/fdmdv2-doc/html/class_options_dlg.html
@@ -159,7 +159,7 @@ wxButton *&#160;</td><td class="memItemRight" valign="bottom"><b>m_sdbSizer4Canc
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_panel-members.html b/fdmdv2/fdmdv2-doc/html/class_plot_panel-members.html
index 530504a235b462511bcb804057c4200d6a6d1eb2..ded8294e725515d755f80eca83c3ec771df91f0e 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_plot_panel-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_plot_panel-members.html
@@ -51,14 +51,14 @@
 
 <p>This is the complete list of members for <a class="el" href="class_plot_panel.html">PlotPanel</a>, including all inherited members.</p>
 <table class="directory">
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>draw</b>(wxAutoBufferedPaintDC &amp;dc) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>drawGraticule</b>(wxAutoBufferedPaintDC &amp;dc) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>draw</b>(wxAutoBufferedPaintDC &amp;pdc) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>drawGraticule</b>(wxAutoBufferedPaintDC &amp;pdc) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>GetLabelSize</b>() (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>GetZoomFactor</b>(double zf) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_bmp</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_Bufsz</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_clip</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_h</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_firstPass</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_label_size</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_left</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_mouseDown</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -73,13 +73,13 @@
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_prev_x</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_prev_y</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_pTopFrame</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rectCtrl</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rectGrid</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rectPlot</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rubberBand</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_top</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_use_bitmap</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_w</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rCtrl</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rCtrlPrev</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rGrid</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rPlot</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rubberBand</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_top</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_use_bitmap</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_x</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_y</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_zoomFactor</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -100,7 +100,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_panel.html b/fdmdv2/fdmdv2-doc/html/class_plot_panel.html
index 3ac96de0c509368adf487f7ad316f7b40e116782..50ee321b3e05f23af41eac5524d09f8ee9830038 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_plot_panel.html
+++ b/fdmdv2/fdmdv2-doc/html/class_plot_panel.html
@@ -100,12 +100,12 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>OnPaint</b> (wxPaintE
 <tr class="memitem:a042c9df2ebe0c245d9fb5f3aa63595bc"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a042c9df2ebe0c245d9fb5f3aa63595bc"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>paintEvent</b> (wxPaintEvent &amp;evt)</td></tr>
 <tr class="separator:a042c9df2ebe0c245d9fb5f3aa63595bc"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a5f35a9628a035ef904fb056f5ebcc3c3"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5f35a9628a035ef904fb056f5ebcc3c3"></a>
-virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>draw</b> (wxAutoBufferedPaintDC &amp;dc)</td></tr>
-<tr class="separator:a5f35a9628a035ef904fb056f5ebcc3c3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac9a8cc0d4ab016dc22195b813643c675"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac9a8cc0d4ab016dc22195b813643c675"></a>
-virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>drawGraticule</b> (wxAutoBufferedPaintDC &amp;dc)</td></tr>
-<tr class="separator:ac9a8cc0d4ab016dc22195b813643c675"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a974601747a67a4637a3a133cefe70c13"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a974601747a67a4637a3a133cefe70c13"></a>
+virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>draw</b> (wxAutoBufferedPaintDC &amp;pdc)</td></tr>
+<tr class="separator:a974601747a67a4637a3a133cefe70c13"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a5444b418c756380e5e08f86a34615be3"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5444b418c756380e5e08f86a34615be3"></a>
+virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>drawGraticule</b> (wxAutoBufferedPaintDC &amp;pdc)</td></tr>
+<tr class="separator:a5444b418c756380e5e08f86a34615be3"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a8e8722d1f4c02f166f7acd6905ea4009"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8e8722d1f4c02f166f7acd6905ea4009"></a>
 virtual double&#160;</td><td class="memItemRight" valign="bottom"><b>SetZoomFactor</b> (double zf)</td></tr>
 <tr class="separator:a8e8722d1f4c02f166f7acd6905ea4009"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -133,15 +133,18 @@ wxPen&#160;</td><td class="memItemRight" valign="bottom"><b>m_penDotDash</b></td
 <tr class="memitem:a229628c08bb7d0fa16589dbf83d635d1"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a229628c08bb7d0fa16589dbf83d635d1"></a>
 wxPen&#160;</td><td class="memItemRight" valign="bottom"><b>m_penSolid</b></td></tr>
 <tr class="separator:a229628c08bb7d0fa16589dbf83d635d1"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad1cfa169df1cfa5ef798b57d2619d742"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad1cfa169df1cfa5ef798b57d2619d742"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectCtrl</b></td></tr>
-<tr class="separator:ad1cfa169df1cfa5ef798b57d2619d742"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a467e202bbd0fa3ef1997fa2b322e349d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a467e202bbd0fa3ef1997fa2b322e349d"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectGrid</b></td></tr>
-<tr class="separator:a467e202bbd0fa3ef1997fa2b322e349d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afcee74e089f5a50659bb534db80532d9"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afcee74e089f5a50659bb534db80532d9"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectPlot</b></td></tr>
-<tr class="separator:afcee74e089f5a50659bb534db80532d9"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aef7e50cc8a27b9434d17d7d8c245606c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aef7e50cc8a27b9434d17d7d8c245606c"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rCtrlPrev</b></td></tr>
+<tr class="separator:aef7e50cc8a27b9434d17d7d8c245606c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2c10cfe6bcd979613cec037a71ba2c94"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2c10cfe6bcd979613cec037a71ba2c94"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rCtrl</b></td></tr>
+<tr class="separator:a2c10cfe6bcd979613cec037a71ba2c94"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae8d79eab28220ea1fa8ffcbfd70bc84a"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae8d79eab28220ea1fa8ffcbfd70bc84a"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rGrid</b></td></tr>
+<tr class="separator:ae8d79eab28220ea1fa8ffcbfd70bc84a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa4d6249f2f09d03682b8fa704be04548"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa4d6249f2f09d03682b8fa704be04548"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rPlot</b></td></tr>
+<tr class="separator:aa4d6249f2f09d03682b8fa704be04548"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad28637582a93843082fc7b1d8d80c807"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad28637582a93843082fc7b1d8d80c807"></a>
 <a class="el" href="class_main_frame.html">MainFrame</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>m_pTopFrame</b></td></tr>
 <tr class="separator:ad28637582a93843082fc7b1d8d80c807"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -172,12 +175,6 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>m_x</b></td></tr>
 <tr class="memitem:a822981fef8ff50da327b3dbca9fd2777"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a822981fef8ff50da327b3dbca9fd2777"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>m_y</b></td></tr>
 <tr class="separator:a822981fef8ff50da327b3dbca9fd2777"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae78b6e7fc3e44bea81809813d753125c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae78b6e7fc3e44bea81809813d753125c"></a>
-int&#160;</td><td class="memItemRight" valign="bottom"><b>m_w</b></td></tr>
-<tr class="separator:ae78b6e7fc3e44bea81809813d753125c"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:adcc3cec53897df2c9e99a980938092c1"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adcc3cec53897df2c9e99a980938092c1"></a>
-int&#160;</td><td class="memItemRight" valign="bottom"><b>m_h</b></td></tr>
-<tr class="separator:adcc3cec53897df2c9e99a980938092c1"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab41676a2e46c2e801bc639c274a7d5f5"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab41676a2e46c2e801bc639c274a7d5f5"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>m_left</b></td></tr>
 <tr class="separator:ab41676a2e46c2e801bc639c274a7d5f5"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -208,6 +205,9 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_rubberBand</b></td>
 <tr class="memitem:acebe9485868374626f03516e3508b592"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="acebe9485868374626f03516e3508b592"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_mouseDown</b></td></tr>
 <tr class="separator:acebe9485868374626f03516e3508b592"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a1bb0714da68ee75a51a4ebb9e9ea3cad"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1bb0714da68ee75a51a4ebb9e9ea3cad"></a>
+bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_firstPass</b></td></tr>
+<tr class="separator:a1bb0714da68ee75a51a4ebb9e9ea3cad"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ae2f4907a8e4ed958ef4995e99b1f7148"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae2f4907a8e4ed958ef4995e99b1f7148"></a>
 double&#160;</td><td class="memItemRight" valign="bottom"><b>m_zoomFactor</b></td></tr>
 <tr class="separator:ae2f4907a8e4ed958ef4995e99b1f7148"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -219,7 +219,7 @@ double&#160;</td><td class="memItemRight" valign="bottom"><b>m_zoomFactor</b></t
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_scalar-members.html b/fdmdv2/fdmdv2-doc/html/class_plot_scalar-members.html
index a51b890f78e443009f303dea8b6d5441aa35ba5d..5dd9d5920674a56cbc94fe767d0c141867b1991c 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_plot_scalar-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_plot_scalar-members.html
@@ -54,13 +54,13 @@
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>add_new_sample</b>(float sample) (defined in <a class="el" href="class_plot_scalar.html">PlotScalar</a>)</td><td class="entry"><a class="el" href="class_plot_scalar.html">PlotScalar</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>clip</b>(int y1) (defined in <a class="el" href="class_plot_scalar.html">PlotScalar</a>)</td><td class="entry"><a class="el" href="class_plot_scalar.html">PlotScalar</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>draw</b>(wxAutoBufferedPaintDC &amp;dc) (defined in <a class="el" href="class_plot_scalar.html">PlotScalar</a>)</td><td class="entry"><a class="el" href="class_plot_scalar.html">PlotScalar</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>drawGraticule</b>(wxAutoBufferedPaintDC &amp;dc) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>drawGraticule</b>(wxAutoBufferedPaintDC &amp;pdc) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>GetLabelSize</b>() (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>GetZoomFactor</b>(double zf) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_bmp</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_Bufsz</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_clip</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_h</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_firstPass</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_index</b> (defined in <a class="el" href="class_plot_scalar.html">PlotScalar</a>)</td><td class="entry"><a class="el" href="class_plot_scalar.html">PlotScalar</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_label_size</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_left</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -78,14 +78,14 @@
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_prev_x</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_prev_y</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_pTopFrame</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rectCtrl</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rectGrid</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rectPlot</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rubberBand</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_step</b> (defined in <a class="el" href="class_plot_scalar.html">PlotScalar</a>)</td><td class="entry"><a class="el" href="class_plot_scalar.html">PlotScalar</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_top</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_use_bitmap</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_w</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rCtrl</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rCtrlPrev</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rGrid</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rPlot</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rubberBand</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_step</b> (defined in <a class="el" href="class_plot_scalar.html">PlotScalar</a>)</td><td class="entry"><a class="el" href="class_plot_scalar.html">PlotScalar</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_top</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_use_bitmap</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_x</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_x_max</b> (defined in <a class="el" href="class_plot_scalar.html">PlotScalar</a>)</td><td class="entry"><a class="el" href="class_plot_scalar.html">PlotScalar</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_y</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -110,7 +110,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_scalar.html b/fdmdv2/fdmdv2-doc/html/class_plot_scalar.html
index 53b19335327156aab195a1e46e4585c08f4a8ba0..07e60f4ff13aa4cf8da98b9e525de91faaa82bc5 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_plot_scalar.html
+++ b/fdmdv2/fdmdv2-doc/html/class_plot_scalar.html
@@ -107,9 +107,9 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>OnPaint</b> (wxPaintE
 <tr class="memitem:a042c9df2ebe0c245d9fb5f3aa63595bc inherit pub_methods_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a042c9df2ebe0c245d9fb5f3aa63595bc"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>paintEvent</b> (wxPaintEvent &amp;evt)</td></tr>
 <tr class="separator:a042c9df2ebe0c245d9fb5f3aa63595bc inherit pub_methods_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac9a8cc0d4ab016dc22195b813643c675 inherit pub_methods_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac9a8cc0d4ab016dc22195b813643c675"></a>
-virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>drawGraticule</b> (wxAutoBufferedPaintDC &amp;dc)</td></tr>
-<tr class="separator:ac9a8cc0d4ab016dc22195b813643c675 inherit pub_methods_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a5444b418c756380e5e08f86a34615be3 inherit pub_methods_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5444b418c756380e5e08f86a34615be3"></a>
+virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>drawGraticule</b> (wxAutoBufferedPaintDC &amp;pdc)</td></tr>
+<tr class="separator:a5444b418c756380e5e08f86a34615be3 inherit pub_methods_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a8e8722d1f4c02f166f7acd6905ea4009 inherit pub_methods_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8e8722d1f4c02f166f7acd6905ea4009"></a>
 virtual double&#160;</td><td class="memItemRight" valign="bottom"><b>SetZoomFactor</b> (double zf)</td></tr>
 <tr class="separator:a8e8722d1f4c02f166f7acd6905ea4009 inherit pub_methods_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -168,12 +168,6 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>m_x</b></td></tr>
 <tr class="memitem:a822981fef8ff50da327b3dbca9fd2777 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a822981fef8ff50da327b3dbca9fd2777"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>m_y</b></td></tr>
 <tr class="separator:a822981fef8ff50da327b3dbca9fd2777 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae78b6e7fc3e44bea81809813d753125c inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae78b6e7fc3e44bea81809813d753125c"></a>
-int&#160;</td><td class="memItemRight" valign="bottom"><b>m_w</b></td></tr>
-<tr class="separator:ae78b6e7fc3e44bea81809813d753125c inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:adcc3cec53897df2c9e99a980938092c1 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adcc3cec53897df2c9e99a980938092c1"></a>
-int&#160;</td><td class="memItemRight" valign="bottom"><b>m_h</b></td></tr>
-<tr class="separator:adcc3cec53897df2c9e99a980938092c1 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab41676a2e46c2e801bc639c274a7d5f5 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab41676a2e46c2e801bc639c274a7d5f5"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>m_left</b></td></tr>
 <tr class="separator:ab41676a2e46c2e801bc639c274a7d5f5 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -204,6 +198,9 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_rubberBand</b></td>
 <tr class="memitem:acebe9485868374626f03516e3508b592 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="acebe9485868374626f03516e3508b592"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_mouseDown</b></td></tr>
 <tr class="separator:acebe9485868374626f03516e3508b592 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a1bb0714da68ee75a51a4ebb9e9ea3cad inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1bb0714da68ee75a51a4ebb9e9ea3cad"></a>
+bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_firstPass</b></td></tr>
+<tr class="separator:a1bb0714da68ee75a51a4ebb9e9ea3cad inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ae2f4907a8e4ed958ef4995e99b1f7148 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae2f4907a8e4ed958ef4995e99b1f7148"></a>
 double&#160;</td><td class="memItemRight" valign="bottom"><b>m_zoomFactor</b></td></tr>
 <tr class="separator:ae2f4907a8e4ed958ef4995e99b1f7148 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -220,15 +217,18 @@ wxPen&#160;</td><td class="memItemRight" valign="bottom"><b>m_penDotDash</b></td
 <tr class="memitem:a229628c08bb7d0fa16589dbf83d635d1 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a229628c08bb7d0fa16589dbf83d635d1"></a>
 wxPen&#160;</td><td class="memItemRight" valign="bottom"><b>m_penSolid</b></td></tr>
 <tr class="separator:a229628c08bb7d0fa16589dbf83d635d1 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad1cfa169df1cfa5ef798b57d2619d742 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad1cfa169df1cfa5ef798b57d2619d742"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectCtrl</b></td></tr>
-<tr class="separator:ad1cfa169df1cfa5ef798b57d2619d742 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a467e202bbd0fa3ef1997fa2b322e349d inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a467e202bbd0fa3ef1997fa2b322e349d"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectGrid</b></td></tr>
-<tr class="separator:a467e202bbd0fa3ef1997fa2b322e349d inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afcee74e089f5a50659bb534db80532d9 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afcee74e089f5a50659bb534db80532d9"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectPlot</b></td></tr>
-<tr class="separator:afcee74e089f5a50659bb534db80532d9 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aef7e50cc8a27b9434d17d7d8c245606c inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aef7e50cc8a27b9434d17d7d8c245606c"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rCtrlPrev</b></td></tr>
+<tr class="separator:aef7e50cc8a27b9434d17d7d8c245606c inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2c10cfe6bcd979613cec037a71ba2c94 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2c10cfe6bcd979613cec037a71ba2c94"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rCtrl</b></td></tr>
+<tr class="separator:a2c10cfe6bcd979613cec037a71ba2c94 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae8d79eab28220ea1fa8ffcbfd70bc84a inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae8d79eab28220ea1fa8ffcbfd70bc84a"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rGrid</b></td></tr>
+<tr class="separator:ae8d79eab28220ea1fa8ffcbfd70bc84a inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa4d6249f2f09d03682b8fa704be04548 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa4d6249f2f09d03682b8fa704be04548"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rPlot</b></td></tr>
+<tr class="separator:aa4d6249f2f09d03682b8fa704be04548 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad28637582a93843082fc7b1d8d80c807 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad28637582a93843082fc7b1d8d80c807"></a>
 <a class="el" href="class_main_frame.html">MainFrame</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>m_pTopFrame</b></td></tr>
 <tr class="separator:ad28637582a93843082fc7b1d8d80c807 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -258,7 +258,7 @@ wxNativePixelData *&#160;</td><td class="memItemRight" valign="bottom"><b>m_pBmp
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_scatter-members.html b/fdmdv2/fdmdv2-doc/html/class_plot_scatter-members.html
index dba8d501082f233f4ec373a004d9e37e2ac30890..a9f7b4b397f3ac61752b7e28b6ba0eec10495ab7 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_plot_scatter-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_plot_scatter-members.html
@@ -53,13 +53,13 @@
 <table class="directory">
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>add_new_samples</b>(COMP samples[]) (defined in <a class="el" href="class_plot_scatter.html">PlotScatter</a>)</td><td class="entry"><a class="el" href="class_plot_scatter.html">PlotScatter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>draw</b>(wxAutoBufferedPaintDC &amp;dc) (defined in <a class="el" href="class_plot_scatter.html">PlotScatter</a>)</td><td class="entry"><a class="el" href="class_plot_scatter.html">PlotScatter</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>drawGraticule</b>(wxAutoBufferedPaintDC &amp;dc) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>drawGraticule</b>(wxAutoBufferedPaintDC &amp;pdc) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>GetLabelSize</b>() (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>GetZoomFactor</b>(double zf) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_bmp</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_Bufsz</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_clip</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_h</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_firstPass</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_label_size</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_left</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_mem</b> (defined in <a class="el" href="class_plot_scatter.html">PlotScatter</a>)</td><td class="entry"><a class="el" href="class_plot_scatter.html">PlotScatter</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -76,13 +76,13 @@
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_prev_x</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_prev_y</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_pTopFrame</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rectCtrl</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rectGrid</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rectPlot</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rubberBand</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_top</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_use_bitmap</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_w</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rCtrl</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rCtrlPrev</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rGrid</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rPlot</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rubberBand</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_top</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_use_bitmap</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_x</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_y</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_zoomFactor</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -105,7 +105,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_scatter.html b/fdmdv2/fdmdv2-doc/html/class_plot_scatter.html
index 0823b3df2d41ccccca5bea2425aea6d3ea62e215..e0874b4a964b298382be63b602a5a56434f4fbb8 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_plot_scatter.html
+++ b/fdmdv2/fdmdv2-doc/html/class_plot_scatter.html
@@ -104,9 +104,9 @@ void&#160;</td><td class="memItemRight" valign="bottom"><b>OnPaint</b> (wxPaintE
 <tr class="memitem:a042c9df2ebe0c245d9fb5f3aa63595bc inherit pub_methods_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a042c9df2ebe0c245d9fb5f3aa63595bc"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>paintEvent</b> (wxPaintEvent &amp;evt)</td></tr>
 <tr class="separator:a042c9df2ebe0c245d9fb5f3aa63595bc inherit pub_methods_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ac9a8cc0d4ab016dc22195b813643c675 inherit pub_methods_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac9a8cc0d4ab016dc22195b813643c675"></a>
-virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>drawGraticule</b> (wxAutoBufferedPaintDC &amp;dc)</td></tr>
-<tr class="separator:ac9a8cc0d4ab016dc22195b813643c675 inherit pub_methods_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a5444b418c756380e5e08f86a34615be3 inherit pub_methods_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5444b418c756380e5e08f86a34615be3"></a>
+virtual void&#160;</td><td class="memItemRight" valign="bottom"><b>drawGraticule</b> (wxAutoBufferedPaintDC &amp;pdc)</td></tr>
+<tr class="separator:a5444b418c756380e5e08f86a34615be3 inherit pub_methods_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a8e8722d1f4c02f166f7acd6905ea4009 inherit pub_methods_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8e8722d1f4c02f166f7acd6905ea4009"></a>
 virtual double&#160;</td><td class="memItemRight" valign="bottom"><b>SetZoomFactor</b> (double zf)</td></tr>
 <tr class="separator:a8e8722d1f4c02f166f7acd6905ea4009 inherit pub_methods_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -153,12 +153,6 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>m_x</b></td></tr>
 <tr class="memitem:a822981fef8ff50da327b3dbca9fd2777 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a822981fef8ff50da327b3dbca9fd2777"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>m_y</b></td></tr>
 <tr class="separator:a822981fef8ff50da327b3dbca9fd2777 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae78b6e7fc3e44bea81809813d753125c inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae78b6e7fc3e44bea81809813d753125c"></a>
-int&#160;</td><td class="memItemRight" valign="bottom"><b>m_w</b></td></tr>
-<tr class="separator:ae78b6e7fc3e44bea81809813d753125c inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:adcc3cec53897df2c9e99a980938092c1 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adcc3cec53897df2c9e99a980938092c1"></a>
-int&#160;</td><td class="memItemRight" valign="bottom"><b>m_h</b></td></tr>
-<tr class="separator:adcc3cec53897df2c9e99a980938092c1 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab41676a2e46c2e801bc639c274a7d5f5 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab41676a2e46c2e801bc639c274a7d5f5"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>m_left</b></td></tr>
 <tr class="separator:ab41676a2e46c2e801bc639c274a7d5f5 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -189,6 +183,9 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_rubberBand</b></td>
 <tr class="memitem:acebe9485868374626f03516e3508b592 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="acebe9485868374626f03516e3508b592"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_mouseDown</b></td></tr>
 <tr class="separator:acebe9485868374626f03516e3508b592 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a1bb0714da68ee75a51a4ebb9e9ea3cad inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1bb0714da68ee75a51a4ebb9e9ea3cad"></a>
+bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_firstPass</b></td></tr>
+<tr class="separator:a1bb0714da68ee75a51a4ebb9e9ea3cad inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ae2f4907a8e4ed958ef4995e99b1f7148 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae2f4907a8e4ed958ef4995e99b1f7148"></a>
 double&#160;</td><td class="memItemRight" valign="bottom"><b>m_zoomFactor</b></td></tr>
 <tr class="separator:ae2f4907a8e4ed958ef4995e99b1f7148 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -205,15 +202,18 @@ wxPen&#160;</td><td class="memItemRight" valign="bottom"><b>m_penDotDash</b></td
 <tr class="memitem:a229628c08bb7d0fa16589dbf83d635d1 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a229628c08bb7d0fa16589dbf83d635d1"></a>
 wxPen&#160;</td><td class="memItemRight" valign="bottom"><b>m_penSolid</b></td></tr>
 <tr class="separator:a229628c08bb7d0fa16589dbf83d635d1 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad1cfa169df1cfa5ef798b57d2619d742 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad1cfa169df1cfa5ef798b57d2619d742"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectCtrl</b></td></tr>
-<tr class="separator:ad1cfa169df1cfa5ef798b57d2619d742 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a467e202bbd0fa3ef1997fa2b322e349d inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a467e202bbd0fa3ef1997fa2b322e349d"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectGrid</b></td></tr>
-<tr class="separator:a467e202bbd0fa3ef1997fa2b322e349d inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afcee74e089f5a50659bb534db80532d9 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afcee74e089f5a50659bb534db80532d9"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectPlot</b></td></tr>
-<tr class="separator:afcee74e089f5a50659bb534db80532d9 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aef7e50cc8a27b9434d17d7d8c245606c inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aef7e50cc8a27b9434d17d7d8c245606c"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rCtrlPrev</b></td></tr>
+<tr class="separator:aef7e50cc8a27b9434d17d7d8c245606c inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2c10cfe6bcd979613cec037a71ba2c94 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2c10cfe6bcd979613cec037a71ba2c94"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rCtrl</b></td></tr>
+<tr class="separator:a2c10cfe6bcd979613cec037a71ba2c94 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae8d79eab28220ea1fa8ffcbfd70bc84a inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae8d79eab28220ea1fa8ffcbfd70bc84a"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rGrid</b></td></tr>
+<tr class="separator:ae8d79eab28220ea1fa8ffcbfd70bc84a inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa4d6249f2f09d03682b8fa704be04548 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa4d6249f2f09d03682b8fa704be04548"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rPlot</b></td></tr>
+<tr class="separator:aa4d6249f2f09d03682b8fa704be04548 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad28637582a93843082fc7b1d8d80c807 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad28637582a93843082fc7b1d8d80c807"></a>
 <a class="el" href="class_main_frame.html">MainFrame</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>m_pTopFrame</b></td></tr>
 <tr class="separator:ad28637582a93843082fc7b1d8d80c807 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -243,7 +243,7 @@ wxNativePixelData *&#160;</td><td class="memItemRight" valign="bottom"><b>m_pBmp
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_spectrum-members.html b/fdmdv2/fdmdv2-doc/html/class_plot_spectrum-members.html
index 2ff56229af549565b984ce6705e0ba46e096d629..bdb32a6cfea0c1a05be5e24a718b50c79f3d9951 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_plot_spectrum-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_plot_spectrum-members.html
@@ -58,7 +58,7 @@
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_bmp</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_Bufsz</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_clip</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_h</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_firstPass</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_label_size</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_left</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_mouseDown</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -73,13 +73,13 @@
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_prev_x</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_prev_y</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_pTopFrame</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rectCtrl</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rectGrid</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rectPlot</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rubberBand</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_top</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_use_bitmap</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_w</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rCtrl</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rCtrlPrev</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rGrid</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rPlot</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rubberBand</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_top</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_use_bitmap</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_x</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_y</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_zoomFactor</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -102,7 +102,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_spectrum.html b/fdmdv2/fdmdv2-doc/html/class_plot_spectrum.html
index dd7b1e477d0f24abba5b2270d7f4b33f60d29a40..6c53f00f310cea1fa47b817a4bfede568d00ce0d 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_plot_spectrum.html
+++ b/fdmdv2/fdmdv2-doc/html/class_plot_spectrum.html
@@ -146,15 +146,18 @@ wxPen&#160;</td><td class="memItemRight" valign="bottom"><b>m_penDotDash</b></td
 <tr class="memitem:a229628c08bb7d0fa16589dbf83d635d1 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a229628c08bb7d0fa16589dbf83d635d1"></a>
 wxPen&#160;</td><td class="memItemRight" valign="bottom"><b>m_penSolid</b></td></tr>
 <tr class="separator:a229628c08bb7d0fa16589dbf83d635d1 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad1cfa169df1cfa5ef798b57d2619d742 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad1cfa169df1cfa5ef798b57d2619d742"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectCtrl</b></td></tr>
-<tr class="separator:ad1cfa169df1cfa5ef798b57d2619d742 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a467e202bbd0fa3ef1997fa2b322e349d inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a467e202bbd0fa3ef1997fa2b322e349d"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectGrid</b></td></tr>
-<tr class="separator:a467e202bbd0fa3ef1997fa2b322e349d inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afcee74e089f5a50659bb534db80532d9 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afcee74e089f5a50659bb534db80532d9"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectPlot</b></td></tr>
-<tr class="separator:afcee74e089f5a50659bb534db80532d9 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aef7e50cc8a27b9434d17d7d8c245606c inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aef7e50cc8a27b9434d17d7d8c245606c"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rCtrlPrev</b></td></tr>
+<tr class="separator:aef7e50cc8a27b9434d17d7d8c245606c inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2c10cfe6bcd979613cec037a71ba2c94 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2c10cfe6bcd979613cec037a71ba2c94"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rCtrl</b></td></tr>
+<tr class="separator:a2c10cfe6bcd979613cec037a71ba2c94 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae8d79eab28220ea1fa8ffcbfd70bc84a inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae8d79eab28220ea1fa8ffcbfd70bc84a"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rGrid</b></td></tr>
+<tr class="separator:ae8d79eab28220ea1fa8ffcbfd70bc84a inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa4d6249f2f09d03682b8fa704be04548 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa4d6249f2f09d03682b8fa704be04548"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rPlot</b></td></tr>
+<tr class="separator:aa4d6249f2f09d03682b8fa704be04548 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad28637582a93843082fc7b1d8d80c807 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad28637582a93843082fc7b1d8d80c807"></a>
 <a class="el" href="class_main_frame.html">MainFrame</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>m_pTopFrame</b></td></tr>
 <tr class="separator:ad28637582a93843082fc7b1d8d80c807 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -183,12 +186,6 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>m_x</b></td></tr>
 <tr class="memitem:a822981fef8ff50da327b3dbca9fd2777 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a822981fef8ff50da327b3dbca9fd2777"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>m_y</b></td></tr>
 <tr class="separator:a822981fef8ff50da327b3dbca9fd2777 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae78b6e7fc3e44bea81809813d753125c inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae78b6e7fc3e44bea81809813d753125c"></a>
-int&#160;</td><td class="memItemRight" valign="bottom"><b>m_w</b></td></tr>
-<tr class="separator:ae78b6e7fc3e44bea81809813d753125c inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:adcc3cec53897df2c9e99a980938092c1 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adcc3cec53897df2c9e99a980938092c1"></a>
-int&#160;</td><td class="memItemRight" valign="bottom"><b>m_h</b></td></tr>
-<tr class="separator:adcc3cec53897df2c9e99a980938092c1 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab41676a2e46c2e801bc639c274a7d5f5 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab41676a2e46c2e801bc639c274a7d5f5"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>m_left</b></td></tr>
 <tr class="separator:ab41676a2e46c2e801bc639c274a7d5f5 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -219,6 +216,9 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_rubberBand</b></td>
 <tr class="memitem:acebe9485868374626f03516e3508b592 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="acebe9485868374626f03516e3508b592"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_mouseDown</b></td></tr>
 <tr class="separator:acebe9485868374626f03516e3508b592 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a1bb0714da68ee75a51a4ebb9e9ea3cad inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1bb0714da68ee75a51a4ebb9e9ea3cad"></a>
+bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_firstPass</b></td></tr>
+<tr class="separator:a1bb0714da68ee75a51a4ebb9e9ea3cad inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ae2f4907a8e4ed958ef4995e99b1f7148 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae2f4907a8e4ed958ef4995e99b1f7148"></a>
 double&#160;</td><td class="memItemRight" valign="bottom"><b>m_zoomFactor</b></td></tr>
 <tr class="separator:ae2f4907a8e4ed958ef4995e99b1f7148 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -230,7 +230,7 @@ double&#160;</td><td class="memItemRight" valign="bottom"><b>m_zoomFactor</b></t
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_waterfall-members.html b/fdmdv2/fdmdv2-doc/html/class_plot_waterfall-members.html
index 348db6eaf47818a507d4dc40044f6b56c67a03e4..4dd34e082bf774bb96e7176db89d34734cbd8918 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_plot_waterfall-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_plot_waterfall-members.html
@@ -51,7 +51,7 @@
 
 <p>This is the complete list of members for <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>, including all inherited members.</p>
 <table class="directory">
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>draw</b>(wxAutoBufferedPaintDC &amp;dc) (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>draw</b>(wxAutoBufferedPaintDC &amp;pdc) (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>drawGraticule</b>(wxAutoBufferedPaintDC &amp;dc) (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>GetLabelSize</b>() (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>GetZoomFactor</b>(double zf) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
@@ -59,11 +59,13 @@
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_bmp</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_Bufsz</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_clip</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_greyscale</b> (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_h</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_firstPass</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_greyscale</b> (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_heatmap_lut</b> (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_label_size</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_left</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_line_color</b> (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_mDC</b> (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_mouseDown</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_newdata</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_pBmp</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
@@ -76,13 +78,13 @@
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_prev_x</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_prev_y</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_pTopFrame</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rectCtrl</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rectGrid</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rectPlot</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rubberBand</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_top</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_use_bitmap</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_w</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rCtrl</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rCtrlPrev</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rGrid</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_rPlot</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_rubberBand</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_top</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_use_bitmap</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_x</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>m_y</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_zoomFactor</b> (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -94,20 +96,19 @@
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnMouseWheelMoved</b>(wxMouseEvent &amp;event) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>OnPaint</b>(wxPaintEvent &amp;evt) (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>OnShow</b>(wxShowEvent &amp;event) (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnSize</b>(wxSizeEvent &amp;event) (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>OnSize</b>(wxSizeEvent &amp;event) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>paintEvent</b>(wxPaintEvent &amp;evt) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>plotData</b>(wxAutoBufferedPaintDC &amp;dc) (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>PlotPanel</b>(wxFrame *parent) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>plotPixelData</b>(wxAutoBufferedPaintDC &amp;dc) (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>PlotWaterfall</b>(wxFrame *parent) (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>SetLabelSize</b>(double size) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>SetZoomFactor</b>(double zf) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>~PlotPanel</b>() (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>~PlotWaterfall</b>() (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>PlotPanel</b>(wxFrame *parent) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>plotPixelData</b>(wxAutoBufferedPaintDC &amp;dc) (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>PlotWaterfall</b>(wxFrame *parent) (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>SetLabelSize</b>(double size) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>SetZoomFactor</b>(double zf) (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>~PlotPanel</b>() (defined in <a class="el" href="class_plot_panel.html">PlotPanel</a>)</td><td class="entry"><a class="el" href="class_plot_panel.html">PlotPanel</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>~PlotWaterfall</b>() (defined in <a class="el" href="class_plot_waterfall.html">PlotWaterfall</a>)</td><td class="entry"><a class="el" href="class_plot_waterfall.html">PlotWaterfall</a></td><td class="entry"></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_waterfall.html b/fdmdv2/fdmdv2-doc/html/class_plot_waterfall.html
index ab03fd08e59c3ed106d396b5f004f0f024891841..37493c45e16b0afb6645784ef85298421d5e2bec 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_plot_waterfall.html
+++ b/fdmdv2/fdmdv2-doc/html/class_plot_waterfall.html
@@ -125,21 +125,15 @@ unsigned&#160;</td><td class="memItemRight" valign="bottom"><b>heatmap</b> (floa
 <tr class="memitem:a37d541349ac6f010a90fee3b9f32fbbb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a37d541349ac6f010a90fee3b9f32fbbb"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>OnPaint</b> (wxPaintEvent &amp;evt)</td></tr>
 <tr class="separator:a37d541349ac6f010a90fee3b9f32fbbb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:adae15df2acf8dd7a1812ea79b2708b65"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adae15df2acf8dd7a1812ea79b2708b65"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>OnSize</b> (wxSizeEvent &amp;event)</td></tr>
-<tr class="separator:adae15df2acf8dd7a1812ea79b2708b65"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad55e0e3078f0d5c3699df36ba6d8ab5d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad55e0e3078f0d5c3699df36ba6d8ab5d"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>OnShow</b> (wxShowEvent &amp;event)</td></tr>
 <tr class="separator:ad55e0e3078f0d5c3699df36ba6d8ab5d"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aa97d243b7bb91238b7493dcb96139803"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa97d243b7bb91238b7493dcb96139803"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>drawGraticule</b> (wxAutoBufferedPaintDC &amp;dc)</td></tr>
 <tr class="separator:aa97d243b7bb91238b7493dcb96139803"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a3956d17d4ece2c0ca4d50b6f7002b24c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3956d17d4ece2c0ca4d50b6f7002b24c"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>draw</b> (wxAutoBufferedPaintDC &amp;dc)</td></tr>
-<tr class="separator:a3956d17d4ece2c0ca4d50b6f7002b24c"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae19ead564f66f723b7192dbb2bd5815b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae19ead564f66f723b7192dbb2bd5815b"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>plotData</b> (wxAutoBufferedPaintDC &amp;dc)</td></tr>
-<tr class="separator:ae19ead564f66f723b7192dbb2bd5815b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a86c6b3a9dc720b681f7b4e47d1fe193d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a86c6b3a9dc720b681f7b4e47d1fe193d"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><b>draw</b> (wxAutoBufferedPaintDC &amp;pdc)</td></tr>
+<tr class="separator:a86c6b3a9dc720b681f7b4e47d1fe193d"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aec560c10f32a6c6e92a62225288c28f3"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aec560c10f32a6c6e92a62225288c28f3"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>plotPixelData</b> (wxAutoBufferedPaintDC &amp;dc)</td></tr>
 <tr class="separator:aec560c10f32a6c6e92a62225288c28f3"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -152,6 +146,12 @@ unsigned&#160;</td><td class="memItemRight" valign="bottom"><b>m_heatmap_lut</b>
 <tr class="memitem:a1cb3639849f17b1882b2b3713fd690cf"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1cb3639849f17b1882b2b3713fd690cf"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>m_greyscale</b></td></tr>
 <tr class="separator:a1cb3639849f17b1882b2b3713fd690cf"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a1b80aa40a1194ece27c87ec265ef7d2c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1b80aa40a1194ece27c87ec265ef7d2c"></a>
+wxMemoryDC&#160;</td><td class="memItemRight" valign="bottom"><b>m_mDC</b></td></tr>
+<tr class="separator:a1b80aa40a1194ece27c87ec265ef7d2c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa0b8f5bb510697a7eb8f48628a39b9c7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa0b8f5bb510697a7eb8f48628a39b9c7"></a>
+int&#160;</td><td class="memItemRight" valign="bottom"><b>m_line_color</b></td></tr>
+<tr class="separator:aa0b8f5bb510697a7eb8f48628a39b9c7"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pro_attribs_class_plot_panel"><td colspan="2" onclick="javascript:toggleInherit('pro_attribs_class_plot_panel')"><img src="closed.png" alt="-"/>&#160;Protected Attributes inherited from <a class="el" href="class_plot_panel.html">PlotPanel</a></td></tr>
 <tr class="memitem:abd0a64bd20aec2e300e383abfd60315d inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abd0a64bd20aec2e300e383abfd60315d"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>m_x</b></td></tr>
@@ -159,12 +159,6 @@ int&#160;</td><td class="memItemRight" valign="bottom"><b>m_x</b></td></tr>
 <tr class="memitem:a822981fef8ff50da327b3dbca9fd2777 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a822981fef8ff50da327b3dbca9fd2777"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>m_y</b></td></tr>
 <tr class="separator:a822981fef8ff50da327b3dbca9fd2777 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae78b6e7fc3e44bea81809813d753125c inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae78b6e7fc3e44bea81809813d753125c"></a>
-int&#160;</td><td class="memItemRight" valign="bottom"><b>m_w</b></td></tr>
-<tr class="separator:ae78b6e7fc3e44bea81809813d753125c inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:adcc3cec53897df2c9e99a980938092c1 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adcc3cec53897df2c9e99a980938092c1"></a>
-int&#160;</td><td class="memItemRight" valign="bottom"><b>m_h</b></td></tr>
-<tr class="separator:adcc3cec53897df2c9e99a980938092c1 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab41676a2e46c2e801bc639c274a7d5f5 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab41676a2e46c2e801bc639c274a7d5f5"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>m_left</b></td></tr>
 <tr class="separator:ab41676a2e46c2e801bc639c274a7d5f5 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -195,6 +189,9 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_rubberBand</b></td>
 <tr class="memitem:acebe9485868374626f03516e3508b592 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="acebe9485868374626f03516e3508b592"></a>
 bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_mouseDown</b></td></tr>
 <tr class="separator:acebe9485868374626f03516e3508b592 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a1bb0714da68ee75a51a4ebb9e9ea3cad inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1bb0714da68ee75a51a4ebb9e9ea3cad"></a>
+bool&#160;</td><td class="memItemRight" valign="bottom"><b>m_firstPass</b></td></tr>
+<tr class="separator:a1bb0714da68ee75a51a4ebb9e9ea3cad inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ae2f4907a8e4ed958ef4995e99b1f7148 inherit pro_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae2f4907a8e4ed958ef4995e99b1f7148"></a>
 double&#160;</td><td class="memItemRight" valign="bottom"><b>m_zoomFactor</b></td></tr>
 <tr class="separator:ae2f4907a8e4ed958ef4995e99b1f7148 inherit pro_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -211,15 +208,18 @@ wxPen&#160;</td><td class="memItemRight" valign="bottom"><b>m_penDotDash</b></td
 <tr class="memitem:a229628c08bb7d0fa16589dbf83d635d1 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a229628c08bb7d0fa16589dbf83d635d1"></a>
 wxPen&#160;</td><td class="memItemRight" valign="bottom"><b>m_penSolid</b></td></tr>
 <tr class="separator:a229628c08bb7d0fa16589dbf83d635d1 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad1cfa169df1cfa5ef798b57d2619d742 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad1cfa169df1cfa5ef798b57d2619d742"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectCtrl</b></td></tr>
-<tr class="separator:ad1cfa169df1cfa5ef798b57d2619d742 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a467e202bbd0fa3ef1997fa2b322e349d inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a467e202bbd0fa3ef1997fa2b322e349d"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectGrid</b></td></tr>
-<tr class="separator:a467e202bbd0fa3ef1997fa2b322e349d inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:afcee74e089f5a50659bb534db80532d9 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afcee74e089f5a50659bb534db80532d9"></a>
-wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rectPlot</b></td></tr>
-<tr class="separator:afcee74e089f5a50659bb534db80532d9 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aef7e50cc8a27b9434d17d7d8c245606c inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aef7e50cc8a27b9434d17d7d8c245606c"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rCtrlPrev</b></td></tr>
+<tr class="separator:aef7e50cc8a27b9434d17d7d8c245606c inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2c10cfe6bcd979613cec037a71ba2c94 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2c10cfe6bcd979613cec037a71ba2c94"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rCtrl</b></td></tr>
+<tr class="separator:a2c10cfe6bcd979613cec037a71ba2c94 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae8d79eab28220ea1fa8ffcbfd70bc84a inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae8d79eab28220ea1fa8ffcbfd70bc84a"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rGrid</b></td></tr>
+<tr class="separator:ae8d79eab28220ea1fa8ffcbfd70bc84a inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:aa4d6249f2f09d03682b8fa704be04548 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa4d6249f2f09d03682b8fa704be04548"></a>
+wxRect&#160;</td><td class="memItemRight" valign="bottom"><b>m_rPlot</b></td></tr>
+<tr class="separator:aa4d6249f2f09d03682b8fa704be04548 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad28637582a93843082fc7b1d8d80c807 inherit pub_attribs_class_plot_panel"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad28637582a93843082fc7b1d8d80c807"></a>
 <a class="el" href="class_main_frame.html">MainFrame</a> *&#160;</td><td class="memItemRight" valign="bottom"><b>m_pTopFrame</b></td></tr>
 <tr class="separator:ad28637582a93843082fc7b1d8d80c807 inherit pub_attribs_class_plot_panel"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -249,7 +249,7 @@ wxNativePixelData *&#160;</td><td class="memItemRight" valign="bottom"><b>m_pBmp
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_port_audio_wrap-members.html b/fdmdv2/fdmdv2-doc/html/class_port_audio_wrap-members.html
index 1cee9fdc74f6da399c77ca69add530041b07a85b..1472fcc1d486b0f781a3cd970d565fb1c93bc31d 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_port_audio_wrap-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_port_audio_wrap-members.html
@@ -53,30 +53,30 @@
 <table class="directory">
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>abort</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>averageData</b>(float mag_dB[]) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getDefaultInputDevice</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getDefaultOutputDevice</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getDeviceInfo</b>(PaDeviceIndex idx) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getDeviceName</b>(PaDeviceIndex dev) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getFdmdvState</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getFramesPerBuffer</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getInputBuffer</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getInputChannelCount</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getInputDefaultLowLatency</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getOutputBuffer</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getOutputChannelCount</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getOutputDefaultLowLatency</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getSamplerate</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getStatusFlags</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getStream</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getUserData</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>isActive</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>isOpen</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>isStopped</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>loadData</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>m_av_mag</b> (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>per_frame_rx_processing</b>(short output_buf[], int *n_output_buf, int codec_bits[], short input_buf[], int *n_input_buf, int *nin, int *state, struct CODEC2 *c2) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getDataAvail</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getDefaultInputDevice</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getDefaultOutputDevice</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getDeviceInfo</b>(PaDeviceIndex idx) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getDeviceName</b>(PaDeviceIndex dev) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getFdmdvState</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getFramesPerBuffer</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getInputBuffer</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getInputChannelCount</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getInputDefaultLowLatency</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getOutputBuffer</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getOutputChannelCount</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getOutputDefaultLowLatency</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getSamplerate</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getStatusFlags</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getStream</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>getUserData</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>isActive</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>isOpen</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>isStopped</b>() const  (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>loadData</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>m_av_mag</b> (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>PortAudioWrap</b>() (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>setCallback</b>(PaStreamCallback *streamCallback) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>setCallback</b>(PaStreamCallback *m_pStreamCallback) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>setFdmdvState</b>(FDMDV *fdmdv_state) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>setFramesPerBuffer</b>(unsigned long size) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>setInputBuffer</b>(const PaStreamParameters &amp;inputBuffer) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
@@ -93,12 +93,8 @@
   <tr bgcolor="#f0f0f0"><td class="entry"><b>setOutputLatency</b>(PaTime latency) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>setOutputSampleFormat</b>(PaSampleFormat format) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>setSampleRate</b>(unsigned long size) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>setSamplerate</b>(int samplerate) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>setStatusFlags</b>(const PaStreamCallbackFlags &amp;statusFlags) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>setStream</b>(PaStream *stream) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>setStreamCallback</b>(PaStream *stream, PaStreamCallback *callback) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
-  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>setStreamFinishedCallback</b>(PaStream *stream, PaStreamFinishedCallback *streamFinishedCallback) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>setStreamFinishedCallback</b>(PaStreamFinishedCallback *streamFinishedCallback) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>setStreamCallback</b>(PaStream *stream, PaStreamCallback *callback) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>setStreamFinishedCallback</b>(PaStream *stream, PaStreamFinishedCallback *m_pStreamFinishedCallback) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>setStreamFlags</b>(PaStreamFlags flags) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>setTimeInfo</b>(PaStreamCallbackTimeInfo *timeInfo) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr bgcolor="#f0f0f0"class="even"><td class="entry"><b>setUserData</b>(void *userData) (defined in <a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a>)</td><td class="entry"><a class="el" href="class_port_audio_wrap.html">PortAudioWrap</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
@@ -111,7 +107,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_port_audio_wrap.html b/fdmdv2/fdmdv2-doc/html/class_port_audio_wrap.html
index 43ec5bd044ea8e7105d50095e2d7850ebb64f59d..4d22d486db0d96ca4da9ff197090ae488b6a2671 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_port_audio_wrap.html
+++ b/fdmdv2/fdmdv2-doc/html/class_port_audio_wrap.html
@@ -55,9 +55,9 @@
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:a4af13f96f4f8639148668c89942b3365"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4af13f96f4f8639148668c89942b3365"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>per_frame_rx_processing</b> (short output_buf[], int *n_output_buf, int codec_bits[], short input_buf[], int *n_input_buf, int *nin, int *state, struct CODEC2 *c2)</td></tr>
-<tr class="separator:a4af13f96f4f8639148668c89942b3365"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a987405b6ca5fbecb33ac69ddfe843659"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a987405b6ca5fbecb33ac69ddfe843659"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><b>averageData</b> (float mag_dB[])</td></tr>
+<tr class="separator:a987405b6ca5fbecb33ac69ddfe843659"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a2a122bf5de62e7f1fb1bfed6801e063c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2a122bf5de62e7f1fb1bfed6801e063c"></a>
 PaDeviceIndex&#160;</td><td class="memItemRight" valign="bottom"><b>getDefaultInputDevice</b> ()</td></tr>
 <tr class="separator:a2a122bf5de62e7f1fb1bfed6801e063c"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -76,18 +76,18 @@ PaError&#160;</td><td class="memItemRight" valign="bottom"><b>setSampleRate</b>
 <tr class="memitem:a47fe0dd437c0a4693824966e7100255a"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a47fe0dd437c0a4693824966e7100255a"></a>
 PaError&#160;</td><td class="memItemRight" valign="bottom"><b>setStreamFlags</b> (PaStreamFlags flags)</td></tr>
 <tr class="separator:a47fe0dd437c0a4693824966e7100255a"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a7b455cc4397b90c6d381c26073e51b2a"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7b455cc4397b90c6d381c26073e51b2a"></a>
-PaError&#160;</td><td class="memItemRight" valign="bottom"><b>setCallback</b> (PaStreamCallback *streamCallback)</td></tr>
-<tr class="separator:a7b455cc4397b90c6d381c26073e51b2a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2a40702f7b56abb4b6927fb6493db92e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2a40702f7b56abb4b6927fb6493db92e"></a>
+PaError&#160;</td><td class="memItemRight" valign="bottom"><b>setCallback</b> (PaStreamCallback *m_pStreamCallback)</td></tr>
+<tr class="separator:a2a40702f7b56abb4b6927fb6493db92e"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:adf02f262bcd9f85c33fea7da0e4cd841"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adf02f262bcd9f85c33fea7da0e4cd841"></a>
 PaError&#160;</td><td class="memItemRight" valign="bottom"><b>setStreamCallback</b> (PaStream *stream, PaStreamCallback *callback)</td></tr>
 <tr class="separator:adf02f262bcd9f85c33fea7da0e4cd841"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a163f9ff1095444793a25f1e90442b32c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a163f9ff1095444793a25f1e90442b32c"></a>
-PaError&#160;</td><td class="memItemRight" valign="bottom"><b>setStreamFinishedCallback</b> (PaStream *stream, PaStreamFinishedCallback *streamFinishedCallback)</td></tr>
-<tr class="separator:a163f9ff1095444793a25f1e90442b32c"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ae9fa5c4e8bd989d3ff722c76a381f33f"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae9fa5c4e8bd989d3ff722c76a381f33f"></a>
-PaError&#160;</td><td class="memItemRight" valign="bottom"><b>streamOpen</b> ()</td></tr>
-<tr class="separator:ae9fa5c4e8bd989d3ff722c76a381f33f"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a85e2c0e5700cacd09a330cd6573cff7d"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a85e2c0e5700cacd09a330cd6573cff7d"></a>
+PaError&#160;</td><td class="memItemRight" valign="bottom"><b>setStreamFinishedCallback</b> (PaStream *stream, PaStreamFinishedCallback *m_pStreamFinishedCallback)</td></tr>
+<tr class="separator:a85e2c0e5700cacd09a330cd6573cff7d"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a132273a300efd015cf3d66ee5b250216"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a132273a300efd015cf3d66ee5b250216"></a>
+void&#160;</td><td class="memItemRight" valign="bottom"><b>setInputBuffer</b> (const PaStreamParameters &amp;inputBuffer)</td></tr>
+<tr class="separator:a132273a300efd015cf3d66ee5b250216"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:abf1e9b6f6b6e09df0b926c7995963575"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abf1e9b6f6b6e09df0b926c7995963575"></a>
 PaError&#160;</td><td class="memItemRight" valign="bottom"><b>setInputDevice</b> (PaDeviceIndex dev)</td></tr>
 <tr class="separator:abf1e9b6f6b6e09df0b926c7995963575"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -130,51 +130,24 @@ PaError&#160;</td><td class="memItemRight" valign="bottom"><b>setOutputSampleFor
 <tr class="memitem:a619ad8a126e30b328468a57c8047f2f8"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a619ad8a126e30b328468a57c8047f2f8"></a>
 PaError&#160;</td><td class="memItemRight" valign="bottom"><b>setOutputLatency</b> (PaTime latency)</td></tr>
 <tr class="separator:a619ad8a126e30b328468a57c8047f2f8"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a879e58affa1895a9fd737b44e72b609e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a879e58affa1895a9fd737b44e72b609e"></a>
-PaError&#160;</td><td class="memItemRight" valign="bottom"><b>streamStart</b> ()</td></tr>
-<tr class="separator:a879e58affa1895a9fd737b44e72b609e"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a7f900dbb4003a1e01341e4f9f95c72e8"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7f900dbb4003a1e01341e4f9f95c72e8"></a>
-PaError&#160;</td><td class="memItemRight" valign="bottom"><b>streamClose</b> ()</td></tr>
-<tr class="separator:a7f900dbb4003a1e01341e4f9f95c72e8"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab7d9fc6cda5c61cda105e6d9bba9215c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab7d9fc6cda5c61cda105e6d9bba9215c"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>setOutputHostApiStreamInfo</b> (void *info=NULL)</td></tr>
 <tr class="separator:ab7d9fc6cda5c61cda105e6d9bba9215c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a1014d8750069b7dc914e6f836da79660"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1014d8750069b7dc914e6f836da79660"></a>
 PaTime&#160;</td><td class="memItemRight" valign="bottom"><b>getOutputDefaultLowLatency</b> ()</td></tr>
 <tr class="separator:a1014d8750069b7dc914e6f836da79660"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a987405b6ca5fbecb33ac69ddfe843659"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a987405b6ca5fbecb33ac69ddfe843659"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>averageData</b> (float mag_dB[])</td></tr>
-<tr class="separator:a987405b6ca5fbecb33ac69ddfe843659"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a65d6263d05a44f6696a3eb93a669e862"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a65d6263d05a44f6696a3eb93a669e862"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>setFdmdvState</b> (FDMDV *fdmdv_state)</td></tr>
 <tr class="separator:a65d6263d05a44f6696a3eb93a669e862"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a132273a300efd015cf3d66ee5b250216"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a132273a300efd015cf3d66ee5b250216"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>setInputBuffer</b> (const PaStreamParameters &amp;inputBuffer)</td></tr>
-<tr class="separator:a132273a300efd015cf3d66ee5b250216"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a2284b3598963428bd5970b69a2ec0370"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2284b3598963428bd5970b69a2ec0370"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>setOutputBuffer</b> (const PaStreamParameters &amp;outputBuffer)</td></tr>
 <tr class="separator:a2284b3598963428bd5970b69a2ec0370"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a20f5cf508b5e13bd29632acb1af52d26"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a20f5cf508b5e13bd29632acb1af52d26"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>setSamplerate</b> (int samplerate)</td></tr>
-<tr class="separator:a20f5cf508b5e13bd29632acb1af52d26"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ad2c8ee53c0f11504777d1dc41747b453"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad2c8ee53c0f11504777d1dc41747b453"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>setStatusFlags</b> (const PaStreamCallbackFlags &amp;statusFlags)</td></tr>
-<tr class="separator:ad2c8ee53c0f11504777d1dc41747b453"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a8f18f16ddf796eba036e11694b25a2a4"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8f18f16ddf796eba036e11694b25a2a4"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>setStream</b> (PaStream *stream)</td></tr>
-<tr class="separator:a8f18f16ddf796eba036e11694b25a2a4"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a13581d19c503fc1a837078c31d80df11"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a13581d19c503fc1a837078c31d80df11"></a>
-void&#160;</td><td class="memItemRight" valign="bottom"><b>setStreamFinishedCallback</b> (PaStreamFinishedCallback *streamFinishedCallback)</td></tr>
-<tr class="separator:a13581d19c503fc1a837078c31d80df11"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a4d2bb7132714099aa2a0390f11a57ce6"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4d2bb7132714099aa2a0390f11a57ce6"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>setTimeInfo</b> (PaStreamCallbackTimeInfo *timeInfo)</td></tr>
 <tr class="separator:a4d2bb7132714099aa2a0390f11a57ce6"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a2bac5a36a40fd1f86df5c1f94e964ac4"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2bac5a36a40fd1f86df5c1f94e964ac4"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>setUserData</b> (void *userData)</td></tr>
 <tr class="separator:a2bac5a36a40fd1f86df5c1f94e964ac4"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a66693a413ee2158cc331253a1035f915"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a66693a413ee2158cc331253a1035f915"></a>
-FDMDV *&#160;</td><td class="memItemRight" valign="bottom"><b>getFdmdvState</b> ()</td></tr>
-<tr class="separator:a66693a413ee2158cc331253a1035f915"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ad2ea7c12d674b8bf882a5a5ffdff7acb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad2ea7c12d674b8bf882a5a5ffdff7acb"></a>
 unsigned long&#160;</td><td class="memItemRight" valign="bottom"><b>getFramesPerBuffer</b> () const </td></tr>
 <tr class="separator:ad2ea7c12d674b8bf882a5a5ffdff7acb"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -184,18 +157,33 @@ const PaStreamParameters &amp;&#160;</td><td class="memItemRight" valign="bottom
 <tr class="memitem:abb0273b674c970ee96594dd61f7abfc9"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abb0273b674c970ee96594dd61f7abfc9"></a>
 const PaStreamParameters &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>getOutputBuffer</b> () const </td></tr>
 <tr class="separator:abb0273b674c970ee96594dd61f7abfc9"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a2007046aefb3754994b3fe883b237177"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2007046aefb3754994b3fe883b237177"></a>
-int&#160;</td><td class="memItemRight" valign="bottom"><b>getSamplerate</b> () const </td></tr>
-<tr class="separator:a2007046aefb3754994b3fe883b237177"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a43a6d5f7562fde40166872b77a7804ea"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a43a6d5f7562fde40166872b77a7804ea"></a>
 const PaStreamCallbackFlags &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>getStatusFlags</b> () const </td></tr>
 <tr class="separator:a43a6d5f7562fde40166872b77a7804ea"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a66693a413ee2158cc331253a1035f915"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a66693a413ee2158cc331253a1035f915"></a>
+FDMDV *&#160;</td><td class="memItemRight" valign="bottom"><b>getFdmdvState</b> ()</td></tr>
+<tr class="separator:a66693a413ee2158cc331253a1035f915"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2007046aefb3754994b3fe883b237177"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2007046aefb3754994b3fe883b237177"></a>
+int&#160;</td><td class="memItemRight" valign="bottom"><b>getSamplerate</b> () const </td></tr>
+<tr class="separator:a2007046aefb3754994b3fe883b237177"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a33fed4f960c963aff711932ee84e9a1e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a33fed4f960c963aff711932ee84e9a1e"></a>
 PaStream *&#160;</td><td class="memItemRight" valign="bottom"><b>getStream</b> ()</td></tr>
 <tr class="separator:a33fed4f960c963aff711932ee84e9a1e"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a07fdd881924d8b7b31b0ed309a8d56cb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a07fdd881924d8b7b31b0ed309a8d56cb"></a>
 void *&#160;</td><td class="memItemRight" valign="bottom"><b>getUserData</b> ()</td></tr>
 <tr class="separator:a07fdd881924d8b7b31b0ed309a8d56cb"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:afd5fd9f501e93f712e46b0d805b57493"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afd5fd9f501e93f712e46b0d805b57493"></a>
+bool&#160;</td><td class="memItemRight" valign="bottom"><b>getDataAvail</b> ()</td></tr>
+<tr class="separator:afd5fd9f501e93f712e46b0d805b57493"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a879e58affa1895a9fd737b44e72b609e"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a879e58affa1895a9fd737b44e72b609e"></a>
+PaError&#160;</td><td class="memItemRight" valign="bottom"><b>streamStart</b> ()</td></tr>
+<tr class="separator:a879e58affa1895a9fd737b44e72b609e"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a7f900dbb4003a1e01341e4f9f95c72e8"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7f900dbb4003a1e01341e4f9f95c72e8"></a>
+PaError&#160;</td><td class="memItemRight" valign="bottom"><b>streamClose</b> ()</td></tr>
+<tr class="separator:a7f900dbb4003a1e01341e4f9f95c72e8"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae9fa5c4e8bd989d3ff722c76a381f33f"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae9fa5c4e8bd989d3ff722c76a381f33f"></a>
+PaError&#160;</td><td class="memItemRight" valign="bottom"><b>streamOpen</b> ()</td></tr>
+<tr class="separator:ae9fa5c4e8bd989d3ff722c76a381f33f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a73b644da1b76cd3c6b1900218fcb4873"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a73b644da1b76cd3c6b1900218fcb4873"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>terminate</b> ()</td></tr>
 <tr class="separator:a73b644da1b76cd3c6b1900218fcb4873"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -231,7 +219,7 @@ float&#160;</td><td class="memItemRight" valign="bottom"><b>m_av_mag</b> [FDMDV_
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_top_frame-members.html b/fdmdv2/fdmdv2-doc/html/class_top_frame-members.html
index 2249e4b639bff4f9656afc289af5fd544850e6f2..33b7a33ccfa7f71cbcbdfb66ab24b95c417894fd 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_top_frame-members.html
+++ b/fdmdv2/fdmdv2-doc/html/class_top_frame-members.html
@@ -117,7 +117,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/class_top_frame.html b/fdmdv2/fdmdv2-doc/html/class_top_frame.html
index beb89a02122bc6a4c2c7e884bd6c5f90519557a8..1bb0888874f94f0b68c70af91d1700908c5376e9 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/class_top_frame.html
+++ b/fdmdv2/fdmdv2-doc/html/class_top_frame.html
@@ -276,7 +276,7 @@ wxStatusBar *&#160;</td><td class="memItemRight" valign="bottom"><b>m_statusBar1
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/classes.html b/fdmdv2/fdmdv2-doc/html/classes.html
index e1f141740107a81ca277e0a76de6bbe43414b8bb..20be30cae3efaa77234419174428e5dcf937c65b 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/classes.html
+++ b/fdmdv2/fdmdv2-doc/html/classes.html
@@ -59,19 +59,18 @@
 <tr><td valign="top"><a class="el" href="class_about_dlg.html">AboutDlg</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_main_app.html">MainApp</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structpa_call_back_data.html">paCallBackData</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_T"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;T&#160;&#160;</div></td></tr></table>
 </td></tr>
 <tr><td valign="top"><a class="el" href="class_audio_dlg.html">AudioDlg</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_dlg_about.html">DlgAbout</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_main_frame.html">MainFrame</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_plot_panel.html">PlotPanel</a>&#160;&#160;&#160;</td></tr>
-<tr><td valign="top"><a class="el" href="class_audio_stream.html">AudioStream</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_dlg_audio.html">DlgAudio</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_O"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;O&#160;&#160;</div></td></tr></table>
-</td><td valign="top"><a class="el" href="class_plot_scalar.html">PlotScalar</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_top_frame.html">TopFrame</a>&#160;&#160;&#160;</td></tr>
 <tr><td rowspan="2" valign="bottom"><a name="letter_C"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;C&#160;&#160;</div></td></tr></table>
-</td><td valign="top"><a class="el" href="class_dlg_com_ports.html">DlgComPorts</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_plot_scatter.html">PlotScatter</a>&#160;&#160;&#160;</td><td></td></tr>
-<tr><td valign="top"><a class="el" href="class_dlg_options.html">DlgOptions</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_options_dlg.html">OptionsDlg</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_plot_spectrum.html">PlotSpectrum</a>&#160;&#160;&#160;</td><td></td></tr>
-<tr><td valign="top"><a class="el" href="struct_c_o_m_p.html">COMP</a>&#160;&#160;&#160;</td><td></td><td></td><td></td><td></td></tr>
+</td><td valign="top"><a class="el" href="class_dlg_audio.html">DlgAudio</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_O"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;O&#160;&#160;</div></td></tr></table>
+</td><td valign="top"><a class="el" href="class_plot_scalar.html">PlotScalar</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_top_frame.html">TopFrame</a>&#160;&#160;&#160;</td></tr>
+<tr><td valign="top"><a class="el" href="class_dlg_com_ports.html">DlgComPorts</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_plot_scatter.html">PlotScatter</a>&#160;&#160;&#160;</td><td></td></tr>
+<tr><td valign="top"><a class="el" href="struct_c_o_m_p.html">COMP</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_dlg_options.html">DlgOptions</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_options_dlg.html">OptionsDlg</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="class_plot_spectrum.html">PlotSpectrum</a>&#160;&#160;&#160;</td><td></td></tr>
 <tr><td></td><td></td><td></td><td></td><td></td></tr>
 </table>
 <div class="qindex"><a class="qindex" href="#letter_A">A</a>&#160;|&#160;<a class="qindex" href="#letter_C">C</a>&#160;|&#160;<a class="qindex" href="#letter_D">D</a>&#160;|&#160;<a class="qindex" href="#letter_M">M</a>&#160;|&#160;<a class="qindex" href="#letter_O">O</a>&#160;|&#160;<a class="qindex" href="#letter_P">P</a>&#160;|&#160;<a class="qindex" href="#letter_T">T</a></div>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/comp_8h_source.html b/fdmdv2/fdmdv2-doc/html/comp_8h_source.html
index 22fd3e80056e768e10e122d33177eb37c734313d..670f7ddae3690efc63c4dbadc19598808fb6a730 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/comp_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/comp_8h_source.html
@@ -91,7 +91,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/dlg__about_8h_source.html b/fdmdv2/fdmdv2-doc/html/dlg__about_8h_source.html
index a80033e6cedd0fe2c83335b54112188d6693420a..23491771f5eac98bf83574a40008052272cf1829 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/dlg__about_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/dlg__about_8h_source.html
@@ -80,7 +80,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/dlg__audio_8h_source.html b/fdmdv2/fdmdv2-doc/html/dlg__audio_8h_source.html
index 8648f7faf6700d183b12fcd5cf330b419968f0b8..c61812ace6bc64f1fee7bfb4e8ccbf0d3b0a36de 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/dlg__audio_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/dlg__audio_8h_source.html
@@ -98,7 +98,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/dlg__comports_8h_source.html b/fdmdv2/fdmdv2-doc/html/dlg__comports_8h_source.html
index 5c3d2d6ff9de35654ed230c6ed2cbdc766de6ab3..6611c186ef18075cf5af6b18fd7bff58cf552e9a 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/dlg__comports_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/dlg__comports_8h_source.html
@@ -79,7 +79,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/dlg__options_8h_source.html b/fdmdv2/fdmdv2-doc/html/dlg__options_8h_source.html
index 159cf8bee4272ad24762546ad1c0e083cd0824ab..1db6e0037b82a45b43b97b10991057ac0b03ac2e 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/dlg__options_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/dlg__options_8h_source.html
@@ -82,7 +82,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/fdmdv2__defines_8h_source.html b/fdmdv2/fdmdv2-doc/html/fdmdv2__defines_8h_source.html
index b6a80c23041410c42bc588a63942f64a6c21a6ce..ae14240262e07ca0dcbe5c6a4b0daf0284f1543a 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/fdmdv2__defines_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/fdmdv2__defines_8h_source.html
@@ -141,7 +141,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/fdmdv2__main_8h_source.html b/fdmdv2/fdmdv2-doc/html/fdmdv2__main_8h_source.html
index 7c7f782628e4e1e1d89b881c329b85fa37403950..080fa633bec022ef07d9a176bf321bfd0b41b430 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/fdmdv2__main_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/fdmdv2__main_8h_source.html
@@ -64,16 +64,16 @@
 <div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="preprocessor">#include &lt;wx/wx.h&gt;</span></div>
 <div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;</div>
 <div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="preprocessor">#include &quot;wx/file.h&quot;</span></div>
-<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;wx/filename.h&quot;</span></div>
-<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;wx/graphics.h&quot;</span></div>
-<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;wx/mstream.h&quot;</span></div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;wx/wfstream.h&quot;</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;wx/quantize.h&quot;</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;wx/scopedptr.h&quot;</span></div>
-<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &quot;wx/stopwatch.h&quot;</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#include &quot;wx/versioninfo.h&quot;</span></div>
-<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="preprocessor">#include &lt;wx/sound.h&gt;</span></div>
-<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="comment">//#include &lt;wx/thread.h&gt;</span></div>
+<div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &quot;wx/config.h&quot;</span></div>
+<div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &quot;wx/filename.h&quot;</span></div>
+<div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="preprocessor">#include &quot;wx/graphics.h&quot;</span></div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#include &quot;wx/mstream.h&quot;</span></div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor">#include &quot;wx/wfstream.h&quot;</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor">#include &quot;wx/quantize.h&quot;</span></div>
+<div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor">#include &quot;wx/scopedptr.h&quot;</span></div>
+<div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#include &quot;wx/stopwatch.h&quot;</span></div>
+<div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="preprocessor">#include &quot;wx/versioninfo.h&quot;</span></div>
+<div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="preprocessor">#include &lt;wx/sound.h&gt;</span></div>
 <div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;</div>
 <div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="preprocessor">#include &quot;codec2.h&quot;</span></div>
 <div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;<span class="preprocessor">#include &quot;fdmdv.h&quot;</span></div>
@@ -92,158 +92,186 @@
 <div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;<span class="preprocessor">#include &quot;sndfile.h&quot;</span></div>
 <div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="preprocessor">#include &quot;portaudio.h&quot;</span></div>
 <div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;<span class="comment">// Class MainApp</span></div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;<span class="comment">//</span></div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="comment">// @class $(Name)</span></div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;<span class="comment">// @author $(User)</span></div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;<span class="comment">// @date $(Date)</span></div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;<span class="comment">// @file $(CurrentFileName).$(CurrentFileExt)</span></div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;<span class="comment">// @brief</span></div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;<span class="comment">//</span></div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
-<div class="line"><a name="l00054"></a><span class="lineno"><a class="code" href="class_main_app.html">   54</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_main_app.html">MainApp</a> : <span class="keyword">public</span> wxApp</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;{</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">bool</span> OnInit();</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">int</span> OnExit()</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;        {</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;            <span class="keywordflow">return</span> 0;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;        }</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    <span class="keyword">protected</span>:</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;};</div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;</div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;<span class="comment">// declare global static function wxGetApp()</span></div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;DECLARE_APP(<a class="code" href="class_main_app.html">MainApp</a>)</div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;</div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;<span class="comment">// Class MainFrame</span></div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;<span class="comment">//</span></div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;<span class="comment">// @class $(Name)</span></div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;<span class="comment">// @author $(User)</span></div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;<span class="comment">// @date $(Date)</span></div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;<span class="comment">// @file $(CurrentFileName).$(CurrentFileExt)</span></div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;<span class="comment">// @brief</span></div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;<span class="comment">//</span></div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
-<div class="line"><a name="l00079"></a><span class="lineno"><a class="code" href="class_main_frame.html">   79</a></span>&#160;class <a class="code" href="class_main_frame.html">MainFrame</a> : public <a class="code" href="class_top_frame.html">TopFrame</a></div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;{</div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;    <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;        <a class="code" href="class_main_frame.html">MainFrame</a>(wxWindow *parent);</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;        <span class="keyword">virtual</span> ~<a class="code" href="class_main_frame.html">MainFrame</a>();</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;        <a class="code" href="class_plot_panel.html">PlotPanel</a>*      m_panelDefaultA;</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;        <a class="code" href="class_plot_spectrum.html">PlotSpectrum</a>*   m_panelSpectrum;</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;        <a class="code" href="class_plot_waterfall.html">PlotWaterfall</a>*  m_panelWaterfall;</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;        <a class="code" href="class_plot_scatter.html">PlotScatter</a>*    m_panelScatter;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;        <a class="code" href="class_plot_scalar.html">PlotScalar</a>*     m_panelScalar;</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;        <span class="keywordtype">bool</span>            m_SquelchActive;</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;        <span class="keywordtype">bool</span>            m_RxRunning;</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;        <span class="keywordtype">bool</span>            m_TxRunning;</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;        CODEC2          *m_RXCodec2;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;        CODEC2          *m_TXCodec2;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;        <a class="code" href="class_port_audio_wrap.html">PortAudioWrap</a>   *m_rxPa;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;        <a class="code" href="class_port_audio_wrap.html">PortAudioWrap</a>   *m_txPa;</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;        PaDeviceIndex   m_rxDevIn;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;        PaDeviceIndex   m_rxDevOut;</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;        PaDeviceIndex   m_txDevIn;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;        PaDeviceIndex   m_txDevOut;</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;        PaError         m_rxErr;</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;        PaError         m_txErr;</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;        wxSound         *m_sound;</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;        <span class="keyword">static</span> <span class="keywordtype">int</span> rxCallback(</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;                                <span class="keyword">const</span> <span class="keywordtype">void</span> *inBuffer,</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;                                <span class="keywordtype">void</span> *outBuffer,</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;                                <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> framesPerBuffer,</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;                                <span class="keyword">const</span> PaStreamCallbackTimeInfo *outTime,</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;                                PaStreamCallbackFlags statusFlags,</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;                                <span class="keywordtype">void</span> *userData</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;                             );</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;        <span class="keyword">static</span> <span class="keywordtype">int</span> txCallback(</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;                                <span class="keyword">const</span> <span class="keywordtype">void</span> *inBuffer,</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;                                <span class="keywordtype">void</span> *outBuffer,</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;                                <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> framesPerBuffer,</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;                                <span class="keyword">const</span> PaStreamCallbackTimeInfo *outTime,</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;                                PaStreamCallbackFlags statusFlags,</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;                                <span class="keywordtype">void</span> *userData</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;                             );</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;    <span class="keyword">protected</span>:</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;        <span class="comment">// protected event handlers</span></div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">void</span> OnCloseFrame(wxCloseEvent&amp; event);</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">void</span> OnExitClick(wxCommandEvent&amp; event);</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;        <span class="keywordtype">void</span> startTxStream();</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;        <span class="keywordtype">void</span> startRxStream();</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;        <span class="keywordtype">void</span> stopTxStream();</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;        <span class="keywordtype">void</span> stopRxStream();</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;        <span class="keywordtype">void</span> abortTxStream();</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;        <span class="keywordtype">void</span> abortRxStream();</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;        <span class="keywordtype">void</span> OnOpen( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;        <span class="keywordtype">void</span> OnOpenUpdateUI( wxUpdateUIEvent&amp; event );</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;        <span class="keywordtype">void</span> OnSave( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;        <span class="keywordtype">void</span> OnSaveUpdateUI( wxUpdateUIEvent&amp; event );</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;        <span class="keywordtype">void</span> OnClose( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;        <span class="keywordtype">void</span> OnCloseUpdateUI( wxUpdateUIEvent&amp; event );</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;        <span class="keywordtype">void</span> OnExit( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;        <span class="keywordtype">void</span> OnCopy( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;        <span class="keywordtype">void</span> OnCopyUpdateUI( wxUpdateUIEvent&amp; event );</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;        <span class="keywordtype">void</span> OnCut( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;        <span class="keywordtype">void</span> OnCutUpdateUI( wxUpdateUIEvent&amp; event );</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;        <span class="keywordtype">void</span> OnPaste( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;        <span class="keywordtype">void</span> OnPasteUpdateUI( wxUpdateUIEvent&amp; event );</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;        <span class="keywordtype">void</span> OnToolsAudio( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;        <span class="keywordtype">void</span> OnToolsAudioUI( wxUpdateUIEvent&amp; event );</div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;        <span class="keywordtype">void</span> OnToolsComCfg( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;        <span class="keywordtype">void</span> OnToolsComCfgUI( wxUpdateUIEvent&amp; event );</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;        <span class="keywordtype">void</span> OnToolsOptions( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;        <span class="keywordtype">void</span> OnToolsOptionsUI( wxUpdateUIEvent&amp; event );</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;        <span class="keywordtype">void</span> OnCaptureRxStream( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;        <span class="keywordtype">void</span> OnCaptureTxStream( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;        <span class="keywordtype">void</span> OnPlayAudioFile( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;        <span class="keywordtype">void</span> OnHelpCheckUpdates( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;        <span class="keywordtype">void</span> OnHelpCheckUpdatesUI( wxUpdateUIEvent&amp; event );</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;        <span class="keywordtype">void</span> OnHelpAbout( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;        <span class="keywordtype">void</span> OnCmdSliderScroll( wxScrollEvent&amp; event );</div>
-<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;        <span class="keywordtype">void</span> OnSliderScrollBottom( wxScrollEvent&amp; event );</div>
-<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;        <span class="keywordtype">void</span> OnCmdSliderScrollChanged( wxScrollEvent&amp; event );</div>
-<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;        <span class="keywordtype">void</span> OnSliderScrollTop( wxScrollEvent&amp; event );</div>
-<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;        <span class="keywordtype">void</span> OnCheckSQClick( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;        <span class="comment">// Toggle Buttons</span></div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;        <span class="keywordtype">void</span> OnTogBtnSplitClick(wxCommandEvent&amp; event);</div>
-<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;        <span class="keywordtype">void</span> OnTogBtnAnalogClick(wxCommandEvent&amp; event);</div>
-<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;        <span class="keywordtype">void</span> OnTogBtnALCClick(wxCommandEvent&amp; event);</div>
-<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;        <span class="keywordtype">void</span> OnTogBtnRxID( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;        <span class="keywordtype">void</span> OnTogBtnTxID( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;        <span class="keywordtype">void</span> OnTogBtnTXClick( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;        <span class="keywordtype">void</span> OnTogBtnOnOff( wxCommandEvent&amp; event );</div>
-<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;        <span class="keywordtype">void</span> OnPaint(wxPaintEvent&amp; event);</div>
-<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;        <span class="keywordtype">void</span> OnClose( wxCloseEvent&amp; event );</div>
-<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;        <span class="keywordtype">void</span> OnSize( wxSizeEvent&amp; event );</div>
-<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;        <span class="keywordtype">void</span> OnUpdateUI( wxUpdateUIEvent&amp; event );</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;</div>
-<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;        wxString LoadUserImage(wxImage&amp; image);</div>
-<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;</div>
-<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;    <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;        <span class="keywordtype">bool</span> CreateSound(wxSound&amp; snd) <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;</div>
-<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;        wxString    m_soundFile;</div>
-<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;<span class="preprocessor">#ifdef __WXMSW__</span></div>
-<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;<span class="preprocessor"></span>        wxString    m_soundRes;</div>
-<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;<span class="preprocessor">#endif // __WXMSW__</span></div>
-<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;<span class="preprocessor"></span>        <span class="keywordtype">bool</span>        m_useMemory;</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;</div>
-<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;        wxTextCtrl* m_tc;</div>
-<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;        <span class="keywordtype">int</span>         m_zoom;</div>
-<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;};</div>
-<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;</div>
-<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;<span class="preprocessor">#endif //__FDMDV2_MAIN__</span></div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;<span class="preprocessor">#define USE_TIMER 1</span></div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;<span class="keyword">enum</span> {</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;        ID_START = wxID_HIGHEST,</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;        ID_TIMER_WATERFALL,</div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;        ID_TIMER_SPECTRUM,</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;        ID_TIMER_SCATTER,</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;        ID_TIMER_SCALAR</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    };</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;<span class="comment">// Class MainApp</span></div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;<span class="comment">//</span></div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;<span class="comment">// @class $(Name)</span></div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;<span class="comment">// @author $(User)</span></div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;<span class="comment">// @date $(Date)</span></div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;<span class="comment">// @file $(CurrentFileName).$(CurrentFileExt)</span></div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;<span class="comment">// @brief</span></div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;<span class="comment">//</span></div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
+<div class="line"><a name="l00064"></a><span class="lineno"><a class="code" href="class_main_app.html">   64</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_main_app.html">MainApp</a> : <span class="keyword">public</span> wxApp</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;{</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;    <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">bool</span> OnInit();</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">int</span> OnExit()</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;        {</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;            <span class="keywordflow">return</span> 0;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;        }</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;        <span class="keywordtype">bool</span> loadConfig();</div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;    <span class="keyword">protected</span>:</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;        wxConfig *g_config;</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;};</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;<span class="comment">// declare global static function wxGetApp()</span></div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;DECLARE_APP(<a class="code" href="class_main_app.html">MainApp</a>)</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;<span class="comment">// Class MainFrame</span></div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;<span class="comment">//</span></div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;<span class="comment">// @class $(Name)</span></div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;<span class="comment">// @author $(User)</span></div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;<span class="comment">// @date $(Date)</span></div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;<span class="comment">// @file $(CurrentFileName).$(CurrentFileExt)</span></div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;<span class="comment">// @brief</span></div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;<span class="comment">//</span></div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
+<div class="line"><a name="l00090"></a><span class="lineno"><a class="code" href="class_main_frame.html">   90</a></span>&#160;class <a class="code" href="class_main_frame.html">MainFrame</a> : public <a class="code" href="class_top_frame.html">TopFrame</a></div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;{</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;    <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;        <a class="code" href="class_main_frame.html">MainFrame</a>(wxWindow *parent);</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;        <span class="keyword">virtual</span> ~<a class="code" href="class_main_frame.html">MainFrame</a>();</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;        <a class="code" href="class_plot_panel.html">PlotPanel</a>*      m_panelDefaultA;</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;        <a class="code" href="class_plot_spectrum.html">PlotSpectrum</a>*   m_panelSpectrum;</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;        <a class="code" href="class_plot_waterfall.html">PlotWaterfall</a>*  m_panelWaterfall;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;        <a class="code" href="class_plot_scatter.html">PlotScatter</a>*    m_panelScatter;</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;        <a class="code" href="class_plot_scalar.html">PlotScalar</a>*     m_panelScalar;</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;        <span class="keywordtype">bool</span>            m_SquelchActive;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;        <span class="keywordtype">bool</span>            m_RxRunning;</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;        <span class="keywordtype">bool</span>            m_TxRunning;</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;        CODEC2          *m_RXCodec2;</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;        CODEC2          *m_TXCodec2;</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;        <a class="code" href="class_port_audio_wrap.html">PortAudioWrap</a>   *m_rxPa;</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;        <a class="code" href="class_port_audio_wrap.html">PortAudioWrap</a>   *m_txPa;</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;        PaDeviceIndex   m_rxDevIn;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;        PaDeviceIndex   m_rxDevOut;</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;        PaDeviceIndex   m_txDevIn;</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;        PaDeviceIndex   m_txDevOut;</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;        PaError         m_rxErr;</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;        PaError         m_txErr;</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;        wxSound         *m_sound;</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;        <span class="keyword">struct </span>FDMDV    *m_pFDMDV_state;</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;        wxTimer         m_plotTimer;</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;        <span class="keyword">static</span> <span class="keywordtype">int</span> rxCallback(</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;                                <span class="keyword">const</span> <span class="keywordtype">void</span> *inBuffer,</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;                                <span class="keywordtype">void</span> *outBuffer,</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;                                <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> framesPerBuffer,</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;                                <span class="keyword">const</span> PaStreamCallbackTimeInfo *outTime,</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;                                PaStreamCallbackFlags statusFlags,</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;                                <span class="keywordtype">void</span> *userData</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;                             );</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;        <span class="keyword">static</span> <span class="keywordtype">int</span> txCallback(</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;                                <span class="keyword">const</span> <span class="keywordtype">void</span> *inBuffer,</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;                                <span class="keywordtype">void</span> *outBuffer,</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;                                <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> framesPerBuffer,</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;                                <span class="keyword">const</span> PaStreamCallbackTimeInfo *outTime,</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;                                PaStreamCallbackFlags statusFlags,</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;                                <span class="keywordtype">void</span> *userData</div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;                             );</div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;        <span class="keywordtype">void</span> per_frame_rx_processing(</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;                                        <span class="keywordtype">short</span>   output_buf[],  <span class="comment">// output buf of decoded speech samples</span></div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;                                        <span class="keywordtype">int</span>     *n_output_buf, <span class="comment">// how many samples currently in output_buf[]</span></div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;                                        <span class="keywordtype">int</span>     codec_bits[],  <span class="comment">// current frame of bits for decoder</span></div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;                                        <span class="keywordtype">short</span>   input_buf[],   <span class="comment">// input buf of modem samples input to demod</span></div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;                                        <span class="keywordtype">int</span>     *n_input_buf,  <span class="comment">// how many samples currently in input_buf[]</span></div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;                                        <span class="keywordtype">int</span>     *nin,          <span class="comment">// amount of samples demod needs for next call</span></div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;                                        <span class="keywordtype">int</span>     *state,        <span class="comment">// used to collect codec_bits[] halves</span></div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;                                        <span class="keyword">struct</span>  CODEC2 *c2     <span class="comment">// Codec 2 states</span></div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;                                    );</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;    <span class="keyword">protected</span>:</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;        <span class="comment">// protected event handlers</span></div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">void</span> OnCloseFrame(wxCloseEvent&amp; event);</div>
+<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">void</span> OnExitClick(wxCommandEvent&amp; event);</div>
+<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;</div>
+<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;        <span class="keywordtype">void</span> averageData(<span class="keywordtype">float</span> mag_dB[]);</div>
+<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;        <span class="keywordtype">void</span> startTxStream();</div>
+<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;        <span class="keywordtype">void</span> startRxStream();</div>
+<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;        <span class="keywordtype">void</span> stopTxStream();</div>
+<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;        <span class="keywordtype">void</span> stopRxStream();</div>
+<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;        <span class="keywordtype">void</span> abortTxStream();</div>
+<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;        <span class="keywordtype">void</span> abortRxStream();</div>
+<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;</div>
+<div class="line"><a name="l00159"></a><span class="lineno">  159</span>&#160;        <span class="keywordtype">void</span> OnOpen( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00160"></a><span class="lineno">  160</span>&#160;        <span class="keywordtype">void</span> OnOpenUpdateUI( wxUpdateUIEvent&amp; event );</div>
+<div class="line"><a name="l00161"></a><span class="lineno">  161</span>&#160;        <span class="keywordtype">void</span> OnSave( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00162"></a><span class="lineno">  162</span>&#160;        <span class="keywordtype">void</span> OnSaveUpdateUI( wxUpdateUIEvent&amp; event );</div>
+<div class="line"><a name="l00163"></a><span class="lineno">  163</span>&#160;        <span class="keywordtype">void</span> OnClose( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160;        <span class="keywordtype">void</span> OnCloseUpdateUI( wxUpdateUIEvent&amp; event );</div>
+<div class="line"><a name="l00165"></a><span class="lineno">  165</span>&#160;        <span class="keywordtype">void</span> OnExit( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00166"></a><span class="lineno">  166</span>&#160;        <span class="keywordtype">void</span> OnCopy( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00167"></a><span class="lineno">  167</span>&#160;        <span class="keywordtype">void</span> OnCopyUpdateUI( wxUpdateUIEvent&amp; event );</div>
+<div class="line"><a name="l00168"></a><span class="lineno">  168</span>&#160;        <span class="keywordtype">void</span> OnCut( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00169"></a><span class="lineno">  169</span>&#160;        <span class="keywordtype">void</span> OnCutUpdateUI( wxUpdateUIEvent&amp; event );</div>
+<div class="line"><a name="l00170"></a><span class="lineno">  170</span>&#160;        <span class="keywordtype">void</span> OnPaste( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00171"></a><span class="lineno">  171</span>&#160;        <span class="keywordtype">void</span> OnPasteUpdateUI( wxUpdateUIEvent&amp; event );</div>
+<div class="line"><a name="l00172"></a><span class="lineno">  172</span>&#160;        <span class="keywordtype">void</span> OnToolsAudio( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00173"></a><span class="lineno">  173</span>&#160;        <span class="keywordtype">void</span> OnToolsAudioUI( wxUpdateUIEvent&amp; event );</div>
+<div class="line"><a name="l00174"></a><span class="lineno">  174</span>&#160;        <span class="keywordtype">void</span> OnToolsComCfg( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160;        <span class="keywordtype">void</span> OnToolsComCfgUI( wxUpdateUIEvent&amp; event );</div>
+<div class="line"><a name="l00176"></a><span class="lineno">  176</span>&#160;        <span class="keywordtype">void</span> OnToolsOptions( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00177"></a><span class="lineno">  177</span>&#160;        <span class="keywordtype">void</span> OnToolsOptionsUI( wxUpdateUIEvent&amp; event );</div>
+<div class="line"><a name="l00178"></a><span class="lineno">  178</span>&#160;        <span class="keywordtype">void</span> OnCaptureRxStream( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00179"></a><span class="lineno">  179</span>&#160;        <span class="keywordtype">void</span> OnCaptureTxStream( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00180"></a><span class="lineno">  180</span>&#160;        <span class="keywordtype">void</span> OnPlayAudioFile( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00181"></a><span class="lineno">  181</span>&#160;        <span class="keywordtype">void</span> OnHelpCheckUpdates( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00182"></a><span class="lineno">  182</span>&#160;        <span class="keywordtype">void</span> OnHelpCheckUpdatesUI( wxUpdateUIEvent&amp; event );</div>
+<div class="line"><a name="l00183"></a><span class="lineno">  183</span>&#160;        <span class="keywordtype">void</span> OnHelpAbout( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00184"></a><span class="lineno">  184</span>&#160;        <span class="keywordtype">void</span> OnCmdSliderScroll( wxScrollEvent&amp; event );</div>
+<div class="line"><a name="l00185"></a><span class="lineno">  185</span>&#160;        <span class="keywordtype">void</span> OnSliderScrollBottom( wxScrollEvent&amp; event );</div>
+<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160;        <span class="keywordtype">void</span> OnCmdSliderScrollChanged( wxScrollEvent&amp; event );</div>
+<div class="line"><a name="l00187"></a><span class="lineno">  187</span>&#160;        <span class="keywordtype">void</span> OnSliderScrollTop( wxScrollEvent&amp; event );</div>
+<div class="line"><a name="l00188"></a><span class="lineno">  188</span>&#160;        <span class="keywordtype">void</span> OnCheckSQClick( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00189"></a><span class="lineno">  189</span>&#160;</div>
+<div class="line"><a name="l00190"></a><span class="lineno">  190</span>&#160;        <span class="comment">// Toggle Buttons</span></div>
+<div class="line"><a name="l00191"></a><span class="lineno">  191</span>&#160;        <span class="keywordtype">void</span> OnTogBtnSplitClick(wxCommandEvent&amp; event);</div>
+<div class="line"><a name="l00192"></a><span class="lineno">  192</span>&#160;        <span class="keywordtype">void</span> OnTogBtnAnalogClick(wxCommandEvent&amp; event);</div>
+<div class="line"><a name="l00193"></a><span class="lineno">  193</span>&#160;        <span class="keywordtype">void</span> OnTogBtnALCClick(wxCommandEvent&amp; event);</div>
+<div class="line"><a name="l00194"></a><span class="lineno">  194</span>&#160;        <span class="keywordtype">void</span> OnTogBtnRxID( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00195"></a><span class="lineno">  195</span>&#160;        <span class="keywordtype">void</span> OnTogBtnTxID( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00196"></a><span class="lineno">  196</span>&#160;        <span class="keywordtype">void</span> OnTogBtnTXClick( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00197"></a><span class="lineno">  197</span>&#160;        <span class="keywordtype">void</span> OnTogBtnOnOff( wxCommandEvent&amp; event );</div>
+<div class="line"><a name="l00198"></a><span class="lineno">  198</span>&#160;</div>
+<div class="line"><a name="l00199"></a><span class="lineno">  199</span>&#160;        <span class="comment">//System Events</span></div>
+<div class="line"><a name="l00200"></a><span class="lineno">  200</span>&#160;        <span class="keywordtype">void</span> OnPaint(wxPaintEvent&amp; event);</div>
+<div class="line"><a name="l00201"></a><span class="lineno">  201</span>&#160;        <span class="keywordtype">void</span> OnClose( wxCloseEvent&amp; event );</div>
+<div class="line"><a name="l00202"></a><span class="lineno">  202</span>&#160;        <span class="keywordtype">void</span> OnSize( wxSizeEvent&amp; event );</div>
+<div class="line"><a name="l00203"></a><span class="lineno">  203</span>&#160;        <span class="keywordtype">void</span> OnUpdateUI( wxUpdateUIEvent&amp; event );</div>
+<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160;        <span class="keywordtype">void</span> OnTimer(wxTimerEvent &amp;evt);</div>
+<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160;</div>
+<div class="line"><a name="l00206"></a><span class="lineno">  206</span>&#160;        wxString LoadUserImage(wxImage&amp; image);</div>
+<div class="line"><a name="l00207"></a><span class="lineno">  207</span>&#160;</div>
+<div class="line"><a name="l00208"></a><span class="lineno">  208</span>&#160;    <span class="keyword">private</span>:</div>
+<div class="line"><a name="l00209"></a><span class="lineno">  209</span>&#160;        <span class="keywordtype">bool</span> CreateSound(wxSound&amp; snd) <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00210"></a><span class="lineno">  210</span>&#160;        wxString    m_soundFile;</div>
+<div class="line"><a name="l00211"></a><span class="lineno">  211</span>&#160;<span class="preprocessor">#ifdef __WXMSW__</span></div>
+<div class="line"><a name="l00212"></a><span class="lineno">  212</span>&#160;<span class="preprocessor"></span>        wxString    m_soundRes;</div>
+<div class="line"><a name="l00213"></a><span class="lineno">  213</span>&#160;<span class="preprocessor">#endif // __WXMSW__</span></div>
+<div class="line"><a name="l00214"></a><span class="lineno">  214</span>&#160;<span class="preprocessor"></span>        <span class="keywordtype">bool</span>        m_useMemory;</div>
+<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160;        wxTextCtrl* m_tc;</div>
+<div class="line"><a name="l00216"></a><span class="lineno">  216</span>&#160;        <span class="keywordtype">int</span>         m_zoom;</div>
+<div class="line"><a name="l00217"></a><span class="lineno">  217</span>&#160;};</div>
+<div class="line"><a name="l00218"></a><span class="lineno">  218</span>&#160;</div>
+<div class="line"><a name="l00219"></a><span class="lineno">  219</span>&#160;<span class="preprocessor">#endif //__FDMDV2_MAIN__</span></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/fdmdv2__pa__wrapper_8h_source.html b/fdmdv2/fdmdv2-doc/html/fdmdv2__pa__wrapper_8h_source.html
index 8040b9a2d637329671a814763e39bc87eda6b028..e4e64203dedc1d12115b44e20e9257c137d29605 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/fdmdv2__pa__wrapper_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/fdmdv2__pa__wrapper_8h_source.html
@@ -98,119 +98,83 @@
 <div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;        <span class="keywordtype">float</span>                           m_av_mag[FDMDV_NSPEC];</div>
 <div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;</div>
 <div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    <span class="keyword">private</span>:</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;        PaStream                        *stream;</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;        PaStreamParameters              inputBuffer;</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;        PaStreamParameters              outputBuffer;</div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;        <span class="keywordtype">void</span>                            *userData;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;        <span class="keywordtype">int</span>                             samplerate;</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;        <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>                   framesPerBuffer;</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;        PaStreamCallbackFlags           statusFlags;</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;        PaStreamCallback                *streamCallback;</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;        PaStreamFinishedCallback        *streamFinishedCallback;</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;        <span class="keyword">const</span> PaStreamCallbackTimeInfo  *timeInfo;</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;        <span class="keyword">struct </span>FDMDV                    *fdmdv_state;</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;    <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;        <span class="keywordtype">void</span> per_frame_rx_processing(</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;            <span class="keywordtype">short</span>   output_buf[],  <span class="comment">/* output buf of decoded speech samples          */</span></div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;            <span class="keywordtype">int</span>     *n_output_buf, <span class="comment">/* how many samples currently in output_buf[]    */</span></div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;            <span class="keywordtype">int</span>     codec_bits[],  <span class="comment">/* current frame of bits for decoder             */</span></div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;            <span class="keywordtype">short</span>   input_buf[],   <span class="comment">/* input buf of modem samples input to demod     */</span></div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;            <span class="keywordtype">int</span>     *n_input_buf,  <span class="comment">/* how many samples currently in input_buf[]     */</span></div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;            <span class="keywordtype">int</span>     *nin,          <span class="comment">/* amount of samples demod needs for next call   */</span></div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;            <span class="keywordtype">int</span>     *state,        <span class="comment">/* used to collect codec_bits[] halves           */</span></div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;            <span class="keyword">struct</span>  CODEC2 *c2     <span class="comment">/* Codec 2 states                                */</span></div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;        );</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;        PaStream                        *m_pStream;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;        <span class="keywordtype">void</span>                            *m_pUserData;</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;        PaStreamCallback                *m_pStreamCallback;</div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;        PaStreamFinishedCallback        *m_pStreamFinishedCallback;</div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;        <span class="keyword">const</span> PaStreamCallbackTimeInfo  *m_pTimeInfo;</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;        <span class="keyword">struct </span>FDMDV                    *m_pFDMDV_state;</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;        PaStreamParameters              m_inputBuffer;</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;        PaStreamParameters              m_outputBuffer;</div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;        <span class="keywordtype">int</span>                             m_samplerate;</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;        <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>                   m_framesPerBuffer;</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;        PaStreamCallbackFlags           m_statusFlags;</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;        <span class="keywordtype">bool</span>                            m_newdata;</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;    <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;        <span class="keywordtype">void</span>                averageData(<span class="keywordtype">float</span> mag_dB[]);</div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;</div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;        PaDeviceIndex       getDefaultInputDevice();</div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;        PaDeviceIndex       getDefaultOutputDevice();</div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;        PaStreamParameters  *getDeviceInfo(PaDeviceIndex idx);</div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;</div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;        PaError             setFramesPerBuffer(<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> size);</div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;        PaError             setSampleRate(<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> size);</div>
 <div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;</div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;        <span class="comment">/*</span></div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;<span class="comment">                static int Callback(</span></div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;<span class="comment">                                        const void *inBuffer,</span></div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;<span class="comment">                                        void *outBuffer,</span></div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;<span class="comment">                                        unsigned long framesPerBuffer,</span></div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;<span class="comment">                                        const PaStreamCallbackTimeInfo *outTime,</span></div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;<span class="comment">                                        PaStreamCallbackFlags statusFlags,</span></div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;<span class="comment">                                        void *userData</span></div>
-<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;<span class="comment">                                   );</span></div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;<span class="comment">                static int txCallback(</span></div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;<span class="comment">                                        const void *inBuffer,</span></div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;<span class="comment">                                        void *outBuffer,</span></div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;<span class="comment">                                        unsigned long framesPerBuffer,</span></div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;<span class="comment">                                        const PaStreamCallbackTimeInfo *outTime,</span></div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;<span class="comment">                                        PaStreamCallbackFlags statusFlags,</span></div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;<span class="comment">                                        void *userData</span></div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;<span class="comment">                                     );</span></div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;<span class="comment">        */</span></div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;        PaDeviceIndex       getDefaultInputDevice();</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;        PaDeviceIndex       getDefaultOutputDevice();</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;        PaStreamParameters  *getDeviceInfo(PaDeviceIndex idx);</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;        PaError             setFramesPerBuffer(<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> size);</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;        PaError             setSampleRate(<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> size);</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;        PaError             setStreamFlags(PaStreamFlags flags);</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;        PaError             setCallback(PaStreamCallback *streamCallback);</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;        PaError             setStreamCallback(PaStream *stream, PaStreamCallback* callback) { streamCallback = callback; <span class="keywordflow">return</span> 0;}</div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;        PaError             setStreamFinishedCallback(PaStream *stream, PaStreamFinishedCallback* streamFinishedCallback);</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;        PaError             streamOpen();</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;        PaError             setInputDevice(PaDeviceIndex dev);</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;        PaError             setInputChannelCount(<span class="keywordtype">int</span> count);</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;        <span class="keywordtype">int</span>                 getInputChannelCount();</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;        PaError             setInputSampleFormat(PaSampleFormat format);</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;        PaError             setInputSampleRate(PaSampleFormat format);</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;        PaError             setInputLatency(PaTime latency);</div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;        <span class="keywordtype">void</span>                setInputHostApiStreamInfo(<span class="keywordtype">void</span> *info = NULL);</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;        PaTime              getInputDefaultLowLatency();</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;        <span class="keyword">const</span> <span class="keywordtype">char</span>          *getDeviceName(PaDeviceIndex dev);</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;        PaError             setOutputDevice(PaDeviceIndex dev);</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;        PaError             setOutputChannelCount(<span class="keywordtype">int</span> count);</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;        <span class="keyword">const</span> <span class="keywordtype">int</span>           getOutputChannelCount();</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;        PaError             setOutputSampleFormat(PaSampleFormat format);</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;        PaError             setOutputLatency(PaTime latency);</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;        PaError             streamStart();</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;        PaError             streamClose();</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;        <span class="keywordtype">void</span>                setOutputHostApiStreamInfo(<span class="keywordtype">void</span> *info = NULL);</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;        PaTime              getOutputDefaultLowLatency();</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;        <span class="keywordtype">void</span>                averageData(<span class="keywordtype">float</span> mag_dB[]);</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;        <span class="keywordtype">void</span>                setFdmdvState(FDMDV* fdmdv_state)                       {this-&gt;fdmdv_state = fdmdv_state;}</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;<span class="comment">//        void                setFramesPerBuffer(unsigned long framesPerBuffer)       {this-&gt;framesPerBuffer = framesPerBuffer;}</span></div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;        <span class="keywordtype">void</span>                setInputBuffer(<span class="keyword">const</span> PaStreamParameters&amp; inputBuffer)   {this-&gt;inputBuffer = inputBuffer;}</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;<span class="comment">//        void                setAvMag(float av_mag)                                  {this-&gt;m_av_mag = av_mag;}</span></div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;        <span class="keywordtype">void</span>                setOutputBuffer(<span class="keyword">const</span> PaStreamParameters&amp; outputBuffer) {this-&gt;outputBuffer = outputBuffer;}</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;        <span class="keywordtype">void</span>                setSamplerate(<span class="keywordtype">int</span> samplerate)                           {this-&gt;samplerate = samplerate;}</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;        <span class="keywordtype">void</span>                setStatusFlags(<span class="keyword">const</span> PaStreamCallbackFlags&amp; statusFlags) {this-&gt;statusFlags = statusFlags;}</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;        <span class="keywordtype">void</span>                setStream(PaStream* stream)                             {this-&gt;stream = stream;}</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;<span class="comment">//        void                setStreamCallback(PaStreamCallback* streamCallback)     {this-&gt;streamCallback = streamCallback;}</span></div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;        <span class="keywordtype">void</span>                setStreamFinishedCallback(PaStreamFinishedCallback* streamFinishedCallback) {this-&gt;streamFinishedCallback = streamFinishedCallback;}</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;        <span class="keywordtype">void</span>                setTimeInfo(PaStreamCallbackTimeInfo* timeInfo)         {this-&gt;timeInfo = timeInfo;}</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;        <span class="keywordtype">void</span>                setUserData(<span class="keywordtype">void</span>* userData)                             {this-&gt;userData = userData;}</div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;        FDMDV*              getFdmdvState()                                         {<span class="keywordflow">return</span> fdmdv_state;}</div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;        <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>       getFramesPerBuffer()<span class="keyword"> const                              </span>{<span class="keywordflow">return</span> framesPerBuffer;}</div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;        <span class="keyword">const</span>               PaStreamParameters&amp; getInputBuffer()<span class="keyword"> const              </span>{<span class="keywordflow">return</span> inputBuffer;}</div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;<span class="comment">//        const float         *getAvMag(int idx) const                                 {return (float *)&amp;m_av_mag[idx];}</span></div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;        <span class="keyword">const</span>               PaStreamParameters&amp; getOutputBuffer()<span class="keyword"> const             </span>{<span class="keywordflow">return</span> outputBuffer;}</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;        <span class="keywordtype">int</span>                 getSamplerate()<span class="keyword"> const                                   </span>{<span class="keywordflow">return</span> samplerate;}</div>
-<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;        <span class="keyword">const</span> PaStreamCallbackFlags&amp; getStatusFlags()<span class="keyword"> const                         </span>{<span class="keywordflow">return</span> statusFlags;}</div>
-<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;        PaStream*           getStream()                                             {<span class="keywordflow">return</span> stream;}</div>
-<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;<span class="comment">//        PaStreamCallback*  getStreamCallback()                                       {return streamCallback;}</span></div>
-<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;<span class="comment">//        PaStreamFinishedCallback* getStreamFinishedCallback()                       {return streamFinishedCallback;}</span></div>
-<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;<span class="comment">//        PaStreamCallbackTimeInfo* getTimeInfo()                                     {return timeInfo;}</span></div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160;        <span class="keywordtype">void</span>                *getUserData()                                          {<span class="keywordflow">return</span> userData;}</div>
-<div class="line"><a name="l00150"></a><span class="lineno">  150</span>&#160;</div>
-<div class="line"><a name="l00151"></a><span class="lineno">  151</span>&#160;        <span class="keywordtype">void</span>                terminate();</div>
-<div class="line"><a name="l00152"></a><span class="lineno">  152</span>&#160;        <span class="keywordtype">void</span>                stop();</div>
-<div class="line"><a name="l00153"></a><span class="lineno">  153</span>&#160;        <span class="keywordtype">void</span>                abort();</div>
-<div class="line"><a name="l00154"></a><span class="lineno">  154</span>&#160;        <span class="keywordtype">bool</span>                isOpen() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00155"></a><span class="lineno">  155</span>&#160;        <span class="keywordtype">bool</span>                isStopped() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00156"></a><span class="lineno">  156</span>&#160;        <span class="keywordtype">bool</span>                isActive() <span class="keyword">const</span>;</div>
-<div class="line"><a name="l00157"></a><span class="lineno">  157</span>&#160;        <span class="keywordtype">void</span>                loadData();</div>
-<div class="line"><a name="l00158"></a><span class="lineno">  158</span>&#160;};</div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;        PaError             setStreamFlags(PaStreamFlags flags);</div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;        PaError             setCallback(PaStreamCallback *m_pStreamCallback);</div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;        PaError             setStreamCallback(PaStream *stream, PaStreamCallback* callback) { m_pStreamCallback = callback; <span class="keywordflow">return</span> 0;}</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;        PaError             setStreamFinishedCallback(PaStream *stream, PaStreamFinishedCallback* m_pStreamFinishedCallback);</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;        <span class="keywordtype">void</span>                setInputBuffer(<span class="keyword">const</span> PaStreamParameters&amp; inputBuffer)   {this-&gt;m_inputBuffer = inputBuffer;}</div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;        PaError             setInputDevice(PaDeviceIndex dev);</div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;        PaError             setInputChannelCount(<span class="keywordtype">int</span> count);</div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;        <span class="keywordtype">int</span>                 getInputChannelCount();</div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;        PaError             setInputSampleFormat(PaSampleFormat format);</div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;        PaError             setInputSampleRate(PaSampleFormat format);</div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;        PaError             setInputLatency(PaTime latency);</div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;        <span class="keywordtype">void</span>                setInputHostApiStreamInfo(<span class="keywordtype">void</span> *info = NULL);</div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;        PaTime              getInputDefaultLowLatency();</div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;        <span class="keyword">const</span> <span class="keywordtype">char</span>          *getDeviceName(PaDeviceIndex dev);</div>
+<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;        PaError             setOutputDevice(PaDeviceIndex dev);</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;        PaError             setOutputChannelCount(<span class="keywordtype">int</span> count);</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;        <span class="keyword">const</span> <span class="keywordtype">int</span>           getOutputChannelCount();</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;        PaError             setOutputSampleFormat(PaSampleFormat format);</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;        PaError             setOutputLatency(PaTime latency);</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;        <span class="keywordtype">void</span>                setOutputHostApiStreamInfo(<span class="keywordtype">void</span> *info = NULL);</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;        PaTime              getOutputDefaultLowLatency();</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;        <span class="keywordtype">void</span>                setFdmdvState(FDMDV* fdmdv_state)                       {this-&gt;m_pFDMDV_state = fdmdv_state;}</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;        <span class="keywordtype">void</span>                setOutputBuffer(<span class="keyword">const</span> PaStreamParameters&amp; outputBuffer) {this-&gt;m_outputBuffer = outputBuffer;}</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;        <span class="keywordtype">void</span>                setTimeInfo(PaStreamCallbackTimeInfo* timeInfo)         {this-&gt;m_pTimeInfo = timeInfo;}</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;        <span class="keywordtype">void</span>                setUserData(<span class="keywordtype">void</span>* userData)                             {this-&gt;m_pUserData = userData;}</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;        <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>       getFramesPerBuffer()<span class="keyword"> const                              </span>{<span class="keywordflow">return</span> m_framesPerBuffer;}</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;        <span class="keyword">const</span>               PaStreamParameters&amp; getInputBuffer()<span class="keyword"> const              </span>{<span class="keywordflow">return</span> m_inputBuffer;}</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;        <span class="keyword">const</span>               PaStreamParameters&amp; getOutputBuffer()<span class="keyword"> const             </span>{<span class="keywordflow">return</span> m_outputBuffer;}</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;        <span class="keyword">const</span>               PaStreamCallbackFlags&amp; getStatusFlags()<span class="keyword"> const           </span>{<span class="keywordflow">return</span> m_statusFlags;}</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;        FDMDV*              getFdmdvState()                                         {<span class="keywordflow">return</span> m_pFDMDV_state;}</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;        <span class="keywordtype">int</span>                 getSamplerate()<span class="keyword"> const                                   </span>{<span class="keywordflow">return</span> m_samplerate;}</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;        PaStream*           getStream()                                             {<span class="keywordflow">return</span> m_pStream;}</div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;        <span class="keywordtype">void</span>                *getUserData()                                          {<span class="keywordflow">return</span> m_pUserData;}</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;        <span class="keywordtype">bool</span>                getDataAvail()                                          {<span class="keywordflow">return</span> m_newdata;}</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;        PaError             streamStart();</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;        PaError             streamClose();</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;        PaError             streamOpen();</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;        <span class="keywordtype">void</span>                terminate();</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;        <span class="keywordtype">void</span>                stop();</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;        <span class="keywordtype">void</span>                abort();</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;        <span class="keywordtype">bool</span>                isOpen() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;        <span class="keywordtype">bool</span>                isStopped() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;        <span class="keywordtype">bool</span>                isActive() <span class="keyword">const</span>;</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;        <span class="keywordtype">void</span>                loadData();</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;};</div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/fdmdv2__plot_8h_source.html b/fdmdv2/fdmdv2-doc/html/fdmdv2__plot_8h_source.html
index 2c4f7f0b683878aebf032e785fbfcba7ba351742..aad237b3d3da42f8ab348bfefc19ea5e6e1e9355 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/fdmdv2__plot_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/fdmdv2__plot_8h_source.html
@@ -67,9 +67,9 @@
 <div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="preprocessor">#include &lt;wx/image.h&gt;</span></div>
 <div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;<span class="preprocessor">#include &lt;wx/dcbuffer.h&gt;</span></div>
 <div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;</div>
-<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#define MAX_ZOOM    7</span></div>
-<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MAX_BMP_X   (400 * MAX_ZOOM)</span></div>
-<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MAX_BMP_Y   (400 * MAX_ZOOM)</span></div>
+<div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="preprocessor">#define MAX_ZOOM            7</span></div>
+<div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MAX_BMP_X           (400 * MAX_ZOOM)</span></div>
+<div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MAX_BMP_Y           (400 * MAX_ZOOM)</span></div>
 <div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="preprocessor">#define wxUSE_FILEDLG       1</span></div>
 <div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define wxUSE_LIBPNG        1</span></div>
@@ -83,119 +83,124 @@
 <div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define XLEFT_TEXT_OFFSET   8</span></div>
 <div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define YBOTTOM_OFFSET      25</span></div>
 <div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define GRID_INCREMENT      50</span></div>
-<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define GREY_COLOR          wxColor(0x80, 0x80, 0x80)</span></div>
-<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define BLACK_COLOR         wxColor(0x00, 0x00, 0x00)</span></div>
-<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="preprocessor">#define BLUE_COLOR          wxColor(0x00, 0x00, 0xFF)</span></div>
-<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define LIGHT_BLUE_COLOR    wxColor(0x80, 0x80, 0xFF)</span></div>
-<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;<span class="preprocessor">#define RED_COLOR           wxColor(0xFF, 0x5E, 0x5E)</span></div>
-<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define LIGHT_RED_COLOR     wxColor(0xFF, 0xE0, 0xE0)</span></div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define DARK_RED_COLOR      wxColor(0xFF, 0x00, 0x00)</span></div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define PINK_COLOR          wxColor(0xFF, 0x80, 0xFF)</span></div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;<span class="preprocessor">#define LIGHT_GREEN_COLOR   wxColor(0xE3, 0xFF, 0xE0)</span></div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define GREEN_COLOR         wxColor(0x95, 0xFF, 0x8A)</span></div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define DARK_GREEN_COLOR    wxColor(0x20, 0xFF, 0x08)</span></div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define VERY_GREEN_COLOR    wxColor(0x00, 0xFF, 0x00)</span></div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;<span class="preprocessor">#define YELLOW_COLOR        wxColor(0xFF, 0xFF, 0x5E)</span></div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define LIGHT_YELLOW_COLOR  wxColor(0xFF, 0xFF, 0xB5)</span></div>
-<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define DARK_YELLOW_COLOR   wxColor(0xFF, 0xFF, 0x08)</span></div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;<span class="preprocessor"></span></div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;<span class="comment">/*</span></div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;<span class="comment">    wxNullBrush</span></div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;<span class="comment">    wxBLACK_BRUSH</span></div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;<span class="comment">    wxBLUE_BRUSH</span></div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;<span class="comment">    wxCYAN_BRUSH</span></div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;<span class="comment">    wxGREEN_BRUSH</span></div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;<span class="comment">    wxYELLOW_BRUSH</span></div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;<span class="comment">    wxGREY_BRUSH</span></div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;<span class="comment">    wxLIGHT_GREY_BRUSH</span></div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;<span class="comment">    wxMEDIUM_GREY_BRUSH</span></div>
-<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;<span class="comment">    wxRED_BRUSH</span></div>
-<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;<span class="comment">    wxTRANSPARENT_BRUSH</span></div>
-<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;<span class="comment">    wxWHITE_BRUSH</span></div>
-<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;<span class="comment">*/</span></div>
-<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;</div>
-<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;<span class="keyword">class </span><a class="code" href="class_main_frame.html">MainFrame</a>;</div>
-<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;</div>
-<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
-<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;<span class="comment">// Class PlotPanel</span></div>
-<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;<span class="comment">//</span></div>
-<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;<span class="comment">// @class $(Name)</span></div>
-<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;<span class="comment">// @author $(User)</span></div>
-<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;<span class="comment">// @date $(Date)</span></div>
-<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;<span class="comment">// @file $(CurrentFileName).$(CurrentFileExt)</span></div>
-<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;<span class="comment">// @brief</span></div>
-<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;<span class="comment">//</span></div>
-<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
-<div class="line"><a name="l00082"></a><span class="lineno"><a class="code" href="class_plot_panel.html">   82</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_plot_panel.html">PlotPanel</a> : <span class="keyword">public</span> wxPanel</div>
-<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;{</div>
-<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;    <span class="keyword">public</span>:</div>
-<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;        <a class="code" href="class_plot_panel.html">PlotPanel</a>(wxFrame* parent);</div>
-<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;        ~<a class="code" href="class_plot_panel.html">PlotPanel</a>();</div>
-<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;        wxPen               m_penShortDash;</div>
-<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;        wxPen               m_penDotDash;</div>
-<div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;        wxPen               m_penSolid;</div>
-<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;        wxRect              m_rectCtrl;</div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;        wxRect              m_rectGrid;</div>
-<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;        wxRect              m_rectPlot;</div>
-<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;        <a class="code" href="class_main_frame.html">MainFrame</a>           *m_pTopFrame;</div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;        wxAuiNotebook       *m_pNoteBook;</div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;        <span class="keywordtype">double</span>              m_label_size;</div>
-<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;        wxSize              m_Bufsz;</div>
-<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;        <span class="keywordtype">bool</span>                m_newdata;</div>
-<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;        wxBitmap            *m_bmp;</div>
-<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;        wxNativePixelData   *m_pBmp;</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;</div>
-<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;        <span class="comment">// some useful events</span></div>
-<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;        <span class="keywordtype">void</span>            OnMouseMove(wxMouseEvent&amp; event);</div>
-<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;        <span class="keywordtype">void</span>            OnMouseDown(wxMouseEvent&amp; event);</div>
-<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;        <span class="keywordtype">void</span>            OnMouseUp(wxMouseEvent&amp; event);</div>
-<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;        <span class="keywordtype">void</span>            OnMouseWheelMoved(wxMouseEvent&amp; event);</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;        <span class="keywordtype">void</span>            OnClose(wxCloseEvent&amp; event ){ <span class="keyword">event</span>.Skip(); }</div>
-<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;        <span class="keywordtype">void</span>            OnSize( wxSizeEvent&amp; event );</div>
-<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;        <span class="keywordtype">void</span>            OnErase(wxEraseEvent&amp; event);</div>
-<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;        <span class="keywordtype">void</span>            OnPaint(wxPaintEvent&amp; event);</div>
-<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;        <span class="comment">//void OnUpdateUI( wxUpdateUIEvent&amp; event ){ event.Skip(); }</span></div>
-<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;        <span class="keywordtype">void</span>            paintEvent(wxPaintEvent &amp; evt);</div>
-<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">void</span>    draw(wxAutoBufferedPaintDC&amp; dc);</div>
-<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">void</span>    drawGraticule(wxAutoBufferedPaintDC&amp; dc);</div>
-<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">double</span>  SetZoomFactor(<span class="keywordtype">double</span> zf);</div>
-<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">double</span>  GetZoomFactor(<span class="keywordtype">double</span> zf);</div>
-<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">void</span>    OnShow(wxShowEvent&amp; event);</div>
-<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">double</span>  GetLabelSize();</div>
-<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">void</span>    SetLabelSize(<span class="keywordtype">double</span> size);</div>
-<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;</div>
-<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;    <span class="keyword">protected</span>:</div>
-<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;        <span class="keywordtype">int</span>         m_x;</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;        <span class="keywordtype">int</span>         m_y;</div>
-<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;        <span class="keywordtype">int</span>         m_w;</div>
-<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;        <span class="keywordtype">int</span>         m_h;</div>
-<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;        <span class="keywordtype">int</span>         m_left;</div>
-<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;        <span class="keywordtype">int</span>         m_top;</div>
-<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;        <span class="keywordtype">int</span>         m_prev_w;</div>
-<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;        <span class="keywordtype">int</span>         m_prev_h;</div>
-<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;        <span class="keywordtype">int</span>         m_prev_x;</div>
-<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;        <span class="keywordtype">int</span>         m_prev_y;</div>
-<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;        <span class="keywordtype">bool</span>        m_use_bitmap;</div>
-<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;        <span class="keywordtype">bool</span>        m_clip;</div>
-<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;        <span class="keywordtype">bool</span>        m_rubberBand;</div>
-<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;        <span class="keywordtype">bool</span>        m_mouseDown;</div>
-<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;        <span class="keywordtype">double</span>      m_zoomFactor;</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;<span class="comment">//        int             m_gridLeftOffset;</span></div>
-<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;<span class="comment">//        int             m_gridRightOffset;</span></div>
-<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;<span class="comment">//        int             m_gridTopOffset;</span></div>
-<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;<span class="comment">//        int             m_gridBottomOffset;</span></div>
-<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;    DECLARE_EVENT_TABLE()</div>
-<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;};</div>
-<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;<span class="preprocessor">#endif //__FDMDV2_PLOT__</span></div>
+<div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;<span class="preprocessor">#define BLACK_COLOR         wxColor(0x00, 0x00, 0x00)</span></div>
+<div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define GREY_COLOR          wxColor(0x80, 0x80, 0x80)</span></div>
+<div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define DARK_GREY_COLOR     wxColor(0x60, 0x60, 0x60)</span></div>
+<div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define MEDIUM_GREY_COLOR   wxColor(0xC0, 0xC0, 0xC0)</span></div>
+<div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define LIGHT_GREY_COLOR    wxColor(0xE0, 0xE0, 0xE0)</span></div>
+<div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define VERY_LTGREY_COLOR   wxColor(0xF8, 0xF8, 0xF8)</span></div>
+<div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define WHITE_COLOR         wxColor(0xFF, 0xFF, 0xFF)</span></div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;<span class="preprocessor">#define BLUE_COLOR          wxColor(0x00, 0x00, 0xFF)</span></div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define LIGHT_BLUE_COLOR    wxColor(0x80, 0x80, 0xFF)</span></div>
+<div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="preprocessor">#define RED_COLOR           wxColor(0xFF, 0x5E, 0x5E)</span></div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define LIGHT_RED_COLOR     wxColor(0xFF, 0xE0, 0xE0)</span></div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define DARK_RED_COLOR      wxColor(0xFF, 0x00, 0x00)</span></div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define PINK_COLOR          wxColor(0xFF, 0x80, 0xFF)</span></div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;<span class="preprocessor">#define LIGHT_GREEN_COLOR   wxColor(0xE3, 0xFF, 0xE0)</span></div>
+<div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define GREEN_COLOR         wxColor(0x95, 0xFF, 0x8A)</span></div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define DARK_GREEN_COLOR    wxColor(0x20, 0xFF, 0x08)</span></div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define VERY_GREEN_COLOR    wxColor(0x00, 0xFF, 0x00)</span></div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;<span class="preprocessor">#define YELLOW_COLOR        wxColor(0xFF, 0xFF, 0x5E)</span></div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define LIGHT_YELLOW_COLOR  wxColor(0xFF, 0xFF, 0xB5)</span></div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;<span class="preprocessor"></span><span class="preprocessor">#define DARK_YELLOW_COLOR   wxColor(0xFF, 0xFF, 0x08)</span></div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;<span class="preprocessor"></span></div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;<span class="comment">/*</span></div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;<span class="comment">    wxNullBrush</span></div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;<span class="comment">    wxBLACK_BRUSH</span></div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;<span class="comment">    wxBLUE_BRUSH</span></div>
+<div class="line"><a name="l00066"></a><span class="lineno">   66</span>&#160;<span class="comment">    wxCYAN_BRUSH</span></div>
+<div class="line"><a name="l00067"></a><span class="lineno">   67</span>&#160;<span class="comment">    wxGREEN_BRUSH</span></div>
+<div class="line"><a name="l00068"></a><span class="lineno">   68</span>&#160;<span class="comment">    wxYELLOW_BRUSH</span></div>
+<div class="line"><a name="l00069"></a><span class="lineno">   69</span>&#160;<span class="comment">    wxGREY_BRUSH</span></div>
+<div class="line"><a name="l00070"></a><span class="lineno">   70</span>&#160;<span class="comment">    wxLIGHT_GREY_BRUSH</span></div>
+<div class="line"><a name="l00071"></a><span class="lineno">   71</span>&#160;<span class="comment">    wxMEDIUM_GREY_BRUSH</span></div>
+<div class="line"><a name="l00072"></a><span class="lineno">   72</span>&#160;<span class="comment">    wxRED_BRUSH</span></div>
+<div class="line"><a name="l00073"></a><span class="lineno">   73</span>&#160;<span class="comment">    wxTRANSPARENT_BRUSH</span></div>
+<div class="line"><a name="l00074"></a><span class="lineno">   74</span>&#160;<span class="comment">    wxWHITE_BRUSH</span></div>
+<div class="line"><a name="l00075"></a><span class="lineno">   75</span>&#160;<span class="comment">*/</span></div>
+<div class="line"><a name="l00076"></a><span class="lineno">   76</span>&#160;</div>
+<div class="line"><a name="l00077"></a><span class="lineno">   77</span>&#160;<span class="keyword">class </span><a class="code" href="class_main_frame.html">MainFrame</a>;</div>
+<div class="line"><a name="l00078"></a><span class="lineno">   78</span>&#160;</div>
+<div class="line"><a name="l00079"></a><span class="lineno">   79</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
+<div class="line"><a name="l00080"></a><span class="lineno">   80</span>&#160;<span class="comment">// Class PlotPanel</span></div>
+<div class="line"><a name="l00081"></a><span class="lineno">   81</span>&#160;<span class="comment">//</span></div>
+<div class="line"><a name="l00082"></a><span class="lineno">   82</span>&#160;<span class="comment">// @class $(Name)</span></div>
+<div class="line"><a name="l00083"></a><span class="lineno">   83</span>&#160;<span class="comment">// @author $(User)</span></div>
+<div class="line"><a name="l00084"></a><span class="lineno">   84</span>&#160;<span class="comment">// @date $(Date)</span></div>
+<div class="line"><a name="l00085"></a><span class="lineno">   85</span>&#160;<span class="comment">// @file $(CurrentFileName).$(CurrentFileExt)</span></div>
+<div class="line"><a name="l00086"></a><span class="lineno">   86</span>&#160;<span class="comment">// @brief</span></div>
+<div class="line"><a name="l00087"></a><span class="lineno">   87</span>&#160;<span class="comment">//</span></div>
+<div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
+<div class="line"><a name="l00089"></a><span class="lineno"><a class="code" href="class_plot_panel.html">   89</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_plot_panel.html">PlotPanel</a> : <span class="keyword">public</span> wxPanel</div>
+<div class="line"><a name="l00090"></a><span class="lineno">   90</span>&#160;{</div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;    <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;        <a class="code" href="class_plot_panel.html">PlotPanel</a>(wxFrame* parent);</div>
+<div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;        ~<a class="code" href="class_plot_panel.html">PlotPanel</a>();</div>
+<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160;        wxPen               m_penShortDash;</div>
+<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160;        wxPen               m_penDotDash;</div>
+<div class="line"><a name="l00096"></a><span class="lineno">   96</span>&#160;        wxPen               m_penSolid;</div>
+<div class="line"><a name="l00097"></a><span class="lineno">   97</span>&#160;        wxRect              m_rCtrlPrev;</div>
+<div class="line"><a name="l00098"></a><span class="lineno">   98</span>&#160;        wxRect              m_rCtrl;</div>
+<div class="line"><a name="l00099"></a><span class="lineno">   99</span>&#160;        wxRect              m_rGrid;</div>
+<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160;        wxRect              m_rPlot;</div>
+<div class="line"><a name="l00101"></a><span class="lineno">  101</span>&#160;        <a class="code" href="class_main_frame.html">MainFrame</a>           *m_pTopFrame;</div>
+<div class="line"><a name="l00102"></a><span class="lineno">  102</span>&#160;        wxAuiNotebook       *m_pNoteBook;</div>
+<div class="line"><a name="l00103"></a><span class="lineno">  103</span>&#160;        <span class="keywordtype">double</span>              m_label_size;</div>
+<div class="line"><a name="l00104"></a><span class="lineno">  104</span>&#160;        wxSize              m_Bufsz;</div>
+<div class="line"><a name="l00105"></a><span class="lineno">  105</span>&#160;        <span class="keywordtype">bool</span>                m_newdata;</div>
+<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160;        wxBitmap            *m_bmp;</div>
+<div class="line"><a name="l00107"></a><span class="lineno">  107</span>&#160;        wxNativePixelData   *m_pBmp;</div>
+<div class="line"><a name="l00108"></a><span class="lineno">  108</span>&#160;</div>
+<div class="line"><a name="l00109"></a><span class="lineno">  109</span>&#160;        <span class="comment">// some useful events</span></div>
+<div class="line"><a name="l00110"></a><span class="lineno">  110</span>&#160;        <span class="keywordtype">void</span>            OnMouseMove(wxMouseEvent&amp; event);</div>
+<div class="line"><a name="l00111"></a><span class="lineno">  111</span>&#160;        <span class="keywordtype">void</span>            OnMouseDown(wxMouseEvent&amp; event);</div>
+<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160;        <span class="keywordtype">void</span>            OnMouseUp(wxMouseEvent&amp; event);</div>
+<div class="line"><a name="l00113"></a><span class="lineno">  113</span>&#160;        <span class="keywordtype">void</span>            OnMouseWheelMoved(wxMouseEvent&amp; event);</div>
+<div class="line"><a name="l00114"></a><span class="lineno">  114</span>&#160;        <span class="keywordtype">void</span>            OnClose(wxCloseEvent&amp; event ){ <span class="keyword">event</span>.Skip(); }</div>
+<div class="line"><a name="l00115"></a><span class="lineno">  115</span>&#160;        <span class="keywordtype">void</span>            OnSize( wxSizeEvent&amp; event );</div>
+<div class="line"><a name="l00116"></a><span class="lineno">  116</span>&#160;        <span class="keywordtype">void</span>            OnErase(wxEraseEvent&amp; event);</div>
+<div class="line"><a name="l00117"></a><span class="lineno">  117</span>&#160;        <span class="keywordtype">void</span>            OnPaint(wxPaintEvent&amp; event);</div>
+<div class="line"><a name="l00118"></a><span class="lineno">  118</span>&#160;        <span class="comment">//void OnUpdateUI( wxUpdateUIEvent&amp; event ){ event.Skip(); }</span></div>
+<div class="line"><a name="l00119"></a><span class="lineno">  119</span>&#160;</div>
+<div class="line"><a name="l00120"></a><span class="lineno">  120</span>&#160;        <span class="keywordtype">void</span>            paintEvent(wxPaintEvent &amp; evt);</div>
+<div class="line"><a name="l00121"></a><span class="lineno">  121</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">void</span>    draw(wxAutoBufferedPaintDC&amp;  pdc);</div>
+<div class="line"><a name="l00122"></a><span class="lineno">  122</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">void</span>    drawGraticule(wxAutoBufferedPaintDC&amp;  pdc);</div>
+<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">double</span>  SetZoomFactor(<span class="keywordtype">double</span> zf);</div>
+<div class="line"><a name="l00124"></a><span class="lineno">  124</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">double</span>  GetZoomFactor(<span class="keywordtype">double</span> zf);</div>
+<div class="line"><a name="l00125"></a><span class="lineno">  125</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">void</span>    OnShow(wxShowEvent&amp; event);</div>
+<div class="line"><a name="l00126"></a><span class="lineno">  126</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">double</span>  GetLabelSize();</div>
+<div class="line"><a name="l00127"></a><span class="lineno">  127</span>&#160;        <span class="keyword">virtual</span> <span class="keywordtype">void</span>    SetLabelSize(<span class="keywordtype">double</span> size);</div>
+<div class="line"><a name="l00128"></a><span class="lineno">  128</span>&#160;</div>
+<div class="line"><a name="l00129"></a><span class="lineno">  129</span>&#160;    <span class="keyword">protected</span>:</div>
+<div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160;        <span class="keywordtype">int</span>             m_x;</div>
+<div class="line"><a name="l00131"></a><span class="lineno">  131</span>&#160;        <span class="keywordtype">int</span>             m_y;</div>
+<div class="line"><a name="l00132"></a><span class="lineno">  132</span>&#160;<span class="comment">//        int             m_w;</span></div>
+<div class="line"><a name="l00133"></a><span class="lineno">  133</span>&#160;<span class="comment">//        int             m_h;</span></div>
+<div class="line"><a name="l00134"></a><span class="lineno">  134</span>&#160;        <span class="keywordtype">int</span>             m_left;</div>
+<div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;        <span class="keywordtype">int</span>             m_top;</div>
+<div class="line"><a name="l00136"></a><span class="lineno">  136</span>&#160;        <span class="keywordtype">int</span>             m_prev_w;</div>
+<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160;        <span class="keywordtype">int</span>             m_prev_h;</div>
+<div class="line"><a name="l00138"></a><span class="lineno">  138</span>&#160;        <span class="keywordtype">int</span>             m_prev_x;</div>
+<div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;        <span class="keywordtype">int</span>             m_prev_y;</div>
+<div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;        <span class="keywordtype">bool</span>            m_use_bitmap;</div>
+<div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;        <span class="keywordtype">bool</span>            m_clip;</div>
+<div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;        <span class="keywordtype">bool</span>            m_rubberBand;</div>
+<div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;        <span class="keywordtype">bool</span>            m_mouseDown;</div>
+<div class="line"><a name="l00144"></a><span class="lineno">  144</span>&#160;        <span class="keywordtype">bool</span>            m_firstPass;</div>
+<div class="line"><a name="l00145"></a><span class="lineno">  145</span>&#160;        <span class="keywordtype">double</span>          m_zoomFactor;</div>
+<div class="line"><a name="l00146"></a><span class="lineno">  146</span>&#160;    DECLARE_EVENT_TABLE()</div>
+<div class="line"><a name="l00147"></a><span class="lineno">  147</span>&#160;};</div>
+<div class="line"><a name="l00148"></a><span class="lineno">  148</span>&#160;<span class="preprocessor">#endif //__FDMDV2_PLOT__</span></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__scalar_8h_source.html b/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__scalar_8h_source.html
index d6a54c365b60fcfb2968166382f2527402203c6b..b9b969fb124adcbd254248eb2251e8839dafcbfe 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__scalar_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__scalar_8h_source.html
@@ -114,7 +114,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__scatter_8h_source.html b/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__scatter_8h_source.html
index 4452e693871e6ebadb2bc9e9515f00876ec3f5cd..0b0758aa32f74ad28d9d5aa246e2684a84ae28ee 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__scatter_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__scatter_8h_source.html
@@ -106,7 +106,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__spectrum_8h_source.html b/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__spectrum_8h_source.html
index f68f5db8f86766bea0072d47971127f9eacc82b5..3686b31b32c23928fffda591e6c32c4786b7cd26 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__spectrum_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__spectrum_8h_source.html
@@ -103,7 +103,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__waterfall_8h_source.html b/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__waterfall_8h_source.html
index ff40160fe2ea3c4b5bd46006e5ef024f5fd6ab95..e986bad753b73482c3c1bd2c0ad6ddd7f624a482 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__waterfall_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/fdmdv2__plot__waterfall_8h_source.html
@@ -91,32 +91,33 @@
 <div class="line"><a name="l00040"></a><span class="lineno">   40</span>&#160;<span class="comment">//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=</span></div>
 <div class="line"><a name="l00041"></a><span class="lineno"><a class="code" href="class_plot_waterfall.html">   41</a></span>&#160;<span class="keyword">class </span><a class="code" href="class_plot_waterfall.html">PlotWaterfall</a> : <span class="keyword">public</span> <a class="code" href="class_plot_panel.html">PlotPanel</a></div>
 <div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;{</div>
-<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;<span class="keyword">public</span>:</div>
-<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    <a class="code" href="class_plot_waterfall.html">PlotWaterfall</a>(wxFrame* parent);</div>
-<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    ~<a class="code" href="class_plot_waterfall.html">PlotWaterfall</a>();</div>
+<div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    <span class="keyword">public</span>:</div>
+<div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;        <a class="code" href="class_plot_waterfall.html">PlotWaterfall</a>(wxFrame* parent);</div>
+<div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;        ~<a class="code" href="class_plot_waterfall.html">PlotWaterfall</a>();</div>
 <div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;</div>
-<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;<span class="keyword">protected</span>:</div>
-<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;<span class="comment">//    unsigned    *m_pixel_buf;</span></div>
-<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;    <span class="keywordtype">unsigned</span>    m_heatmap_lut[256];</div>
-<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    <span class="keywordtype">int</span>         m_greyscale;</div>
-<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;</div>
-<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;    <span class="keywordtype">unsigned</span>    heatmap(<span class="keywordtype">float</span> val, <span class="keywordtype">float</span> min, <span class="keywordtype">float</span> max);</div>
+<div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    <span class="keyword">protected</span>:</div>
+<div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;    <span class="comment">//    unsigned    *m_pixel_buf;</span></div>
+<div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;        <span class="keywordtype">unsigned</span>    m_heatmap_lut[256];</div>
+<div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;        <span class="keywordtype">int</span>         m_greyscale;</div>
+<div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;        wxMemoryDC  m_mDC;</div>
+<div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;        <span class="keywordtype">int</span>         m_line_color;</div>
 <div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;</div>
-<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;    <span class="keywordtype">void</span>        OnPaint(wxPaintEvent &amp; evt);</div>
-<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    <span class="keywordtype">void</span>        OnSize(wxSizeEvent&amp; event);</div>
-<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    <span class="keywordtype">void</span>        OnShow(wxShowEvent&amp; event);</div>
-<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;    <span class="keywordtype">void</span>        drawGraticule(wxAutoBufferedPaintDC&amp;  dc);</div>
-<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    <span class="keywordtype">void</span>        draw(wxAutoBufferedPaintDC&amp;  dc);</div>
-<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    <span class="keywordtype">void</span>        plotData(wxAutoBufferedPaintDC&amp;  dc);</div>
-<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;    <span class="keywordtype">void</span>        plotPixelData(wxAutoBufferedPaintDC&amp;  dc);</div>
-<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    DECLARE_EVENT_TABLE()</div>
-<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;};</div>
-<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;</div>
-<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;<span class="preprocessor">#endif //__FDMDV2_PLOT_WATERFALL__</span></div>
+<div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;        <span class="keywordtype">unsigned</span>    heatmap(<span class="keywordtype">float</span> val, <span class="keywordtype">float</span> min, <span class="keywordtype">float</span> max);</div>
+<div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;</div>
+<div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;        <span class="keywordtype">void</span>        OnPaint(wxPaintEvent &amp; evt);</div>
+<div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;        <span class="comment">//void        OnSize(wxSizeEvent&amp; event);</span></div>
+<div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;        <span class="keywordtype">void</span>        OnShow(wxShowEvent&amp; event);</div>
+<div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;        <span class="keywordtype">void</span>        drawGraticule(wxAutoBufferedPaintDC&amp;  dc);</div>
+<div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;        <span class="keywordtype">void</span>        draw(wxAutoBufferedPaintDC&amp; pdc);</div>
+<div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;        <span class="keywordtype">void</span>        plotPixelData(wxAutoBufferedPaintDC&amp;  dc);</div>
+<div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;        DECLARE_EVENT_TABLE()</div>
+<div class="line"><a name="l00063"></a><span class="lineno">   63</span>&#160;};</div>
+<div class="line"><a name="l00064"></a><span class="lineno">   64</span>&#160;</div>
+<div class="line"><a name="l00065"></a><span class="lineno">   65</span>&#160;<span class="preprocessor">#endif //__FDMDV2_PLOT_WATERFALL__</span></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/files.html b/fdmdv2/fdmdv2-doc/html/files.html
index f96c29a796c251ba0ade1d639db2b3a31dee0373..d0653b0313480332e60375cff7ba29b05dca17c8 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/files.html
+++ b/fdmdv2/fdmdv2-doc/html/files.html
@@ -48,27 +48,26 @@
 <div class="textblock">Here is a list of all documented files with brief descriptions:</div><div class="directory">
 <div class="levels">[detail level <span onclick="javascript:toggleLevel(1);">1</span><span onclick="javascript:toggleLevel(2);">2</span>]</div><table class="directory">
 <tr id="row_0_" class="even"><td class="entry"><img id="arr_0_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('0_')"/><img id="img_0_" src="ftv2folderopen.png" alt="-" width="24" height="22" onclick="toggleFolder('0_')"/><a class="el" href="dir_68267d1309a1af8e8297ef4c3efbcdba.html" target="_self">src</a></td><td class="desc"></td></tr>
-<tr id="row_0_0_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="audiostream_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>audiostream.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_1_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="comp_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>comp.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_2_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="dlg__about_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>dlg_about.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_3_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="dlg__audio_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>dlg_audio.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_4_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="dlg__comports_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>dlg_comports.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_5_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="dlg__options_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>dlg_options.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_6_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__defines_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_defines.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_7_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__main_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_main.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_8_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__pa__wrapper_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_pa_wrapper.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_9_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__plot_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_plot.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_10_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__plot__scalar_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_plot_scalar.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_11_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__plot__scatter_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_plot_scatter.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_12_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__plot__spectrum_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_plot_spectrum.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_13_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__plot__waterfall_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_plot_waterfall.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_14_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><a href="top_frame_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>topFrame.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_0_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="comp_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>comp.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_1_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="dlg__about_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>dlg_about.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_2_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="dlg__audio_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>dlg_audio.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_3_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="dlg__comports_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>dlg_comports.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_4_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="dlg__options_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>dlg_options.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_5_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__defines_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_defines.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_6_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__main_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_main.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_7_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__pa__wrapper_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_pa_wrapper.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_8_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__plot_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_plot.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_9_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__plot__scalar_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_plot_scalar.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_10_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__plot__scatter_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_plot_scatter.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_11_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__plot__spectrum_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_plot_spectrum.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_12_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><a href="fdmdv2__plot__waterfall_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>fdmdv2_plot_waterfall.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_13_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><a href="top_frame_8h_source.html"><img src="ftv2doc.png" alt="*" width="24" height="22" /></a><b>topFrame.h</b></td><td class="desc"></td></tr>
 </table>
 </div><!-- directory -->
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/functions.html b/fdmdv2/fdmdv2-doc/html/functions.html
index 81efee2860e6188e4620da059337b6bd40011f5d..26fd9558445507418c5907f367aefebfcbdcf3f8 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/functions.html
+++ b/fdmdv2/fdmdv2-doc/html/functions.html
@@ -67,7 +67,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/functions_func.html b/fdmdv2/fdmdv2-doc/html/functions_func.html
index fbf3a019dd21466c2204186ddc94a95404c17c83..969d309ff4367cd41945a87c66de47719f6fd5fd 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/functions_func.html
+++ b/fdmdv2/fdmdv2-doc/html/functions_func.html
@@ -67,7 +67,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/graph_legend.html b/fdmdv2/fdmdv2-doc/html/graph_legend.html
index 149952609623f55fdda4d94ee2c9c55bab753265..67927b94a723b0f677c7bc51707b68e9c1dfe9b5 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/graph_legend.html
+++ b/fdmdv2/fdmdv2-doc/html/graph_legend.html
@@ -107,7 +107,7 @@ A yellow dashed arrow denotes a relation between a template instance and the tem
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/hierarchy.html b/fdmdv2/fdmdv2-doc/html/hierarchy.html
index 95ed6f3d0e6b74423068833e2f302ad85a03762a..142f298fe24c524764e5144c6f26ad4e9449dd71 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/hierarchy.html
+++ b/fdmdv2/fdmdv2-doc/html/hierarchy.html
@@ -52,36 +52,35 @@
 <p><a href="inherits.html">Go to the graphical class hierarchy</a></p>
 This inheritance list is sorted roughly, but not completely, alphabetically:</div><div class="directory">
 <div class="levels">[detail level <span onclick="javascript:toggleLevel(1);">1</span><span onclick="javascript:toggleLevel(2);">2</span><span onclick="javascript:toggleLevel(3);">3</span>]</div><table class="directory">
-<tr id="row_0_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_audio_stream.html" target="_self">AudioStream</a></td><td class="desc"></td></tr>
-<tr id="row_1_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_c_o_m_p.html" target="_self">COMP</a></td><td class="desc"></td></tr>
-<tr id="row_2_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structpa_call_back_data.html" target="_self">paCallBackData</a></td><td class="desc"></td></tr>
-<tr id="row_3_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_port_audio_wrap.html" target="_self">PortAudioWrap</a></td><td class="desc"></td></tr>
-<tr id="row_4_" class="even"><td class="entry"><img id="arr_4_" src="ftv2mnode.png" alt="o" width="16" height="22" onclick="toggleFolder('4_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><b>wxApp</b></td><td class="desc"></td></tr>
-<tr id="row_4_0_"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_main_app.html" target="_self">MainApp</a></td><td class="desc"></td></tr>
-<tr id="row_5_" class="even"><td class="entry"><img id="arr_5_" src="ftv2mnode.png" alt="o" width="16" height="22" onclick="toggleFolder('5_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><b>wxDialog</b></td><td class="desc"></td></tr>
-<tr id="row_5_0_"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img id="arr_5_0_" src="ftv2mnode.png" alt="o" width="16" height="22" onclick="toggleFolder('5_0_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_about.html" target="_self">DlgAbout</a></td><td class="desc"></td></tr>
-<tr id="row_5_0_0_" class="even"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_about_dlg.html" target="_self">AboutDlg</a></td><td class="desc"></td></tr>
-<tr id="row_5_1_"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img id="arr_5_1_" src="ftv2mnode.png" alt="o" width="16" height="22" onclick="toggleFolder('5_1_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_audio.html" target="_self">DlgAudio</a></td><td class="desc"></td></tr>
-<tr id="row_5_1_0_" class="even"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_audio_dlg.html" target="_self">AudioDlg</a></td><td class="desc"></td></tr>
-<tr id="row_5_2_"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img id="arr_5_2_" src="ftv2mnode.png" alt="o" width="16" height="22" onclick="toggleFolder('5_2_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_com_ports.html" target="_self">DlgComPorts</a></td><td class="desc"></td></tr>
-<tr id="row_5_2_0_" class="even"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_com_ports_dlg.html" target="_self">ComPortsDlg</a></td><td class="desc"></td></tr>
-<tr id="row_5_3_"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img id="arr_5_3_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('5_3_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_options.html" target="_self">DlgOptions</a></td><td class="desc"></td></tr>
-<tr id="row_5_3_0_" class="even"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_options_dlg.html" target="_self">OptionsDlg</a></td><td class="desc"></td></tr>
-<tr id="row_6_"><td class="entry"><img id="arr_6_" src="ftv2mnode.png" alt="o" width="16" height="22" onclick="toggleFolder('6_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><b>wxFrame</b></td><td class="desc"></td></tr>
-<tr id="row_6_0_" class="even"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img id="arr_6_0_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('6_0_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_top_frame.html" target="_self">TopFrame</a></td><td class="desc"></td></tr>
-<tr id="row_6_0_0_"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_main_frame.html" target="_self">MainFrame</a></td><td class="desc"></td></tr>
-<tr id="row_7_" class="even"><td class="entry"><img id="arr_7_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('7_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><b>wxPanel</b></td><td class="desc"></td></tr>
-<tr id="row_7_0_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img id="arr_7_0_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('7_0_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_panel.html" target="_self">PlotPanel</a></td><td class="desc"></td></tr>
-<tr id="row_7_0_0_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_scalar.html" target="_self">PlotScalar</a></td><td class="desc"></td></tr>
-<tr id="row_7_0_1_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_scatter.html" target="_self">PlotScatter</a></td><td class="desc"></td></tr>
-<tr id="row_7_0_2_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_spectrum.html" target="_self">PlotSpectrum</a></td><td class="desc"></td></tr>
-<tr id="row_7_0_3_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_waterfall.html" target="_self">PlotWaterfall</a></td><td class="desc"></td></tr>
+<tr id="row_0_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct_c_o_m_p.html" target="_self">COMP</a></td><td class="desc"></td></tr>
+<tr id="row_1_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structpa_call_back_data.html" target="_self">paCallBackData</a></td><td class="desc"></td></tr>
+<tr id="row_2_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_port_audio_wrap.html" target="_self">PortAudioWrap</a></td><td class="desc"></td></tr>
+<tr id="row_3_"><td class="entry"><img id="arr_3_" src="ftv2mnode.png" alt="o" width="16" height="22" onclick="toggleFolder('3_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><b>wxApp</b></td><td class="desc"></td></tr>
+<tr id="row_3_0_" class="even"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_main_app.html" target="_self">MainApp</a></td><td class="desc"></td></tr>
+<tr id="row_4_"><td class="entry"><img id="arr_4_" src="ftv2mnode.png" alt="o" width="16" height="22" onclick="toggleFolder('4_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><b>wxDialog</b></td><td class="desc"></td></tr>
+<tr id="row_4_0_" class="even"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img id="arr_4_0_" src="ftv2mnode.png" alt="o" width="16" height="22" onclick="toggleFolder('4_0_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_about.html" target="_self">DlgAbout</a></td><td class="desc"></td></tr>
+<tr id="row_4_0_0_"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_about_dlg.html" target="_self">AboutDlg</a></td><td class="desc"></td></tr>
+<tr id="row_4_1_" class="even"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img id="arr_4_1_" src="ftv2mnode.png" alt="o" width="16" height="22" onclick="toggleFolder('4_1_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_audio.html" target="_self">DlgAudio</a></td><td class="desc"></td></tr>
+<tr id="row_4_1_0_"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_audio_dlg.html" target="_self">AudioDlg</a></td><td class="desc"></td></tr>
+<tr id="row_4_2_" class="even"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img id="arr_4_2_" src="ftv2mnode.png" alt="o" width="16" height="22" onclick="toggleFolder('4_2_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_com_ports.html" target="_self">DlgComPorts</a></td><td class="desc"></td></tr>
+<tr id="row_4_2_0_"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_com_ports_dlg.html" target="_self">ComPortsDlg</a></td><td class="desc"></td></tr>
+<tr id="row_4_3_" class="even"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img id="arr_4_3_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('4_3_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_dlg_options.html" target="_self">DlgOptions</a></td><td class="desc"></td></tr>
+<tr id="row_4_3_0_"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_options_dlg.html" target="_self">OptionsDlg</a></td><td class="desc"></td></tr>
+<tr id="row_5_" class="even"><td class="entry"><img id="arr_5_" src="ftv2mnode.png" alt="o" width="16" height="22" onclick="toggleFolder('5_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><b>wxFrame</b></td><td class="desc"></td></tr>
+<tr id="row_5_0_"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img id="arr_5_0_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('5_0_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_top_frame.html" target="_self">TopFrame</a></td><td class="desc"></td></tr>
+<tr id="row_5_0_0_" class="even"><td class="entry"><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_main_frame.html" target="_self">MainFrame</a></td><td class="desc"></td></tr>
+<tr id="row_6_"><td class="entry"><img id="arr_6_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('6_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><b>wxPanel</b></td><td class="desc"></td></tr>
+<tr id="row_6_0_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img id="arr_6_0_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('6_0_')"/><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_panel.html" target="_self">PlotPanel</a></td><td class="desc"></td></tr>
+<tr id="row_6_0_0_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_scalar.html" target="_self">PlotScalar</a></td><td class="desc"></td></tr>
+<tr id="row_6_0_1_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_scatter.html" target="_self">PlotScatter</a></td><td class="desc"></td></tr>
+<tr id="row_6_0_2_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_spectrum.html" target="_self">PlotSpectrum</a></td><td class="desc"></td></tr>
+<tr id="row_6_0_3_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="class_plot_waterfall.html" target="_self">PlotWaterfall</a></td><td class="desc"></td></tr>
 </table>
 </div><!-- directory -->
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/index.hhc b/fdmdv2/fdmdv2-doc/html/index.hhc
index 3a510bb4609e9c90f43eab18718f704fac394f4a..8519420e8243303bd48be6a74a08e224e3e618a0 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/index.hhc
+++ b/fdmdv2/fdmdv2-doc/html/index.hhc
@@ -28,12 +28,6 @@
       <LI><OBJECT type="text/sitemap"><param name="Name" value="populateAudioInfo"><param name="Local" value="class_audio_dlg.html#ad1acb1d52175795d265d7adcafc10316"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="populateStandardSampleRates"><param name="Local" value="class_audio_dlg.html#a194ed3fb219d7a93824884015e625fe8"><param name="ImageNumber" value="11"></OBJECT>
       </UL>
-    <LI><OBJECT type="text/sitemap"><param name="Name" value="AudioStream"><param name="Local" value="class_audio_stream.html"><param name="ImageNumber" value="1"></OBJECT>
-      <UL>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="AudioStream"><param name="Local" value="class_audio_stream.html#a1e253941ff189daa6ae1ebdd4658b943"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="~AudioStream"><param name="Local" value="class_audio_stream.html#a480e5d3468bfe9357dd6c40649b1e449"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="generate"><param name="Local" value="class_audio_stream.html#a1abd5e1c5f7fe05fc66c52603818fc5f"><param name="ImageNumber" value="11"></OBJECT>
-      </UL>
     <LI><OBJECT type="text/sitemap"><param name="Name" value="COMP"><param name="Local" value="struct_c_o_m_p.html"><param name="ImageNumber" value="1"></OBJECT>
       <UL>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="imag"><param name="Local" value="struct_c_o_m_p.html#a8c292c732f8928c23921da6512699bba"><param name="ImageNumber" value="11"></OBJECT>
@@ -136,8 +130,10 @@
       </UL>
     <LI><OBJECT type="text/sitemap"><param name="Name" value="MainApp"><param name="Local" value="class_main_app.html"><param name="ImageNumber" value="1"></OBJECT>
       <UL>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="loadConfig"><param name="Local" value="class_main_app.html#af06cc098b89d1c606aa94ad87d6b0105"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnExit"><param name="Local" value="class_main_app.html#aff49a6bb4a0494d717a3136e9fe17351"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnInit"><param name="Local" value="class_main_app.html#aff3d398e1b61f1016c37d57798f86731"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="g_config"><param name="Local" value="class_main_app.html#ae6022a31caf96dbcc2f519fc5fdc0bbe"><param name="ImageNumber" value="11"></OBJECT>
       </UL>
     <LI><OBJECT type="text/sitemap"><param name="Name" value="MainFrame"><param name="Local" value="class_main_frame.html"><param name="ImageNumber" value="1"></OBJECT>
       <UL>
@@ -145,6 +141,7 @@
       <LI><OBJECT type="text/sitemap"><param name="Name" value="~MainFrame"><param name="Local" value="class_main_frame.html#a0cfd88ece4836e0ea5430bd55370bf11"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="abortRxStream"><param name="Local" value="class_main_frame.html#a44e48d93613d91be1db586553466feac"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="abortTxStream"><param name="Local" value="class_main_frame.html#abbe36f1aac14dba091ab0ec0c6ef2936"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="averageData"><param name="Local" value="class_main_frame.html#a31585b905eee875973b106f4e79c263f"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="LoadUserImage"><param name="Local" value="class_main_frame.html#a2577b78ec0105922e5356287519d2e54"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnCaptureRxStream"><param name="Local" value="class_main_frame.html#a29cacc38a66c9e000f7f512ebf14473b"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnCaptureTxStream"><param name="Local" value="class_main_frame.html#ac4bb829b48fa6e931098436e87c5fd8c"><param name="ImageNumber" value="11"></OBJECT>
@@ -175,6 +172,7 @@
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnSize"><param name="Local" value="class_main_frame.html#a8fd9580d3191784843f34269810a676b"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnSliderScrollBottom"><param name="Local" value="class_main_frame.html#aeda570594ad6ca298ade6b2dec5812c4"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnSliderScrollTop"><param name="Local" value="class_main_frame.html#af7e0da6a850c5f08fd726280b7dc0af4"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="OnTimer"><param name="Local" value="class_main_frame.html#a9ad22e55c7a3c93f9c071d366ae760d6"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnTogBtnALCClick"><param name="Local" value="class_main_frame.html#ab1371babf6ebc9e24211a3ada34ab666"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnTogBtnAnalogClick"><param name="Local" value="class_main_frame.html#af237b0cdbd857d4cc72f5a523457eb82"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnTogBtnOnOff"><param name="Local" value="class_main_frame.html#a7fc4afa20b92ac8e5f1ddfcf86820f28"><param name="ImageNumber" value="11"></OBJECT>
@@ -189,6 +187,7 @@
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnToolsOptions"><param name="Local" value="class_main_frame.html#a82b97e0f3c4e530d5700b2c2dbac42bf"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnToolsOptionsUI"><param name="Local" value="class_main_frame.html#ac7ceb1e047f2f3b0c26c0b42a110fe99"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnUpdateUI"><param name="Local" value="class_main_frame.html#a4757c5d7d0e9b2c98dc34336f1dce49e"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="per_frame_rx_processing"><param name="Local" value="class_main_frame.html#af9f4cfb8469872efd9c057d1bc215f08"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="rxCallback"><param name="Local" value="class_main_frame.html#a45e054e7f42f10088a699821a169d295"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="startRxStream"><param name="Local" value="class_main_frame.html#ad17245c1c9c295fc216fc6615f31e0a5"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="startTxStream"><param name="Local" value="class_main_frame.html#af01eb2c59f1a9bcee0b956f8a72004c0"><param name="ImageNumber" value="11"></OBJECT>
@@ -200,6 +199,8 @@
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_panelScatter"><param name="Local" value="class_main_frame.html#ada5dd6fc66036782c19f12175793da13"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_panelSpectrum"><param name="Local" value="class_main_frame.html#a3fc0fe9ca321814476397cb32476e40c"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_panelWaterfall"><param name="Local" value="class_main_frame.html#a6f0fa80dd24e33f0d32228ac73418882"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_pFDMDV_state"><param name="Local" value="class_main_frame.html#aae86bcc3a14e94ddc496b9cce6a63c56"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_plotTimer"><param name="Local" value="class_main_frame.html#aabe58bef730ca69b342f8ac663c3d70d"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_RXCodec2"><param name="Local" value="class_main_frame.html#ad6f8ae2f867f69dd69a2b58ad0b26ccb"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_rxDevIn"><param name="Local" value="class_main_frame.html#ab9d54920598f48bdbfa67161b3167b11"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_rxDevOut"><param name="Local" value="class_main_frame.html#aa73d0adbbf4fe9f2d14778ad1474a3d3"><param name="ImageNumber" value="11"></OBJECT>
@@ -230,8 +231,8 @@
       <UL>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="PlotPanel"><param name="Local" value="class_plot_panel.html#a27892db4859ae9afca652f4175a7f88c"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="~PlotPanel"><param name="Local" value="class_plot_panel.html#a956d38d1f35d70f90b6399acfcd0f38d"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="draw"><param name="Local" value="class_plot_panel.html#a5f35a9628a035ef904fb056f5ebcc3c3"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="drawGraticule"><param name="Local" value="class_plot_panel.html#ac9a8cc0d4ab016dc22195b813643c675"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="draw"><param name="Local" value="class_plot_panel.html#a974601747a67a4637a3a133cefe70c13"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="drawGraticule"><param name="Local" value="class_plot_panel.html#a5444b418c756380e5e08f86a34615be3"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="GetLabelSize"><param name="Local" value="class_plot_panel.html#a539ab140f79c5cff29031aa312a9f159"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="GetZoomFactor"><param name="Local" value="class_plot_panel.html#a6f6ef3db5a4b4f6cb50d92a38fa36dbd"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnClose"><param name="Local" value="class_plot_panel.html#adb48aa0b95cd2e744795881146ca3563"><param name="ImageNumber" value="11"></OBJECT>
@@ -249,7 +250,7 @@
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_bmp"><param name="Local" value="class_plot_panel.html#a8cf01c846dc561a79c0d1dee88a80ef4"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_Bufsz"><param name="Local" value="class_plot_panel.html#a61a49a35721e334b959e833464add15f"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_clip"><param name="Local" value="class_plot_panel.html#a07334de87de07eeab43eabbdaf730ab5"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_h"><param name="Local" value="class_plot_panel.html#adcc3cec53897df2c9e99a980938092c1"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_firstPass"><param name="Local" value="class_plot_panel.html#a1bb0714da68ee75a51a4ebb9e9ea3cad"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_label_size"><param name="Local" value="class_plot_panel.html#a00eb5aef94866f0f385fcf793cb841b6"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_left"><param name="Local" value="class_plot_panel.html#ab41676a2e46c2e801bc639c274a7d5f5"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_mouseDown"><param name="Local" value="class_plot_panel.html#acebe9485868374626f03516e3508b592"><param name="ImageNumber" value="11"></OBJECT>
@@ -264,13 +265,13 @@
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_prev_x"><param name="Local" value="class_plot_panel.html#ab38a4323755a529cbdab28a5854ffc06"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_prev_y"><param name="Local" value="class_plot_panel.html#a2e1ea18bbea07dd04acc76567a993070"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_pTopFrame"><param name="Local" value="class_plot_panel.html#ad28637582a93843082fc7b1d8d80c807"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_rectCtrl"><param name="Local" value="class_plot_panel.html#ad1cfa169df1cfa5ef798b57d2619d742"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_rectGrid"><param name="Local" value="class_plot_panel.html#a467e202bbd0fa3ef1997fa2b322e349d"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_rectPlot"><param name="Local" value="class_plot_panel.html#afcee74e089f5a50659bb534db80532d9"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_rCtrl"><param name="Local" value="class_plot_panel.html#a2c10cfe6bcd979613cec037a71ba2c94"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_rCtrlPrev"><param name="Local" value="class_plot_panel.html#aef7e50cc8a27b9434d17d7d8c245606c"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_rGrid"><param name="Local" value="class_plot_panel.html#ae8d79eab28220ea1fa8ffcbfd70bc84a"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_rPlot"><param name="Local" value="class_plot_panel.html#aa4d6249f2f09d03682b8fa704be04548"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_rubberBand"><param name="Local" value="class_plot_panel.html#a7182715e509f98f42e78210d324fe042"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_top"><param name="Local" value="class_plot_panel.html#a8c49969c560b64902272347835f151a0"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_use_bitmap"><param name="Local" value="class_plot_panel.html#a20336cef42ecb91f0fd1f9af1f70ba43"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_w"><param name="Local" value="class_plot_panel.html#ae78b6e7fc3e44bea81809813d753125c"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_x"><param name="Local" value="class_plot_panel.html#abd0a64bd20aec2e300e383abfd60315d"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_y"><param name="Local" value="class_plot_panel.html#a822981fef8ff50da327b3dbca9fd2777"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_zoomFactor"><param name="Local" value="class_plot_panel.html#ae2f4907a8e4ed958ef4995e99b1f7148"><param name="ImageNumber" value="11"></OBJECT>
@@ -318,16 +319,16 @@
       <UL>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="PlotWaterfall"><param name="Local" value="class_plot_waterfall.html#ab8cb1de06d17616f05ab872923563167"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="~PlotWaterfall"><param name="Local" value="class_plot_waterfall.html#a88df0c144df49b4e8d6a72a8e3a6099d"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="draw"><param name="Local" value="class_plot_waterfall.html#a3956d17d4ece2c0ca4d50b6f7002b24c"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="draw"><param name="Local" value="class_plot_waterfall.html#a86c6b3a9dc720b681f7b4e47d1fe193d"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="drawGraticule"><param name="Local" value="class_plot_waterfall.html#aa97d243b7bb91238b7493dcb96139803"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="heatmap"><param name="Local" value="class_plot_waterfall.html#a9258386bf42d94ddda768e4e767a77aa"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnPaint"><param name="Local" value="class_plot_waterfall.html#a37d541349ac6f010a90fee3b9f32fbbb"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="OnShow"><param name="Local" value="class_plot_waterfall.html#ad55e0e3078f0d5c3699df36ba6d8ab5d"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="OnSize"><param name="Local" value="class_plot_waterfall.html#adae15df2acf8dd7a1812ea79b2708b65"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="plotData"><param name="Local" value="class_plot_waterfall.html#ae19ead564f66f723b7192dbb2bd5815b"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="plotPixelData"><param name="Local" value="class_plot_waterfall.html#aec560c10f32a6c6e92a62225288c28f3"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_greyscale"><param name="Local" value="class_plot_waterfall.html#a1cb3639849f17b1882b2b3713fd690cf"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="m_heatmap_lut"><param name="Local" value="class_plot_waterfall.html#aae04482318331ac760954376f23a1e3c"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_line_color"><param name="Local" value="class_plot_waterfall.html#aa0b8f5bb510697a7eb8f48628a39b9c7"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="m_mDC"><param name="Local" value="class_plot_waterfall.html#a1b80aa40a1194ece27c87ec265ef7d2c"><param name="ImageNumber" value="11"></OBJECT>
       </UL>
     <LI><OBJECT type="text/sitemap"><param name="Name" value="PortAudioWrap"><param name="Local" value="class_port_audio_wrap.html"><param name="ImageNumber" value="1"></OBJECT>
       <UL>
@@ -335,6 +336,7 @@
       <LI><OBJECT type="text/sitemap"><param name="Name" value="~PortAudioWrap"><param name="Local" value="class_port_audio_wrap.html#ad65d5940f33e2fa15069aa15816d1582"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="abort"><param name="Local" value="class_port_audio_wrap.html#a22409ee2e9d87fbab60ef71288620c34"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="averageData"><param name="Local" value="class_port_audio_wrap.html#a987405b6ca5fbecb33ac69ddfe843659"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="getDataAvail"><param name="Local" value="class_port_audio_wrap.html#afd5fd9f501e93f712e46b0d805b57493"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="getDefaultInputDevice"><param name="Local" value="class_port_audio_wrap.html#a2a122bf5de62e7f1fb1bfed6801e063c"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="getDefaultOutputDevice"><param name="Local" value="class_port_audio_wrap.html#a8cde3f5f6f312fbd8c0ad60619d617ad"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="getDeviceInfo"><param name="Local" value="class_port_audio_wrap.html#a246ec79a44d879a74d6afe3e1005bc00"><param name="ImageNumber" value="11"></OBJECT>
@@ -355,8 +357,7 @@
       <LI><OBJECT type="text/sitemap"><param name="Name" value="isOpen"><param name="Local" value="class_port_audio_wrap.html#ad4a72bbe2ec6190336c2412df076c3f7"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="isStopped"><param name="Local" value="class_port_audio_wrap.html#ae0bac2f93270a323c9ead4dbf61eda1d"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="loadData"><param name="Local" value="class_port_audio_wrap.html#aa5776602a5e021fe3c83c1cdf36340d1"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="per_frame_rx_processing"><param name="Local" value="class_port_audio_wrap.html#a4af13f96f4f8639148668c89942b3365"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="setCallback"><param name="Local" value="class_port_audio_wrap.html#a7b455cc4397b90c6d381c26073e51b2a"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="setCallback"><param name="Local" value="class_port_audio_wrap.html#a2a40702f7b56abb4b6927fb6493db92e"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="setFdmdvState"><param name="Local" value="class_port_audio_wrap.html#a65d6263d05a44f6696a3eb93a669e862"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="setFramesPerBuffer"><param name="Local" value="class_port_audio_wrap.html#a34ec7a96cbe5859f4a6aba6cb4b508cf"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="setInputBuffer"><param name="Local" value="class_port_audio_wrap.html#a132273a300efd015cf3d66ee5b250216"><param name="ImageNumber" value="11"></OBJECT>
@@ -373,12 +374,8 @@
       <LI><OBJECT type="text/sitemap"><param name="Name" value="setOutputLatency"><param name="Local" value="class_port_audio_wrap.html#a619ad8a126e30b328468a57c8047f2f8"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="setOutputSampleFormat"><param name="Local" value="class_port_audio_wrap.html#a342018893c092acac26509351b45602f"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="setSampleRate"><param name="Local" value="class_port_audio_wrap.html#a7245832a8cafbc8d140a51e106838fbb"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="setSamplerate"><param name="Local" value="class_port_audio_wrap.html#a20f5cf508b5e13bd29632acb1af52d26"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="setStatusFlags"><param name="Local" value="class_port_audio_wrap.html#ad2c8ee53c0f11504777d1dc41747b453"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="setStream"><param name="Local" value="class_port_audio_wrap.html#a8f18f16ddf796eba036e11694b25a2a4"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="setStreamCallback"><param name="Local" value="class_port_audio_wrap.html#adf02f262bcd9f85c33fea7da0e4cd841"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="setStreamFinishedCallback"><param name="Local" value="class_port_audio_wrap.html#a163f9ff1095444793a25f1e90442b32c"><param name="ImageNumber" value="11"></OBJECT>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="setStreamFinishedCallback"><param name="Local" value="class_port_audio_wrap.html#a13581d19c503fc1a837078c31d80df11"><param name="ImageNumber" value="11"></OBJECT>
+      <LI><OBJECT type="text/sitemap"><param name="Name" value="setStreamFinishedCallback"><param name="Local" value="class_port_audio_wrap.html#a85e2c0e5700cacd09a330cd6573cff7d"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="setStreamFlags"><param name="Local" value="class_port_audio_wrap.html#a47fe0dd437c0a4693824966e7100255a"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="setTimeInfo"><param name="Local" value="class_port_audio_wrap.html#a4d2bb7132714099aa2a0390f11a57ce6"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="setUserData"><param name="Local" value="class_port_audio_wrap.html#a2bac5a36a40fd1f86df5c1f94e964ac4"><param name="ImageNumber" value="11"></OBJECT>
@@ -459,7 +456,6 @@
   <LI><OBJECT type="text/sitemap"><param name="Name" value="Class Index"><param name="Local" value="classes.html"><param name="ImageNumber" value="11"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Name" value="Class Hierarchy"><param name="Local" value="hierarchy.html"><param name="ImageNumber" value="1"></OBJECT>
     <UL>
-    <LI><OBJECT type="text/sitemap"><param name="Name" value="AudioStream"><param name="Local" value="class_audio_stream.html"><param name="ImageNumber" value="11"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Name" value="COMP"><param name="Local" value="struct_c_o_m_p.html"><param name="ImageNumber" value="11"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Name" value="paCallBackData"><param name="Local" value="structpa_call_back_data.html"><param name="ImageNumber" value="11"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Name" value="PortAudioWrap"><param name="Local" value="class_port_audio_wrap.html"><param name="ImageNumber" value="11"></OBJECT>
@@ -516,7 +512,6 @@
     <UL>
     <LI><OBJECT type="text/sitemap"><param name="Name" value="src"><param name="Local" value="dir_68267d1309a1af8e8297ef4c3efbcdba.html"><param name="ImageNumber" value="1"></OBJECT>
       <UL>
-      <LI><OBJECT type="text/sitemap"><param name="Name" value="audiostream.h"><param name="Local" value="audiostream_8h_source.html"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="comp.h"><param name="Local" value="comp_8h_source.html"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="dlg_about.h"><param name="Local" value="dlg__about_8h_source.html"><param name="ImageNumber" value="11"></OBJECT>
       <LI><OBJECT type="text/sitemap"><param name="Name" value="dlg_audio.h"><param name="Local" value="dlg__audio_8h_source.html"><param name="ImageNumber" value="11"></OBJECT>

diff --git a/fdmdv2/fdmdv2-doc/html/index.hhk b/fdmdv2/fdmdv2-doc/html/index.hhk
index 0d1e3af7e2c6243c29ff4e3fb985f82dbe25229f..693f0b646207a7ad087ad8688f0ad1eedd225e5d 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/index.hhk
+++ b/fdmdv2/fdmdv2-doc/html/index.hhk
@@ -29,12 +29,11 @@
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_audio_dlg.html#ad1acb1d52175795d265d7adcafc10316"><param name="Name" value="populateAudioInfo"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_audio_dlg.html#a194ed3fb219d7a93824884015e625fe8"><param name="Name" value="populateStandardSampleRates"></OBJECT>
   </UL>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_audio_stream.html"><param name="Name" value="AudioStream"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a31585b905eee875973b106f4e79c263f"><param name="Name" value="averageData"></OBJECT>
   <UL>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_audio_stream.html#a1e253941ff189daa6ae1ebdd4658b943"><param name="Name" value="AudioStream"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_audio_stream.html#a1abd5e1c5f7fe05fc66c52603818fc5f"><param name="Name" value="generate"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a31585b905eee875973b106f4e79c263f"><param name="Name" value="MainFrame"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a987405b6ca5fbecb33ac69ddfe843659"><param name="Name" value="PortAudioWrap"></OBJECT>
   </UL>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a987405b6ca5fbecb33ac69ddfe843659"><param name="Name" value="averageData"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_scalar.html#ad2c5214849ba51b85c61e5ed1949b28e"><param name="Name" value="clip"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="struct_c_o_m_p.html"><param name="Name" value="COMP"></OBJECT>
   <UL>
@@ -132,23 +131,24 @@
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_dlg_options.html#aad6cf9d439aced63416da6dc04f326d7"><param name="Name" value="OnClose"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_dlg_options.html#ab293c5e4e64e5d2de1b9d1ee67e3a448"><param name="Name" value="OnInitDialog"></OBJECT>
   </UL>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a5f35a9628a035ef904fb056f5ebcc3c3"><param name="Name" value="draw"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a974601747a67a4637a3a133cefe70c13"><param name="Name" value="draw"></OBJECT>
   <UL>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a5f35a9628a035ef904fb056f5ebcc3c3"><param name="Name" value="PlotPanel"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a974601747a67a4637a3a133cefe70c13"><param name="Name" value="PlotPanel"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_scalar.html#aa901215be79b5a522c416224c6554cf3"><param name="Name" value="PlotScalar"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_scatter.html#aee86ff1a62c9f5131a9e2901078143d6"><param name="Name" value="PlotScatter"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_spectrum.html#aeab5798a4f3bd55bd69045cc7b817d48"><param name="Name" value="PlotSpectrum"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#a3956d17d4ece2c0ca4d50b6f7002b24c"><param name="Name" value="PlotWaterfall"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#a86c6b3a9dc720b681f7b4e47d1fe193d"><param name="Name" value="PlotWaterfall"></OBJECT>
   </UL>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ac9a8cc0d4ab016dc22195b813643c675"><param name="Name" value="drawGraticule"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a5444b418c756380e5e08f86a34615be3"><param name="Name" value="drawGraticule"></OBJECT>
   <UL>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ac9a8cc0d4ab016dc22195b813643c675"><param name="Name" value="PlotPanel"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a5444b418c756380e5e08f86a34615be3"><param name="Name" value="PlotPanel"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_spectrum.html#a2d78efb58ea00ec8961a88632a54f357"><param name="Name" value="PlotSpectrum"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#aa97d243b7bb91238b7493dcb96139803"><param name="Name" value="PlotWaterfall"></OBJECT>
   </UL>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_top_frame.html#a60ea330aef5ff340179c5ee637d3a204"><param name="Name" value="edit"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_top_frame.html#a2f719fd825ff8e4dbf04bc734429b668"><param name="Name" value="file"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_audio_stream.html#a1abd5e1c5f7fe05fc66c52603818fc5f"><param name="Name" value="generate"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_app.html#ae6022a31caf96dbcc2f519fc5fdc0bbe"><param name="Name" value="g_config"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#afd5fd9f501e93f712e46b0d805b57493"><param name="Name" value="getDataAvail"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a2a122bf5de62e7f1fb1bfed6801e063c"><param name="Name" value="getDefaultInputDevice"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a8cde3f5f6f312fbd8c0ad60619d617ad"><param name="Name" value="getDefaultOutputDevice"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a246ec79a44d879a74d6afe3e1005bc00"><param name="Name" value="getDeviceInfo"></OBJECT>
@@ -175,6 +175,7 @@
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#ae89ba28aeb62269ae28be8908294bb1c"><param name="Name" value="isActive"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#ad4a72bbe2ec6190336c2412df076c3f7"><param name="Name" value="isOpen"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#ae0bac2f93270a323c9ead4dbf61eda1d"><param name="Name" value="isStopped"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_app.html#af06cc098b89d1c606aa94ad87d6b0105"><param name="Name" value="loadConfig"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#aa5776602a5e021fe3c83c1cdf36340d1"><param name="Name" value="loadData"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a2577b78ec0105922e5356287519d2e54"><param name="Name" value="LoadUserImage"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_top_frame.html#af2bf3b05c2e23a16d9b74d8689c83dca"><param name="Name" value="m_auiNbookCtrl"></OBJECT>
@@ -190,10 +191,10 @@
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_dlg_audio.html#af35d36a3df31c77480d7714e08533d58"><param name="Name" value="m_comboCodecSpkr"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_dlg_audio.html#aeaf78c48df4b0314dc4dc06bfa2244b7"><param name="Name" value="m_comboCodecTx"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_dlg_audio.html#aa2cf1a98f25e26545da3044b354ba9a6"><param name="Name" value="m_comboRadioRx"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a1bb0714da68ee75a51a4ebb9e9ea3cad"><param name="Name" value="m_firstPass"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_top_frame.html#a156842bf1e564d3a3bfbf8a17ae1df10"><param name="Name" value="m_gaugeLevel"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_top_frame.html#aff23d43f975a63e1bfeec89f1ef19257"><param name="Name" value="m_gaugeSNR"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#a1cb3639849f17b1882b2b3713fd690cf"><param name="Name" value="m_greyscale"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#adcc3cec53897df2c9e99a980938092c1"><param name="Name" value="m_h"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#aae04482318331ac760954376f23a1e3c"><param name="Name" value="m_heatmap_lut"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_scalar.html#a3ff0dec7b8f50b3ca7155c06e8877ab5"><param name="Name" value="m_index"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a00eb5aef94866f0f385fcf793cb841b6"><param name="Name" value="m_label_size"></OBJECT>
@@ -202,7 +203,9 @@
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_dlg_audio.html#a022070976a0bc9ffb78bea4298f759aa"><param name="Name" value="m_lbVoiceInput"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_dlg_audio.html#a75f209f62dd213b4236624f019f611e1"><param name="Name" value="m_lbVoiceOutput"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ab41676a2e46c2e801bc639c274a7d5f5"><param name="Name" value="m_left"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#aa0b8f5bb510697a7eb8f48628a39b9c7"><param name="Name" value="m_line_color"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_dlg_com_ports.html#a79fa4831dbf5e4aa13f239c23d1ca9a8"><param name="Name" value="m_listCtrlPortSelect"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#a1b80aa40a1194ece27c87ec265ef7d2c"><param name="Name" value="m_mDC"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_scalar.html#a28e4e09d513bce7b2890635d1ed1967d"><param name="Name" value="m_mem"></OBJECT>
   <UL>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_scalar.html#a28e4e09d513bce7b2890635d1ed1967d"><param name="Name" value="PlotScalar"></OBJECT>
@@ -226,6 +229,8 @@
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a227751dba1777b261ffdc27b53fb087d"><param name="Name" value="m_penDotDash"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a111adb0975870b5d448da832bd44fc99"><param name="Name" value="m_penShortDash"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a229628c08bb7d0fa16589dbf83d635d1"><param name="Name" value="m_penSolid"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#aae86bcc3a14e94ddc496b9cce6a63c56"><param name="Name" value="m_pFDMDV_state"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#aabe58bef730ca69b342f8ac663c3d70d"><param name="Name" value="m_plotTimer"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a63b99d2f75a6486dda96f4934ba369fa"><param name="Name" value="m_pNoteBook"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#af85cf51a62f09adf0cbb4eb35d7cfc97"><param name="Name" value="m_prev_h"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a398b423039df00405f2f23b786a02b0d"><param name="Name" value="m_prev_w"></OBJECT>
@@ -234,9 +239,10 @@
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ad28637582a93843082fc7b1d8d80c807"><param name="Name" value="m_pTopFrame"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_dlg_audio.html#abbbc7d86cca84f89c78c16b9b6d3b793"><param name="Name" value="m_radioBtnFileOnly"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_dlg_audio.html#a44c3e54a014e7a4e921398bddc6681c7"><param name="Name" value="m_radioBtnPortAudio"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ad1cfa169df1cfa5ef798b57d2619d742"><param name="Name" value="m_rectCtrl"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a467e202bbd0fa3ef1997fa2b322e349d"><param name="Name" value="m_rectGrid"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#afcee74e089f5a50659bb534db80532d9"><param name="Name" value="m_rectPlot"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a2c10cfe6bcd979613cec037a71ba2c94"><param name="Name" value="m_rCtrl"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#aef7e50cc8a27b9434d17d7d8c245606c"><param name="Name" value="m_rCtrlPrev"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ae8d79eab28220ea1fa8ffcbfd70bc84a"><param name="Name" value="m_rGrid"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#aa4d6249f2f09d03682b8fa704be04548"><param name="Name" value="m_rPlot"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a7182715e509f98f42e78210d324fe042"><param name="Name" value="m_rubberBand"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#ad6f8ae2f867f69dd69a2b58ad0b26ccb"><param name="Name" value="m_RXCodec2"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#ab9d54920598f48bdbfa67161b3167b11"><param name="Name" value="m_rxDevIn"></OBJECT>
@@ -313,7 +319,6 @@
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a8532b7b31adc84716e6edcf9c8d54192"><param name="Name" value="m_TxRunning"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_top_frame.html#a7611a87ad6897f435cae4f9f972195b1"><param name="Name" value="m_txtCtrl"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a20336cef42ecb91f0fd1f9af1f70ba43"><param name="Name" value="m_use_bitmap"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ae78b6e7fc3e44bea81809813d753125c"><param name="Name" value="m_w"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#abd0a64bd20aec2e300e383abfd60315d"><param name="Name" value="m_x"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_scalar.html#a9a9edfbd8517f1ce1e7b75bcd4fda4f5"><param name="Name" value="m_x_max"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a822981fef8ff50da327b3dbca9fd2777"><param name="Name" value="m_y"></OBJECT>
@@ -321,6 +326,8 @@
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ae2f4907a8e4ed958ef4995e99b1f7148"><param name="Name" value="m_zoomFactor"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_app.html"><param name="Name" value="MainApp"></OBJECT>
   <UL>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_app.html#ae6022a31caf96dbcc2f519fc5fdc0bbe"><param name="Name" value="g_config"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_app.html#af06cc098b89d1c606aa94ad87d6b0105"><param name="Name" value="loadConfig"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_app.html#aff49a6bb4a0494d717a3136e9fe17351"><param name="Name" value="OnExit"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_app.html#aff3d398e1b61f1016c37d57798f86731"><param name="Name" value="OnInit"></OBJECT>
   </UL>
@@ -328,12 +335,15 @@
   <UL>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a44e48d93613d91be1db586553466feac"><param name="Name" value="abortRxStream"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#abbe36f1aac14dba091ab0ec0c6ef2936"><param name="Name" value="abortTxStream"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a31585b905eee875973b106f4e79c263f"><param name="Name" value="averageData"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a2577b78ec0105922e5356287519d2e54"><param name="Name" value="LoadUserImage"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a4cbae9088c818e3b0885955290b5db9e"><param name="Name" value="m_panelDefaultA"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a4b9bdbcea86dbffc51bc48ae586cbe01"><param name="Name" value="m_panelScalar"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#ada5dd6fc66036782c19f12175793da13"><param name="Name" value="m_panelScatter"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a3fc0fe9ca321814476397cb32476e40c"><param name="Name" value="m_panelSpectrum"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a6f0fa80dd24e33f0d32228ac73418882"><param name="Name" value="m_panelWaterfall"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#aae86bcc3a14e94ddc496b9cce6a63c56"><param name="Name" value="m_pFDMDV_state"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#aabe58bef730ca69b342f8ac663c3d70d"><param name="Name" value="m_plotTimer"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#ad6f8ae2f867f69dd69a2b58ad0b26ccb"><param name="Name" value="m_RXCodec2"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#ab9d54920598f48bdbfa67161b3167b11"><param name="Name" value="m_rxDevIn"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#aa73d0adbbf4fe9f2d14778ad1474a3d3"><param name="Name" value="m_rxDevOut"></OBJECT>
@@ -377,6 +387,7 @@
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a8fd9580d3191784843f34269810a676b"><param name="Name" value="OnSize"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#aeda570594ad6ca298ade6b2dec5812c4"><param name="Name" value="OnSliderScrollBottom"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#af7e0da6a850c5f08fd726280b7dc0af4"><param name="Name" value="OnSliderScrollTop"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a9ad22e55c7a3c93f9c071d366ae760d6"><param name="Name" value="OnTimer"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#ab1371babf6ebc9e24211a3ada34ab666"><param name="Name" value="OnTogBtnALCClick"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#af237b0cdbd857d4cc72f5a523457eb82"><param name="Name" value="OnTogBtnAnalogClick"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a7fc4afa20b92ac8e5f1ddfcf86820f28"><param name="Name" value="OnTogBtnOnOff"></OBJECT>
@@ -391,6 +402,7 @@
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a82b97e0f3c4e530d5700b2c2dbac42bf"><param name="Name" value="OnToolsOptions"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#ac7ceb1e047f2f3b0c26c0b42a110fe99"><param name="Name" value="OnToolsOptionsUI"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a4757c5d7d0e9b2c98dc34336f1dce49e"><param name="Name" value="OnUpdateUI"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#af9f4cfb8469872efd9c057d1bc215f08"><param name="Name" value="per_frame_rx_processing"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a45e054e7f42f10088a699821a169d295"><param name="Name" value="rxCallback"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#ad17245c1c9c295fc216fc6615f31e0a5"><param name="Name" value="startRxStream"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#af01eb2c59f1a9bcee0b956f8a72004c0"><param name="Name" value="startTxStream"></OBJECT>
@@ -581,7 +593,6 @@
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_scalar.html#a6b41cd9d409567b395f539d0204c706c"><param name="Name" value="PlotScalar"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_scatter.html#aefccecfa048d8102724295fce801cb4e"><param name="Name" value="PlotScatter"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_spectrum.html#aa104352673f08ff08c72bcf4729f23eb"><param name="Name" value="PlotSpectrum"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#adae15df2acf8dd7a1812ea79b2708b65"><param name="Name" value="PlotWaterfall"></OBJECT>
   </UL>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#aeda570594ad6ca298ade6b2dec5812c4"><param name="Name" value="OnSliderScrollBottom"></OBJECT>
   <UL>
@@ -593,6 +604,7 @@
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#af7e0da6a850c5f08fd726280b7dc0af4"><param name="Name" value="MainFrame"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_top_frame.html#add7272e7926661e4766572a5f3b39d70"><param name="Name" value="TopFrame"></OBJECT>
   </UL>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a9ad22e55c7a3c93f9c071d366ae760d6"><param name="Name" value="OnTimer"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#ab1371babf6ebc9e24211a3ada34ab666"><param name="Name" value="OnTogBtnALCClick"></OBJECT>
   <UL>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#ab1371babf6ebc9e24211a3ada34ab666"><param name="Name" value="MainFrame"></OBJECT>
@@ -686,18 +698,17 @@
     <LI><OBJECT type="text/sitemap"><param name="Local" value="structpa_call_back_data.html#a1eaf4a649210c178b8671653b89e2141"><param name="Name" value="in8k"></OBJECT>
   </UL>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a042c9df2ebe0c245d9fb5f3aa63595bc"><param name="Name" value="paintEvent"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a4af13f96f4f8639148668c89942b3365"><param name="Name" value="per_frame_rx_processing"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#ae19ead564f66f723b7192dbb2bd5815b"><param name="Name" value="plotData"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#af9f4cfb8469872efd9c057d1bc215f08"><param name="Name" value="per_frame_rx_processing"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html"><param name="Name" value="PlotPanel"></OBJECT>
   <UL>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a5f35a9628a035ef904fb056f5ebcc3c3"><param name="Name" value="draw"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ac9a8cc0d4ab016dc22195b813643c675"><param name="Name" value="drawGraticule"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a974601747a67a4637a3a133cefe70c13"><param name="Name" value="draw"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a5444b418c756380e5e08f86a34615be3"><param name="Name" value="drawGraticule"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a539ab140f79c5cff29031aa312a9f159"><param name="Name" value="GetLabelSize"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a6f6ef3db5a4b4f6cb50d92a38fa36dbd"><param name="Name" value="GetZoomFactor"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a8cf01c846dc561a79c0d1dee88a80ef4"><param name="Name" value="m_bmp"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a61a49a35721e334b959e833464add15f"><param name="Name" value="m_Bufsz"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a07334de87de07eeab43eabbdaf730ab5"><param name="Name" value="m_clip"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#adcc3cec53897df2c9e99a980938092c1"><param name="Name" value="m_h"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a1bb0714da68ee75a51a4ebb9e9ea3cad"><param name="Name" value="m_firstPass"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a00eb5aef94866f0f385fcf793cb841b6"><param name="Name" value="m_label_size"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ab41676a2e46c2e801bc639c274a7d5f5"><param name="Name" value="m_left"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#acebe9485868374626f03516e3508b592"><param name="Name" value="m_mouseDown"></OBJECT>
@@ -712,13 +723,13 @@
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ab38a4323755a529cbdab28a5854ffc06"><param name="Name" value="m_prev_x"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a2e1ea18bbea07dd04acc76567a993070"><param name="Name" value="m_prev_y"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ad28637582a93843082fc7b1d8d80c807"><param name="Name" value="m_pTopFrame"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ad1cfa169df1cfa5ef798b57d2619d742"><param name="Name" value="m_rectCtrl"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a467e202bbd0fa3ef1997fa2b322e349d"><param name="Name" value="m_rectGrid"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#afcee74e089f5a50659bb534db80532d9"><param name="Name" value="m_rectPlot"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a2c10cfe6bcd979613cec037a71ba2c94"><param name="Name" value="m_rCtrl"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#aef7e50cc8a27b9434d17d7d8c245606c"><param name="Name" value="m_rCtrlPrev"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ae8d79eab28220ea1fa8ffcbfd70bc84a"><param name="Name" value="m_rGrid"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#aa4d6249f2f09d03682b8fa704be04548"><param name="Name" value="m_rPlot"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a7182715e509f98f42e78210d324fe042"><param name="Name" value="m_rubberBand"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a8c49969c560b64902272347835f151a0"><param name="Name" value="m_top"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a20336cef42ecb91f0fd1f9af1f70ba43"><param name="Name" value="m_use_bitmap"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ae78b6e7fc3e44bea81809813d753125c"><param name="Name" value="m_w"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#abd0a64bd20aec2e300e383abfd60315d"><param name="Name" value="m_x"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#a822981fef8ff50da327b3dbca9fd2777"><param name="Name" value="m_y"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_panel.html#ae2f4907a8e4ed958ef4995e99b1f7148"><param name="Name" value="m_zoomFactor"></OBJECT>
@@ -775,15 +786,15 @@
   </UL>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html"><param name="Name" value="PlotWaterfall"></OBJECT>
   <UL>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#a3956d17d4ece2c0ca4d50b6f7002b24c"><param name="Name" value="draw"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#a86c6b3a9dc720b681f7b4e47d1fe193d"><param name="Name" value="draw"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#aa97d243b7bb91238b7493dcb96139803"><param name="Name" value="drawGraticule"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#a9258386bf42d94ddda768e4e767a77aa"><param name="Name" value="heatmap"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#a1cb3639849f17b1882b2b3713fd690cf"><param name="Name" value="m_greyscale"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#aae04482318331ac760954376f23a1e3c"><param name="Name" value="m_heatmap_lut"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#aa0b8f5bb510697a7eb8f48628a39b9c7"><param name="Name" value="m_line_color"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#a1b80aa40a1194ece27c87ec265ef7d2c"><param name="Name" value="m_mDC"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#a37d541349ac6f010a90fee3b9f32fbbb"><param name="Name" value="OnPaint"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#ad55e0e3078f0d5c3699df36ba6d8ab5d"><param name="Name" value="OnShow"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#adae15df2acf8dd7a1812ea79b2708b65"><param name="Name" value="OnSize"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#ae19ead564f66f723b7192dbb2bd5815b"><param name="Name" value="plotData"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#aec560c10f32a6c6e92a62225288c28f3"><param name="Name" value="plotPixelData"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_plot_waterfall.html#ab8cb1de06d17616f05ab872923563167"><param name="Name" value="PlotWaterfall"></OBJECT>
   </UL>
@@ -793,6 +804,7 @@
   <UL>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a22409ee2e9d87fbab60ef71288620c34"><param name="Name" value="abort"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a987405b6ca5fbecb33ac69ddfe843659"><param name="Name" value="averageData"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#afd5fd9f501e93f712e46b0d805b57493"><param name="Name" value="getDataAvail"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a2a122bf5de62e7f1fb1bfed6801e063c"><param name="Name" value="getDefaultInputDevice"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a8cde3f5f6f312fbd8c0ad60619d617ad"><param name="Name" value="getDefaultOutputDevice"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a246ec79a44d879a74d6afe3e1005bc00"><param name="Name" value="getDeviceInfo"></OBJECT>
@@ -814,8 +826,7 @@
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#ae0bac2f93270a323c9ead4dbf61eda1d"><param name="Name" value="isStopped"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#aa5776602a5e021fe3c83c1cdf36340d1"><param name="Name" value="loadData"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#ad9da60946a4fec855cce07c1e497d7be"><param name="Name" value="m_av_mag"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a4af13f96f4f8639148668c89942b3365"><param name="Name" value="per_frame_rx_processing"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a7b455cc4397b90c6d381c26073e51b2a"><param name="Name" value="setCallback"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a2a40702f7b56abb4b6927fb6493db92e"><param name="Name" value="setCallback"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a65d6263d05a44f6696a3eb93a669e862"><param name="Name" value="setFdmdvState"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a34ec7a96cbe5859f4a6aba6cb4b508cf"><param name="Name" value="setFramesPerBuffer"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a132273a300efd015cf3d66ee5b250216"><param name="Name" value="setInputBuffer"></OBJECT>
@@ -831,12 +842,9 @@
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#ab7d9fc6cda5c61cda105e6d9bba9215c"><param name="Name" value="setOutputHostApiStreamInfo"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a619ad8a126e30b328468a57c8047f2f8"><param name="Name" value="setOutputLatency"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a342018893c092acac26509351b45602f"><param name="Name" value="setOutputSampleFormat"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a20f5cf508b5e13bd29632acb1af52d26"><param name="Name" value="setSamplerate"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a7245832a8cafbc8d140a51e106838fbb"><param name="Name" value="setSampleRate"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#ad2c8ee53c0f11504777d1dc41747b453"><param name="Name" value="setStatusFlags"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a8f18f16ddf796eba036e11694b25a2a4"><param name="Name" value="setStream"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#adf02f262bcd9f85c33fea7da0e4cd841"><param name="Name" value="setStreamCallback"></OBJECT>
-    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a163f9ff1095444793a25f1e90442b32c"><param name="Name" value="setStreamFinishedCallback"></OBJECT>
+    <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a85e2c0e5700cacd09a330cd6573cff7d"><param name="Name" value="setStreamFinishedCallback"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a47fe0dd437c0a4693824966e7100255a"><param name="Name" value="setStreamFlags"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a4d2bb7132714099aa2a0390f11a57ce6"><param name="Name" value="setTimeInfo"></OBJECT>
     <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a2bac5a36a40fd1f86df5c1f94e964ac4"><param name="Name" value="setUserData"></OBJECT>
@@ -848,7 +856,7 @@
   </UL>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="struct_c_o_m_p.html#aab5da66c35473e59242b301dafdfaf7e"><param name="Name" value="real"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_main_frame.html#a45e054e7f42f10088a699821a169d295"><param name="Name" value="rxCallback"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a7b455cc4397b90c6d381c26073e51b2a"><param name="Name" value="setCallback"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a2a40702f7b56abb4b6927fb6493db92e"><param name="Name" value="setCallback"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a65d6263d05a44f6696a3eb93a669e862"><param name="Name" value="setFdmdvState"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a34ec7a96cbe5859f4a6aba6cb4b508cf"><param name="Name" value="setFramesPerBuffer"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a132273a300efd015cf3d66ee5b250216"><param name="Name" value="setInputBuffer"></OBJECT>
@@ -865,12 +873,9 @@
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#ab7d9fc6cda5c61cda105e6d9bba9215c"><param name="Name" value="setOutputHostApiStreamInfo"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a619ad8a126e30b328468a57c8047f2f8"><param name="Name" value="setOutputLatency"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a342018893c092acac26509351b45602f"><param name="Name" value="setOutputSampleFormat"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a20f5cf508b5e13bd29632acb1af52d26"><param name="Name" value="setSamplerate"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a7245832a8cafbc8d140a51e106838fbb"><param name="Name" value="setSampleRate"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#ad2c8ee53c0f11504777d1dc41747b453"><param name="Name" value="setStatusFlags"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a8f18f16ddf796eba036e11694b25a2a4"><param name="Name" value="setStream"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#adf02f262bcd9f85c33fea7da0e4cd841"><param name="Name" value="setStreamCallback"></OBJECT>
-  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a163f9ff1095444793a25f1e90442b32c"><param name="Name" value="setStreamFinishedCallback"></OBJECT>
+  <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a85e2c0e5700cacd09a330cd6573cff7d"><param name="Name" value="setStreamFinishedCallback"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a47fe0dd437c0a4693824966e7100255a"><param name="Name" value="setStreamFlags"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a4d2bb7132714099aa2a0390f11a57ce6"><param name="Name" value="setTimeInfo"></OBJECT>
   <LI><OBJECT type="text/sitemap"><param name="Local" value="class_port_audio_wrap.html#a2bac5a36a40fd1f86df5c1f94e964ac4"><param name="Name" value="setUserData"></OBJECT>

diff --git a/fdmdv2/fdmdv2-doc/html/index.hhp b/fdmdv2/fdmdv2-doc/html/index.hhp
index 8b8c206a9c2af09da56dd01e7a175ce3072dea07..86c8e14dc2934f14042b132acd30e2d7b2dcd93f 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/index.hhp
+++ b/fdmdv2/fdmdv2-doc/html/index.hhp
@@ -12,7 +12,6 @@ Title=FDMDV2
 main="FDMDV2","index.hhc","index.hhk","index.html","index.html",,,,,0x23520,,0x10387e,,,,,,,,0
 
 [FILES]
-audiostream_8h_source.html
 comp_8h_source.html
 dlg__about_8h_source.html
 dlg__audio_8h_source.html
@@ -31,8 +30,6 @@ class_about_dlg.html
 class_about_dlg-members.html
 class_audio_dlg.html
 class_audio_dlg-members.html
-class_audio_stream.html
-class_audio_stream-members.html
 struct_c_o_m_p.html
 struct_c_o_m_p-members.html
 class_com_ports_dlg.html
@@ -213,4 +210,3 @@ inherit_graph_3.png
 inherit_graph_4.png
 inherit_graph_5.png
 inherit_graph_6.png
-inherit_graph_7.png

diff --git a/fdmdv2/fdmdv2-doc/html/index.html b/fdmdv2/fdmdv2-doc/html/index.html
index c490dde3a061f65753d21fa6c338199ca2d170c2..7b7b9ca07f5feeab4d1abea7f07fcebef067f486 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/index.html
+++ b/fdmdv2/fdmdv2-doc/html/index.html
@@ -43,7 +43,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_0.map b/fdmdv2/fdmdv2-doc/html/inherit_graph_0.map
index f8b5d59d99ae1d252b6f2a6b6b013a7953468b39..1e724b66a90e2a01a5974c56deb6dcc25cae1f55 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_0.map
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_0.map
@@ -1,3 +1,3 @@
 <map id="Graphical Class Hierarchy" name="Graphical Class Hierarchy">\r
-<area shape="rect" id="node1" href="$class_audio_stream.html" title="AudioStream" alt="" coords="6,5,103,32"/>\r
+<area shape="rect" id="node1" href="$struct_c_o_m_p.html" title="COMP" alt="" coords="5,5,67,32"/>\r
 </map>\r

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_0.md5 b/fdmdv2/fdmdv2-doc/html/inherit_graph_0.md5
index 5e9f9bcd9861925cfbb5d0504deee5aaffd4a98c..ed6c2fa3224c414e4d6ed881dd02c0597894651d 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_0.md5
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_0.md5
@@ -1 +1 @@
-557b143ce8c560ac9988331631a8a934
\ No newline at end of file
+aaffd05cfd69bb82e822a993b3eeb692
\ No newline at end of file

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_0.png b/fdmdv2/fdmdv2-doc/html/inherit_graph_0.png
index ccdb1f100d7b2e21ef3854960fede42168256fff..8a5d4f6e539b632cc5d1bd9e3d576ad289f26d7c 100644 (file)
Binary files a/fdmdv2/fdmdv2-doc/html/inherit_graph_0.png and b/fdmdv2/fdmdv2-doc/html/inherit_graph_0.png differ

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_1.map b/fdmdv2/fdmdv2-doc/html/inherit_graph_1.map
index 1e724b66a90e2a01a5974c56deb6dcc25cae1f55..66e0d4ae9999ba1c1583028dba86ac2b84cb1604 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_1.map
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_1.map
@@ -1,3 +1,10 @@
 <map id="Graphical Class Hierarchy" name="Graphical Class Hierarchy">\r
-<area shape="rect" id="node1" href="$struct_c_o_m_p.html" title="COMP" alt="" coords="5,5,67,32"/>\r
+<area shape="rect" id="node3" href="$class_dlg_about.html" title="DlgAbout" alt="" coords="140,5,215,32"/>\r
+<area shape="rect" id="node7" href="$class_dlg_audio.html" title="DlgAudio" alt="" coords="140,56,215,83"/>\r
+<area shape="rect" id="node11" href="$class_dlg_com_ports.html" title="DlgComPorts" alt="" coords="128,107,227,133"/>\r
+<area shape="rect" id="node15" href="$class_dlg_options.html" title="DlgOptions" alt="" coords="134,157,221,184"/>\r
+<area shape="rect" id="node5" href="$class_about_dlg.html" title="AboutDlg" alt="" coords="287,5,361,32"/>\r
+<area shape="rect" id="node9" href="$class_audio_dlg.html" title="AudioDlg" alt="" coords="287,56,361,83"/>\r
+<area shape="rect" id="node13" href="$class_com_ports_dlg.html" title="ComPortsDlg" alt="" coords="275,107,373,133"/>\r
+<area shape="rect" id="node17" href="$class_options_dlg.html" title="OptionsDlg" alt="" coords="281,157,367,184"/>\r
 </map>\r

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_1.md5 b/fdmdv2/fdmdv2-doc/html/inherit_graph_1.md5
index ed6c2fa3224c414e4d6ed881dd02c0597894651d..8338a140898bb6ebd98c42d4a9a86a6f1f416d1c 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_1.md5
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_1.md5
@@ -1 +1 @@
-aaffd05cfd69bb82e822a993b3eeb692
\ No newline at end of file
+88a3909d536643f3f7d46cc7f2761e21
\ No newline at end of file

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_1.png b/fdmdv2/fdmdv2-doc/html/inherit_graph_1.png
index 8a5d4f6e539b632cc5d1bd9e3d576ad289f26d7c..2ab72931dc071d7c97df50740741c61cd275f489 100644 (file)
Binary files a/fdmdv2/fdmdv2-doc/html/inherit_graph_1.png and b/fdmdv2/fdmdv2-doc/html/inherit_graph_1.png differ

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_2.map b/fdmdv2/fdmdv2-doc/html/inherit_graph_2.map
index 66e0d4ae9999ba1c1583028dba86ac2b84cb1604..755dc41c6744d18f1225550184f0601da1947c3b 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_2.map
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_2.map
@@ -1,10 +1,3 @@
 <map id="Graphical Class Hierarchy" name="Graphical Class Hierarchy">\r
-<area shape="rect" id="node3" href="$class_dlg_about.html" title="DlgAbout" alt="" coords="140,5,215,32"/>\r
-<area shape="rect" id="node7" href="$class_dlg_audio.html" title="DlgAudio" alt="" coords="140,56,215,83"/>\r
-<area shape="rect" id="node11" href="$class_dlg_com_ports.html" title="DlgComPorts" alt="" coords="128,107,227,133"/>\r
-<area shape="rect" id="node15" href="$class_dlg_options.html" title="DlgOptions" alt="" coords="134,157,221,184"/>\r
-<area shape="rect" id="node5" href="$class_about_dlg.html" title="AboutDlg" alt="" coords="287,5,361,32"/>\r
-<area shape="rect" id="node9" href="$class_audio_dlg.html" title="AudioDlg" alt="" coords="287,56,361,83"/>\r
-<area shape="rect" id="node13" href="$class_com_ports_dlg.html" title="ComPortsDlg" alt="" coords="275,107,373,133"/>\r
-<area shape="rect" id="node17" href="$class_options_dlg.html" title="OptionsDlg" alt="" coords="281,157,367,184"/>\r
+<area shape="rect" id="node3" href="$class_main_app.html" title="MainApp" alt="" coords="115,5,189,32"/>\r
 </map>\r

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_2.md5 b/fdmdv2/fdmdv2-doc/html/inherit_graph_2.md5
index 8338a140898bb6ebd98c42d4a9a86a6f1f416d1c..687a5ac5a273b502918aaa986a1b7c719c61f7b9 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_2.md5
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_2.md5
@@ -1 +1 @@
-88a3909d536643f3f7d46cc7f2761e21
\ No newline at end of file
+b0d059122332f6505326b5bc3f2385cb
\ No newline at end of file

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_2.png b/fdmdv2/fdmdv2-doc/html/inherit_graph_2.png
index 2ab72931dc071d7c97df50740741c61cd275f489..bf99ff35f57b54348a046117a956eb4af1db0a29 100644 (file)
Binary files a/fdmdv2/fdmdv2-doc/html/inherit_graph_2.png and b/fdmdv2/fdmdv2-doc/html/inherit_graph_2.png differ

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_3.map b/fdmdv2/fdmdv2-doc/html/inherit_graph_3.map
index 755dc41c6744d18f1225550184f0601da1947c3b..1179fdd761ced858290f41f8f4ba6449a31b2772 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_3.map
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_3.map
@@ -1,3 +1,3 @@
 <map id="Graphical Class Hierarchy" name="Graphical Class Hierarchy">\r
-<area shape="rect" id="node3" href="$class_main_app.html" title="MainApp" alt="" coords="115,5,189,32"/>\r
+<area shape="rect" id="node1" href="$structpa_call_back_data.html" title="paCallBackData" alt="" coords="5,5,120,32"/>\r
 </map>\r

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_3.md5 b/fdmdv2/fdmdv2-doc/html/inherit_graph_3.md5
index 687a5ac5a273b502918aaa986a1b7c719c61f7b9..e143f0cea610aba2bcca5f8527d4f45d58d50e60 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_3.md5
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_3.md5
@@ -1 +1 @@
-b0d059122332f6505326b5bc3f2385cb
\ No newline at end of file
+1920088faa490f7be8a5c842313ef4ce
\ No newline at end of file

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_3.png b/fdmdv2/fdmdv2-doc/html/inherit_graph_3.png
index bf99ff35f57b54348a046117a956eb4af1db0a29..f14705258257cb7a48cb7bd064e0c5f747bb0217 100644 (file)
Binary files a/fdmdv2/fdmdv2-doc/html/inherit_graph_3.png and b/fdmdv2/fdmdv2-doc/html/inherit_graph_3.png differ

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_4.map b/fdmdv2/fdmdv2-doc/html/inherit_graph_4.map
index 1179fdd761ced858290f41f8f4ba6449a31b2772..db7b472a3abe09ea6508f17937f14e82882d45e7 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_4.map
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_4.map
@@ -1,3 +1,7 @@
 <map id="Graphical Class Hierarchy" name="Graphical Class Hierarchy">\r
-<area shape="rect" id="node1" href="$structpa_call_back_data.html" title="paCallBackData" alt="" coords="5,5,120,32"/>\r
+<area shape="rect" id="node3" href="$class_plot_panel.html" title="PlotPanel" alt="" coords="126,81,205,108"/>\r
+<area shape="rect" id="node5" href="$class_plot_scalar.html" title="PlotScalar" alt="" coords="263,5,345,32"/>\r
+<area shape="rect" id="node7" href="$class_plot_scatter.html" title="PlotScatter" alt="" coords="261,56,347,83"/>\r
+<area shape="rect" id="node9" href="$class_plot_spectrum.html" title="PlotSpectrum" alt="" coords="253,107,355,133"/>\r
+<area shape="rect" id="node11" href="$class_plot_waterfall.html" title="PlotWaterfall" alt="" coords="256,157,352,184"/>\r
 </map>\r

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_4.md5 b/fdmdv2/fdmdv2-doc/html/inherit_graph_4.md5
index e143f0cea610aba2bcca5f8527d4f45d58d50e60..198434436ca71408429c729420caf1651f486fd1 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_4.md5
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_4.md5
@@ -1 +1 @@
-1920088faa490f7be8a5c842313ef4ce
\ No newline at end of file
+cfd38fb51da4aafb8dbd51df49bee140
\ No newline at end of file

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_4.png b/fdmdv2/fdmdv2-doc/html/inherit_graph_4.png
index f14705258257cb7a48cb7bd064e0c5f747bb0217..0d6453be2ba5efde5b5e7dbdbaeff8a4db7d6679 100644 (file)
Binary files a/fdmdv2/fdmdv2-doc/html/inherit_graph_4.png and b/fdmdv2/fdmdv2-doc/html/inherit_graph_4.png differ

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_5.map b/fdmdv2/fdmdv2-doc/html/inherit_graph_5.map
index db7b472a3abe09ea6508f17937f14e82882d45e7..030f3040974e39ae78c2a8f2e8e0f13a3edce69b 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_5.map
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_5.map
@@ -1,7 +1,3 @@
 <map id="Graphical Class Hierarchy" name="Graphical Class Hierarchy">\r
-<area shape="rect" id="node3" href="$class_plot_panel.html" title="PlotPanel" alt="" coords="126,81,205,108"/>\r
-<area shape="rect" id="node5" href="$class_plot_scalar.html" title="PlotScalar" alt="" coords="263,5,345,32"/>\r
-<area shape="rect" id="node7" href="$class_plot_scatter.html" title="PlotScatter" alt="" coords="261,56,347,83"/>\r
-<area shape="rect" id="node9" href="$class_plot_spectrum.html" title="PlotSpectrum" alt="" coords="253,107,355,133"/>\r
-<area shape="rect" id="node11" href="$class_plot_waterfall.html" title="PlotWaterfall" alt="" coords="256,157,352,184"/>\r
+<area shape="rect" id="node1" href="$class_port_audio_wrap.html" title="PortAudioWrap" alt="" coords="6,5,117,32"/>\r
 </map>\r

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_5.md5 b/fdmdv2/fdmdv2-doc/html/inherit_graph_5.md5
index 198434436ca71408429c729420caf1651f486fd1..fb8e437f2d6d9350764cb3eb53f80c52de15d3c2 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_5.md5
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_5.md5
@@ -1 +1 @@
-cfd38fb51da4aafb8dbd51df49bee140
\ No newline at end of file
+959eb051c85531be48a3cb2dc971771a
\ No newline at end of file

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_5.png b/fdmdv2/fdmdv2-doc/html/inherit_graph_5.png
index 0d6453be2ba5efde5b5e7dbdbaeff8a4db7d6679..d4df11e13c04c9230195647f418ac10d9da54327 100644 (file)
Binary files a/fdmdv2/fdmdv2-doc/html/inherit_graph_5.png and b/fdmdv2/fdmdv2-doc/html/inherit_graph_5.png differ

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_6.map b/fdmdv2/fdmdv2-doc/html/inherit_graph_6.map
index 030f3040974e39ae78c2a8f2e8e0f13a3edce69b..1196e7437bb7a7a30ec4a0f5e15cfa3c78d02412 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_6.map
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_6.map
@@ -1,3 +1,4 @@
 <map id="Graphical Class Hierarchy" name="Graphical Class Hierarchy">\r
-<area shape="rect" id="node1" href="$class_port_audio_wrap.html" title="PortAudioWrap" alt="" coords="6,5,117,32"/>\r
+<area shape="rect" id="node3" href="$class_top_frame.html" title="TopFrame" alt="" coords="128,5,208,32"/>\r
+<area shape="rect" id="node5" href="$class_main_frame.html" title="MainFrame" alt="" coords="257,5,343,32"/>\r
 </map>\r

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_6.md5 b/fdmdv2/fdmdv2-doc/html/inherit_graph_6.md5
index fb8e437f2d6d9350764cb3eb53f80c52de15d3c2..56859660766b1abeec88a0d3dc5c5e23071e78e8 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherit_graph_6.md5
+++ b/fdmdv2/fdmdv2-doc/html/inherit_graph_6.md5
@@ -1 +1 @@
-959eb051c85531be48a3cb2dc971771a
\ No newline at end of file
+3578d43f0652547b11bc013a1a10eba3
\ No newline at end of file

diff --git a/fdmdv2/fdmdv2-doc/html/inherit_graph_6.png b/fdmdv2/fdmdv2-doc/html/inherit_graph_6.png
index d4df11e13c04c9230195647f418ac10d9da54327..3da9ca245bcd92370a8a7ff1b39afb83fc634d82 100644 (file)
Binary files a/fdmdv2/fdmdv2-doc/html/inherit_graph_6.png and b/fdmdv2/fdmdv2-doc/html/inherit_graph_6.png differ

diff --git a/fdmdv2/fdmdv2-doc/html/inherits.html b/fdmdv2/fdmdv2-doc/html/inherits.html
index b0fb79b4f498c01bd3b608e319c1d3a6a092f1c5..5a366726aed604c0756b4c908bdc91f0aa5c299a 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/inherits.html
+++ b/fdmdv2/fdmdv2-doc/html/inherits.html
@@ -51,35 +51,31 @@
 <div class="textblock">
 <p><a href="hierarchy.html">Go to the textual class hierarchy</a></p>
 </div><table border="0" cellspacing="10" cellpadding="0">
-<tr><td><img src="inherit_graph_0.png" border="0" alt="" usemap="#_audio_stream"/>
-<map name="_audio_stream" id="_audio_stream">
-<area shape="rect" id="node1" href="class_audio_stream.html" title="AudioStream" alt="" coords="6,5,103,32"/>\r</map>
-</td></tr>
-<tr><td><img src="inherit_graph_1.png" border="0" alt="" usemap="#_c_o_m_p"/>
+<tr><td><img src="inherit_graph_0.png" border="0" alt="" usemap="#_c_o_m_p"/>
 <map name="_c_o_m_p" id="_c_o_m_p">
 <area shape="rect" id="node1" href="struct_c_o_m_p.html" title="COMP" alt="" coords="5,5,67,32"/>\r</map>
 </td></tr>
-<tr><td><img src="inherit_graph_2.png" border="0" alt="" usemap="#_dlg_about"/>
+<tr><td><img src="inherit_graph_1.png" border="0" alt="" usemap="#_dlg_about"/>
 <map name="_dlg_about" id="_dlg_about">
 <area shape="rect" id="node3" href="class_dlg_about.html" title="DlgAbout" alt="" coords="140,5,215,32"/>\r<area shape="rect" id="node7" href="class_dlg_audio.html" title="DlgAudio" alt="" coords="140,56,215,83"/>\r<area shape="rect" id="node11" href="class_dlg_com_ports.html" title="DlgComPorts" alt="" coords="128,107,227,133"/>\r<area shape="rect" id="node15" href="class_dlg_options.html" title="DlgOptions" alt="" coords="134,157,221,184"/>\r<area shape="rect" id="node5" href="class_about_dlg.html" title="AboutDlg" alt="" coords="287,5,361,32"/>\r<area shape="rect" id="node9" href="class_audio_dlg.html" title="AudioDlg" alt="" coords="287,56,361,83"/>\r<area shape="rect" id="node13" href="class_com_ports_dlg.html" title="ComPortsDlg" alt="" coords="275,107,373,133"/>\r<area shape="rect" id="node17" href="class_options_dlg.html" title="OptionsDlg" alt="" coords="281,157,367,184"/>\r</map>
 </td></tr>
-<tr><td><img src="inherit_graph_3.png" border="0" alt="" usemap="#_main_app"/>
+<tr><td><img src="inherit_graph_2.png" border="0" alt="" usemap="#_main_app"/>
 <map name="_main_app" id="_main_app">
 <area shape="rect" id="node3" href="class_main_app.html" title="MainApp" alt="" coords="115,5,189,32"/>\r</map>
 </td></tr>
-<tr><td><img src="inherit_graph_4.png" border="0" alt="" usemap="#pa_call_back_data"/>
+<tr><td><img src="inherit_graph_3.png" border="0" alt="" usemap="#pa_call_back_data"/>
 <map name="pa_call_back_data" id="pa_call_back_data">
 <area shape="rect" id="node1" href="structpa_call_back_data.html" title="paCallBackData" alt="" coords="5,5,120,32"/>\r</map>
 </td></tr>
-<tr><td><img src="inherit_graph_5.png" border="0" alt="" usemap="#_plot_panel"/>
+<tr><td><img src="inherit_graph_4.png" border="0" alt="" usemap="#_plot_panel"/>
 <map name="_plot_panel" id="_plot_panel">
 <area shape="rect" id="node3" href="class_plot_panel.html" title="PlotPanel" alt="" coords="126,81,205,108"/>\r<area shape="rect" id="node5" href="class_plot_scalar.html" title="PlotScalar" alt="" coords="263,5,345,32"/>\r<area shape="rect" id="node7" href="class_plot_scatter.html" title="PlotScatter" alt="" coords="261,56,347,83"/>\r<area shape="rect" id="node9" href="class_plot_spectrum.html" title="PlotSpectrum" alt="" coords="253,107,355,133"/>\r<area shape="rect" id="node11" href="class_plot_waterfall.html" title="PlotWaterfall" alt="" coords="256,157,352,184"/>\r</map>
 </td></tr>
-<tr><td><img src="inherit_graph_6.png" border="0" alt="" usemap="#_port_audio_wrap"/>
+<tr><td><img src="inherit_graph_5.png" border="0" alt="" usemap="#_port_audio_wrap"/>
 <map name="_port_audio_wrap" id="_port_audio_wrap">
 <area shape="rect" id="node1" href="class_port_audio_wrap.html" title="PortAudioWrap" alt="" coords="6,5,117,32"/>\r</map>
 </td></tr>
-<tr><td><img src="inherit_graph_7.png" border="0" alt="" usemap="#_top_frame"/>
+<tr><td><img src="inherit_graph_6.png" border="0" alt="" usemap="#_top_frame"/>
 <map name="_top_frame" id="_top_frame">
 <area shape="rect" id="node3" href="class_top_frame.html" title="TopFrame" alt="" coords="128,5,208,32"/>\r<area shape="rect" id="node5" href="class_main_frame.html" title="MainFrame" alt="" coords="257,5,343,32"/>\r</map>
 </td></tr>
@@ -87,7 +83,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:32 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/struct_c_o_m_p-members.html b/fdmdv2/fdmdv2-doc/html/struct_c_o_m_p-members.html
index 324bdb879ddf2f8b57de9a26465392a19676dc2f..4ee89ce19ac21d59302e621893c817969e387155 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/struct_c_o_m_p-members.html
+++ b/fdmdv2/fdmdv2-doc/html/struct_c_o_m_p-members.html
@@ -56,7 +56,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/struct_c_o_m_p.html b/fdmdv2/fdmdv2-doc/html/struct_c_o_m_p.html
index 607e50f959e6cf19d8481a0f8a81b8ba716a78d8..008c730360a658245a351f988615e0d220705826 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/struct_c_o_m_p.html
+++ b/fdmdv2/fdmdv2-doc/html/struct_c_o_m_p.html
@@ -67,7 +67,7 @@ float&#160;</td><td class="memItemRight" valign="bottom"><b>imag</b></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/structpa_call_back_data-members.html b/fdmdv2/fdmdv2-doc/html/structpa_call_back_data-members.html
index 745c439a53fe5de216f0b305eecda05c3f638329..da4e0ac5f6a0de5e96a28839f13fcda2be2f69d0 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/structpa_call_back_data-members.html
+++ b/fdmdv2/fdmdv2-doc/html/structpa_call_back_data-members.html
@@ -56,7 +56,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/structpa_call_back_data.html b/fdmdv2/fdmdv2-doc/html/structpa_call_back_data.html
index 7df060d9e361e698204157d214d80957ff79c1c3..47ceaa10fe7947bfcc17541afdb52d0f5369b8d6 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/structpa_call_back_data.html
+++ b/fdmdv2/fdmdv2-doc/html/structpa_call_back_data.html
@@ -67,7 +67,7 @@ float&#160;</td><td class="memItemRight" valign="bottom"><b>in8k</b> [MEM8+N8]</
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/html/top_frame_8h_source.html b/fdmdv2/fdmdv2-doc/html/top_frame_8h_source.html
index f32191703f5238a4a5276ef8b860fab8e02fd4dd..a3c9712ecaae53e27bcd9020f5328bb7a7a80bac 100644 (file)
--- a/fdmdv2/fdmdv2-doc/html/top_frame_8h_source.html
+++ b/fdmdv2/fdmdv2-doc/html/top_frame_8h_source.html
@@ -318,7 +318,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Sep 11 2012 14:31:49 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Fri Sep 14 2012 18:21:31 for FDMDV2 by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/fdmdv2/fdmdv2-doc/latex/annotated.tex b/fdmdv2/fdmdv2-doc/latex/annotated.tex
index 68d772dffa522d379291a6a8a81167716daac5f3..acc4b11ce6fce76945189b175be1373af353b1a7 100644 (file)
--- a/fdmdv2/fdmdv2-doc/latex/annotated.tex
+++ b/fdmdv2/fdmdv2-doc/latex/annotated.tex
@@ -2,7 +2,6 @@
 Here are the classes, structs, unions and interfaces with brief descriptions\-:\begin{DoxyCompactList}
 \item\contentsline{section}{\hyperlink{class_about_dlg}{About\-Dlg} }{\pageref{class_about_dlg}}{}
 \item\contentsline{section}{\hyperlink{class_audio_dlg}{Audio\-Dlg} }{\pageref{class_audio_dlg}}{}
-\item\contentsline{section}{\hyperlink{class_audio_stream}{Audio\-Stream} }{\pageref{class_audio_stream}}{}
 \item\contentsline{section}{\hyperlink{struct_c_o_m_p}{C\-O\-M\-P} }{\pageref{struct_c_o_m_p}}{}
 \item\contentsline{section}{\hyperlink{class_com_ports_dlg}{Com\-Ports\-Dlg} }{\pageref{class_com_ports_dlg}}{}
 \item\contentsline{section}{\hyperlink{class_dlg_about}{Dlg\-About} }{\pageref{class_dlg_about}}{}

diff --git a/fdmdv2/fdmdv2-doc/latex/class_main_app.tex b/fdmdv2/fdmdv2-doc/latex/class_main_app.tex
index db1237f7dfc447758cd2abae7845cb1041d31c8f..12b9d204849d38b8894c8a6604842920bb50671e 100644 (file)
--- a/fdmdv2/fdmdv2-doc/latex/class_main_app.tex
+++ b/fdmdv2/fdmdv2-doc/latex/class_main_app.tex
@@ -27,6 +27,15 @@ Collaboration diagram for Main\-App\-:\nopagebreak
 \item 
 \hypertarget{class_main_app_aff49a6bb4a0494d717a3136e9fe17351}{virtual int {\bfseries On\-Exit} ()}\label{class_main_app_aff49a6bb4a0494d717a3136e9fe17351}
 
+\item 
+\hypertarget{class_main_app_af06cc098b89d1c606aa94ad87d6b0105}{bool {\bfseries load\-Config} ()}\label{class_main_app_af06cc098b89d1c606aa94ad87d6b0105}
+
+\end{DoxyCompactItemize}
+\subsection*{Protected Attributes}
+\begin{DoxyCompactItemize}
+\item 
+\hypertarget{class_main_app_ae6022a31caf96dbcc2f519fc5fdc0bbe}{wx\-Config $\ast$ {\bfseries g\-\_\-config}}\label{class_main_app_ae6022a31caf96dbcc2f519fc5fdc0bbe}
+
 \end{DoxyCompactItemize}
 
 

diff --git a/fdmdv2/fdmdv2-doc/latex/class_main_frame.tex b/fdmdv2/fdmdv2-doc/latex/class_main_frame.tex
index b21bbab3e2a11766f0ed027bbeeba23aebf598db..4334ebb8563ca3799c02958adeccd751f7627617 100644 (file)
--- a/fdmdv2/fdmdv2-doc/latex/class_main_frame.tex
+++ b/fdmdv2/fdmdv2-doc/latex/class_main_frame.tex
@@ -24,6 +24,9 @@ Collaboration diagram for Main\-Frame\-:\nopagebreak
 \item 
 \hypertarget{class_main_frame_a394b51dbf31b7430ecad3f6ee1007e22}{{\bfseries Main\-Frame} (wx\-Window $\ast$parent)}\label{class_main_frame_a394b51dbf31b7430ecad3f6ee1007e22}
 
+\item 
+\hypertarget{class_main_frame_af9f4cfb8469872efd9c057d1bc215f08}{void {\bfseries per\-\_\-frame\-\_\-rx\-\_\-processing} (short output\-\_\-buf\mbox{[}$\,$\mbox{]}, int $\ast$n\-\_\-output\-\_\-buf, int codec\-\_\-bits\mbox{[}$\,$\mbox{]}, short input\-\_\-buf\mbox{[}$\,$\mbox{]}, int $\ast$n\-\_\-input\-\_\-buf, int $\ast$nin, int $\ast$state, struct C\-O\-D\-E\-C2 $\ast$c2)}\label{class_main_frame_af9f4cfb8469872efd9c057d1bc215f08}
+
 \end{DoxyCompactItemize}
 \subsection*{Static Public Member Functions}
 \begin{DoxyCompactItemize}
@@ -93,6 +96,12 @@ Collaboration diagram for Main\-Frame\-:\nopagebreak
 \item 
 \hypertarget{class_main_frame_a6458de14647c34b3ae5ace81992710d6}{wx\-Sound $\ast$ {\bfseries m\-\_\-sound}}\label{class_main_frame_a6458de14647c34b3ae5ace81992710d6}
 
+\item 
+\hypertarget{class_main_frame_aae86bcc3a14e94ddc496b9cce6a63c56}{struct F\-D\-M\-D\-V $\ast$ {\bfseries m\-\_\-p\-F\-D\-M\-D\-V\-\_\-state}}\label{class_main_frame_aae86bcc3a14e94ddc496b9cce6a63c56}
+
+\item 
+\hypertarget{class_main_frame_aabe58bef730ca69b342f8ac663c3d70d}{wx\-Timer {\bfseries m\-\_\-plot\-Timer}}\label{class_main_frame_aabe58bef730ca69b342f8ac663c3d70d}
+
 \end{DoxyCompactItemize}
 \subsection*{Protected Member Functions}
 \begin{DoxyCompactItemize}
@@ -102,6 +111,9 @@ Collaboration diagram for Main\-Frame\-:\nopagebreak
 \item 
 \hypertarget{class_main_frame_ab9ed8ca71402b68b41fd5a7cedb20928}{virtual void {\bfseries On\-Exit\-Click} (wx\-Command\-Event \&event)}\label{class_main_frame_ab9ed8ca71402b68b41fd5a7cedb20928}
 
+\item 
+\hypertarget{class_main_frame_a31585b905eee875973b106f4e79c263f}{void {\bfseries average\-Data} (float mag\-\_\-d\-B\mbox{[}$\,$\mbox{]})}\label{class_main_frame_a31585b905eee875973b106f4e79c263f}
+
 \item 
 \hypertarget{class_main_frame_af01eb2c59f1a9bcee0b956f8a72004c0}{void {\bfseries start\-Tx\-Stream} ()}\label{class_main_frame_af01eb2c59f1a9bcee0b956f8a72004c0}
 
@@ -243,6 +255,9 @@ Collaboration diagram for Main\-Frame\-:\nopagebreak
 \item 
 \hypertarget{class_main_frame_a4757c5d7d0e9b2c98dc34336f1dce49e}{void {\bfseries On\-Update\-U\-I} (wx\-Update\-U\-I\-Event \&event)}\label{class_main_frame_a4757c5d7d0e9b2c98dc34336f1dce49e}
 
+\item 
+\hypertarget{class_main_frame_a9ad22e55c7a3c93f9c071d366ae760d6}{void {\bfseries On\-Timer} (wx\-Timer\-Event \&evt)}\label{class_main_frame_a9ad22e55c7a3c93f9c071d366ae760d6}
+
 \item 
 \hypertarget{class_main_frame_a2577b78ec0105922e5356287519d2e54}{wx\-String {\bfseries Load\-User\-Image} (wx\-Image \&image)}\label{class_main_frame_a2577b78ec0105922e5356287519d2e54}
 

diff --git a/fdmdv2/fdmdv2-doc/latex/class_plot_panel.tex b/fdmdv2/fdmdv2-doc/latex/class_plot_panel.tex
index a2504f19399d7a15a16c855ca9f679e919d3464c..13c5318d6e5cf40413abca04f69786b408acfe74 100644 (file)
--- a/fdmdv2/fdmdv2-doc/latex/class_plot_panel.tex
+++ b/fdmdv2/fdmdv2-doc/latex/class_plot_panel.tex
@@ -52,10 +52,10 @@ Collaboration diagram for Plot\-Panel\-:\nopagebreak
 \hypertarget{class_plot_panel_a042c9df2ebe0c245d9fb5f3aa63595bc}{void {\bfseries paint\-Event} (wx\-Paint\-Event \&evt)}\label{class_plot_panel_a042c9df2ebe0c245d9fb5f3aa63595bc}
 
 \item 
-\hypertarget{class_plot_panel_a5f35a9628a035ef904fb056f5ebcc3c3}{virtual void {\bfseries draw} (wx\-Auto\-Buffered\-Paint\-D\-C \&dc)}\label{class_plot_panel_a5f35a9628a035ef904fb056f5ebcc3c3}
+\hypertarget{class_plot_panel_a974601747a67a4637a3a133cefe70c13}{virtual void {\bfseries draw} (wx\-Auto\-Buffered\-Paint\-D\-C \&pdc)}\label{class_plot_panel_a974601747a67a4637a3a133cefe70c13}
 
 \item 
-\hypertarget{class_plot_panel_ac9a8cc0d4ab016dc22195b813643c675}{virtual void {\bfseries draw\-Graticule} (wx\-Auto\-Buffered\-Paint\-D\-C \&dc)}\label{class_plot_panel_ac9a8cc0d4ab016dc22195b813643c675}
+\hypertarget{class_plot_panel_a5444b418c756380e5e08f86a34615be3}{virtual void {\bfseries draw\-Graticule} (wx\-Auto\-Buffered\-Paint\-D\-C \&pdc)}\label{class_plot_panel_a5444b418c756380e5e08f86a34615be3}
 
 \item 
 \hypertarget{class_plot_panel_a8e8722d1f4c02f166f7acd6905ea4009}{virtual double {\bfseries Set\-Zoom\-Factor} (double zf)}\label{class_plot_panel_a8e8722d1f4c02f166f7acd6905ea4009}
@@ -85,13 +85,16 @@ Collaboration diagram for Plot\-Panel\-:\nopagebreak
 \hypertarget{class_plot_panel_a229628c08bb7d0fa16589dbf83d635d1}{wx\-Pen {\bfseries m\-\_\-pen\-Solid}}\label{class_plot_panel_a229628c08bb7d0fa16589dbf83d635d1}
 
 \item 
-\hypertarget{class_plot_panel_ad1cfa169df1cfa5ef798b57d2619d742}{wx\-Rect {\bfseries m\-\_\-rect\-Ctrl}}\label{class_plot_panel_ad1cfa169df1cfa5ef798b57d2619d742}
+\hypertarget{class_plot_panel_aef7e50cc8a27b9434d17d7d8c245606c}{wx\-Rect {\bfseries m\-\_\-r\-Ctrl\-Prev}}\label{class_plot_panel_aef7e50cc8a27b9434d17d7d8c245606c}
 
 \item 
-\hypertarget{class_plot_panel_a467e202bbd0fa3ef1997fa2b322e349d}{wx\-Rect {\bfseries m\-\_\-rect\-Grid}}\label{class_plot_panel_a467e202bbd0fa3ef1997fa2b322e349d}
+\hypertarget{class_plot_panel_a2c10cfe6bcd979613cec037a71ba2c94}{wx\-Rect {\bfseries m\-\_\-r\-Ctrl}}\label{class_plot_panel_a2c10cfe6bcd979613cec037a71ba2c94}
 
 \item 
-\hypertarget{class_plot_panel_afcee74e089f5a50659bb534db80532d9}{wx\-Rect {\bfseries m\-\_\-rect\-Plot}}\label{class_plot_panel_afcee74e089f5a50659bb534db80532d9}
+\hypertarget{class_plot_panel_ae8d79eab28220ea1fa8ffcbfd70bc84a}{wx\-Rect {\bfseries m\-\_\-r\-Grid}}\label{class_plot_panel_ae8d79eab28220ea1fa8ffcbfd70bc84a}
+
+\item 
+\hypertarget{class_plot_panel_aa4d6249f2f09d03682b8fa704be04548}{wx\-Rect {\bfseries m\-\_\-r\-Plot}}\label{class_plot_panel_aa4d6249f2f09d03682b8fa704be04548}
 
 \item 
 \hypertarget{class_plot_panel_ad28637582a93843082fc7b1d8d80c807}{\hyperlink{class_main_frame}{Main\-Frame} $\ast$ {\bfseries m\-\_\-p\-Top\-Frame}}\label{class_plot_panel_ad28637582a93843082fc7b1d8d80c807}
@@ -123,12 +126,6 @@ Collaboration diagram for Plot\-Panel\-:\nopagebreak
 \item 
 \hypertarget{class_plot_panel_a822981fef8ff50da327b3dbca9fd2777}{int {\bfseries m\-\_\-y}}\label{class_plot_panel_a822981fef8ff50da327b3dbca9fd2777}
 
-\item 
-\hypertarget{class_plot_panel_ae78b6e7fc3e44bea81809813d753125c}{int {\bfseries m\-\_\-w}}\label{class_plot_panel_ae78b6e7fc3e44bea81809813d753125c}
-
-\item 
-\hypertarget{class_plot_panel_adcc3cec53897df2c9e99a980938092c1}{int {\bfseries m\-\_\-h}}\label{class_plot_panel_adcc3cec53897df2c9e99a980938092c1}
-
 \item 
 \hypertarget{class_plot_panel_ab41676a2e46c2e801bc639c274a7d5f5}{int {\bfseries m\-\_\-left}}\label{class_plot_panel_ab41676a2e46c2e801bc639c274a7d5f5}
 
@@ -159,6 +156,9 @@ Collaboration diagram for Plot\-Panel\-:\nopagebreak
 \item 
 \hypertarget{class_plot_panel_acebe9485868374626f03516e3508b592}{bool {\bfseries m\-\_\-mouse\-Down}}\label{class_plot_panel_acebe9485868374626f03516e3508b592}
 
+\item 
+\hypertarget{class_plot_panel_a1bb0714da68ee75a51a4ebb9e9ea3cad}{bool {\bfseries m\-\_\-first\-Pass}}\label{class_plot_panel_a1bb0714da68ee75a51a4ebb9e9ea3cad}
+
 \item 
 \hypertarget{class_plot_panel_ae2f4907a8e4ed958ef4995e99b1f7148}{double {\bfseries m\-\_\-zoom\-Factor}}\label{class_plot_panel_ae2f4907a8e4ed958ef4995e99b1f7148}
 

diff --git a/fdmdv2/fdmdv2-doc/latex/class_plot_waterfall.tex b/fdmdv2/fdmdv2-doc/latex/class_plot_waterfall.tex
index 063b200ae325a603acfa4fa8a2c72382491c1515..b86524675587a3537e5239ff5a4e750b290dad4f 100644 (file)
--- a/fdmdv2/fdmdv2-doc/latex/class_plot_waterfall.tex
+++ b/fdmdv2/fdmdv2-doc/latex/class_plot_waterfall.tex
@@ -33,9 +33,6 @@ Collaboration diagram for Plot\-Waterfall\-:\nopagebreak
 \item 
 \hypertarget{class_plot_waterfall_a37d541349ac6f010a90fee3b9f32fbbb}{void {\bfseries On\-Paint} (wx\-Paint\-Event \&evt)}\label{class_plot_waterfall_a37d541349ac6f010a90fee3b9f32fbbb}
 
-\item 
-\hypertarget{class_plot_waterfall_adae15df2acf8dd7a1812ea79b2708b65}{void {\bfseries On\-Size} (wx\-Size\-Event \&event)}\label{class_plot_waterfall_adae15df2acf8dd7a1812ea79b2708b65}
-
 \item 
 \hypertarget{class_plot_waterfall_ad55e0e3078f0d5c3699df36ba6d8ab5d}{void {\bfseries On\-Show} (wx\-Show\-Event \&event)}\label{class_plot_waterfall_ad55e0e3078f0d5c3699df36ba6d8ab5d}
 
@@ -43,10 +40,7 @@ Collaboration diagram for Plot\-Waterfall\-:\nopagebreak
 \hypertarget{class_plot_waterfall_aa97d243b7bb91238b7493dcb96139803}{void {\bfseries draw\-Graticule} (wx\-Auto\-Buffered\-Paint\-D\-C \&dc)}\label{class_plot_waterfall_aa97d243b7bb91238b7493dcb96139803}
 
 \item 
-\hypertarget{class_plot_waterfall_a3956d17d4ece2c0ca4d50b6f7002b24c}{void {\bfseries draw} (wx\-Auto\-Buffered\-Paint\-D\-C \&dc)}\label{class_plot_waterfall_a3956d17d4ece2c0ca4d50b6f7002b24c}
-
-\item 
-\hypertarget{class_plot_waterfall_ae19ead564f66f723b7192dbb2bd5815b}{void {\bfseries plot\-Data} (wx\-Auto\-Buffered\-Paint\-D\-C \&dc)}\label{class_plot_waterfall_ae19ead564f66f723b7192dbb2bd5815b}
+\hypertarget{class_plot_waterfall_a86c6b3a9dc720b681f7b4e47d1fe193d}{void {\bfseries draw} (wx\-Auto\-Buffered\-Paint\-D\-C \&pdc)}\label{class_plot_waterfall_a86c6b3a9dc720b681f7b4e47d1fe193d}
 
 \item 
 \hypertarget{class_plot_waterfall_aec560c10f32a6c6e92a62225288c28f3}{void {\bfseries plot\-Pixel\-Data} (wx\-Auto\-Buffered\-Paint\-D\-C \&dc)}\label{class_plot_waterfall_aec560c10f32a6c6e92a62225288c28f3}
@@ -60,6 +54,12 @@ Collaboration diagram for Plot\-Waterfall\-:\nopagebreak
 \item 
 \hypertarget{class_plot_waterfall_a1cb3639849f17b1882b2b3713fd690cf}{int {\bfseries m\-\_\-greyscale}}\label{class_plot_waterfall_a1cb3639849f17b1882b2b3713fd690cf}
 
+\item 
+\hypertarget{class_plot_waterfall_a1b80aa40a1194ece27c87ec265ef7d2c}{wx\-Memory\-D\-C {\bfseries m\-\_\-m\-D\-C}}\label{class_plot_waterfall_a1b80aa40a1194ece27c87ec265ef7d2c}
+
+\item 
+\hypertarget{class_plot_waterfall_aa0b8f5bb510697a7eb8f48628a39b9c7}{int {\bfseries m\-\_\-line\-\_\-color}}\label{class_plot_waterfall_aa0b8f5bb510697a7eb8f48628a39b9c7}
+
 \end{DoxyCompactItemize}
 \subsection*{Additional Inherited Members}
 

diff --git a/fdmdv2/fdmdv2-doc/latex/class_port_audio_wrap.tex b/fdmdv2/fdmdv2-doc/latex/class_port_audio_wrap.tex
index 54f9fabb7010ceca5f30368a2fe5c6a4aa1b89bd..ec3ac27546f96893cc4a596675f5f47fe79d957c 100644 (file)
--- a/fdmdv2/fdmdv2-doc/latex/class_port_audio_wrap.tex
+++ b/fdmdv2/fdmdv2-doc/latex/class_port_audio_wrap.tex
@@ -4,7 +4,7 @@
 \subsection*{Public Member Functions}
 \begin{DoxyCompactItemize}
 \item 
-\hypertarget{class_port_audio_wrap_a4af13f96f4f8639148668c89942b3365}{void {\bfseries per\-\_\-frame\-\_\-rx\-\_\-processing} (short output\-\_\-buf\mbox{[}$\,$\mbox{]}, int $\ast$n\-\_\-output\-\_\-buf, int codec\-\_\-bits\mbox{[}$\,$\mbox{]}, short input\-\_\-buf\mbox{[}$\,$\mbox{]}, int $\ast$n\-\_\-input\-\_\-buf, int $\ast$nin, int $\ast$state, struct C\-O\-D\-E\-C2 $\ast$c2)}\label{class_port_audio_wrap_a4af13f96f4f8639148668c89942b3365}
+\hypertarget{class_port_audio_wrap_a987405b6ca5fbecb33ac69ddfe843659}{void {\bfseries average\-Data} (float mag\-\_\-d\-B\mbox{[}$\,$\mbox{]})}\label{class_port_audio_wrap_a987405b6ca5fbecb33ac69ddfe843659}
 
 \item 
 \hypertarget{class_port_audio_wrap_a2a122bf5de62e7f1fb1bfed6801e063c}{Pa\-Device\-Index {\bfseries get\-Default\-Input\-Device} ()}\label{class_port_audio_wrap_a2a122bf5de62e7f1fb1bfed6801e063c}
@@ -25,16 +25,16 @@
 \hypertarget{class_port_audio_wrap_a47fe0dd437c0a4693824966e7100255a}{Pa\-Error {\bfseries set\-Stream\-Flags} (Pa\-Stream\-Flags flags)}\label{class_port_audio_wrap_a47fe0dd437c0a4693824966e7100255a}
 
 \item 
-\hypertarget{class_port_audio_wrap_a7b455cc4397b90c6d381c26073e51b2a}{Pa\-Error {\bfseries set\-Callback} (Pa\-Stream\-Callback $\ast$stream\-Callback)}\label{class_port_audio_wrap_a7b455cc4397b90c6d381c26073e51b2a}
+\hypertarget{class_port_audio_wrap_a2a40702f7b56abb4b6927fb6493db92e}{Pa\-Error {\bfseries set\-Callback} (Pa\-Stream\-Callback $\ast$m\-\_\-p\-Stream\-Callback)}\label{class_port_audio_wrap_a2a40702f7b56abb4b6927fb6493db92e}
 
 \item 
 \hypertarget{class_port_audio_wrap_adf02f262bcd9f85c33fea7da0e4cd841}{Pa\-Error {\bfseries set\-Stream\-Callback} (Pa\-Stream $\ast$stream, Pa\-Stream\-Callback $\ast$callback)}\label{class_port_audio_wrap_adf02f262bcd9f85c33fea7da0e4cd841}
 
 \item 
-\hypertarget{class_port_audio_wrap_a163f9ff1095444793a25f1e90442b32c}{Pa\-Error {\bfseries set\-Stream\-Finished\-Callback} (Pa\-Stream $\ast$stream, Pa\-Stream\-Finished\-Callback $\ast$stream\-Finished\-Callback)}\label{class_port_audio_wrap_a163f9ff1095444793a25f1e90442b32c}
+\hypertarget{class_port_audio_wrap_a85e2c0e5700cacd09a330cd6573cff7d}{Pa\-Error {\bfseries set\-Stream\-Finished\-Callback} (Pa\-Stream $\ast$stream, Pa\-Stream\-Finished\-Callback $\ast$m\-\_\-p\-Stream\-Finished\-Callback)}\label{class_port_audio_wrap_a85e2c0e5700cacd09a330cd6573cff7d}
 
 \item 
-\hypertarget{class_port_audio_wrap_ae9fa5c4e8bd989d3ff722c76a381f33f}{Pa\-Error {\bfseries stream\-Open} ()}\label{class_port_audio_wrap_ae9fa5c4e8bd989d3ff722c76a381f33f}
+\hypertarget{class_port_audio_wrap_a132273a300efd015cf3d66ee5b250216}{void {\bfseries set\-Input\-Buffer} (const Pa\-Stream\-Parameters \&input\-Buffer)}\label{class_port_audio_wrap_a132273a300efd015cf3d66ee5b250216}
 
 \item 
 \hypertarget{class_port_audio_wrap_abf1e9b6f6b6e09df0b926c7995963575}{Pa\-Error {\bfseries set\-Input\-Device} (Pa\-Device\-Index dev)}\label{class_port_audio_wrap_abf1e9b6f6b6e09df0b926c7995963575}
@@ -78,71 +78,59 @@
 \item 
 \hypertarget{class_port_audio_wrap_a619ad8a126e30b328468a57c8047f2f8}{Pa\-Error {\bfseries set\-Output\-Latency} (Pa\-Time latency)}\label{class_port_audio_wrap_a619ad8a126e30b328468a57c8047f2f8}
 
-\item 
-\hypertarget{class_port_audio_wrap_a879e58affa1895a9fd737b44e72b609e}{Pa\-Error {\bfseries stream\-Start} ()}\label{class_port_audio_wrap_a879e58affa1895a9fd737b44e72b609e}
-
-\item 
-\hypertarget{class_port_audio_wrap_a7f900dbb4003a1e01341e4f9f95c72e8}{Pa\-Error {\bfseries stream\-Close} ()}\label{class_port_audio_wrap_a7f900dbb4003a1e01341e4f9f95c72e8}
-
 \item 
 \hypertarget{class_port_audio_wrap_ab7d9fc6cda5c61cda105e6d9bba9215c}{void {\bfseries set\-Output\-Host\-Api\-Stream\-Info} (void $\ast$info=N\-U\-L\-L)}\label{class_port_audio_wrap_ab7d9fc6cda5c61cda105e6d9bba9215c}
 
 \item 
 \hypertarget{class_port_audio_wrap_a1014d8750069b7dc914e6f836da79660}{Pa\-Time {\bfseries get\-Output\-Default\-Low\-Latency} ()}\label{class_port_audio_wrap_a1014d8750069b7dc914e6f836da79660}
 
-\item 
-\hypertarget{class_port_audio_wrap_a987405b6ca5fbecb33ac69ddfe843659}{void {\bfseries average\-Data} (float mag\-\_\-d\-B\mbox{[}$\,$\mbox{]})}\label{class_port_audio_wrap_a987405b6ca5fbecb33ac69ddfe843659}
-
 \item 
 \hypertarget{class_port_audio_wrap_a65d6263d05a44f6696a3eb93a669e862}{void {\bfseries set\-Fdmdv\-State} (F\-D\-M\-D\-V $\ast$fdmdv\-\_\-state)}\label{class_port_audio_wrap_a65d6263d05a44f6696a3eb93a669e862}
 
-\item 
-\hypertarget{class_port_audio_wrap_a132273a300efd015cf3d66ee5b250216}{void {\bfseries set\-Input\-Buffer} (const Pa\-Stream\-Parameters \&input\-Buffer)}\label{class_port_audio_wrap_a132273a300efd015cf3d66ee5b250216}
-
 \item 
 \hypertarget{class_port_audio_wrap_a2284b3598963428bd5970b69a2ec0370}{void {\bfseries set\-Output\-Buffer} (const Pa\-Stream\-Parameters \&output\-Buffer)}\label{class_port_audio_wrap_a2284b3598963428bd5970b69a2ec0370}
 
 \item 
-\hypertarget{class_port_audio_wrap_a20f5cf508b5e13bd29632acb1af52d26}{void {\bfseries set\-Samplerate} (int samplerate)}\label{class_port_audio_wrap_a20f5cf508b5e13bd29632acb1af52d26}
+\hypertarget{class_port_audio_wrap_a4d2bb7132714099aa2a0390f11a57ce6}{void {\bfseries set\-Time\-Info} (Pa\-Stream\-Callback\-Time\-Info $\ast$time\-Info)}\label{class_port_audio_wrap_a4d2bb7132714099aa2a0390f11a57ce6}
 
 \item 
-\hypertarget{class_port_audio_wrap_ad2c8ee53c0f11504777d1dc41747b453}{void {\bfseries set\-Status\-Flags} (const Pa\-Stream\-Callback\-Flags \&status\-Flags)}\label{class_port_audio_wrap_ad2c8ee53c0f11504777d1dc41747b453}
+\hypertarget{class_port_audio_wrap_a2bac5a36a40fd1f86df5c1f94e964ac4}{void {\bfseries set\-User\-Data} (void $\ast$user\-Data)}\label{class_port_audio_wrap_a2bac5a36a40fd1f86df5c1f94e964ac4}
 
 \item 
-\hypertarget{class_port_audio_wrap_a8f18f16ddf796eba036e11694b25a2a4}{void {\bfseries set\-Stream} (Pa\-Stream $\ast$stream)}\label{class_port_audio_wrap_a8f18f16ddf796eba036e11694b25a2a4}
+\hypertarget{class_port_audio_wrap_ad2ea7c12d674b8bf882a5a5ffdff7acb}{unsigned long {\bfseries get\-Frames\-Per\-Buffer} () const }\label{class_port_audio_wrap_ad2ea7c12d674b8bf882a5a5ffdff7acb}
 
 \item 
-\hypertarget{class_port_audio_wrap_a13581d19c503fc1a837078c31d80df11}{void {\bfseries set\-Stream\-Finished\-Callback} (Pa\-Stream\-Finished\-Callback $\ast$stream\-Finished\-Callback)}\label{class_port_audio_wrap_a13581d19c503fc1a837078c31d80df11}
+\hypertarget{class_port_audio_wrap_a3e2997d41e53309bfb6b06baabb43a04}{const Pa\-Stream\-Parameters \& {\bfseries get\-Input\-Buffer} () const }\label{class_port_audio_wrap_a3e2997d41e53309bfb6b06baabb43a04}
 
 \item 
-\hypertarget{class_port_audio_wrap_a4d2bb7132714099aa2a0390f11a57ce6}{void {\bfseries set\-Time\-Info} (Pa\-Stream\-Callback\-Time\-Info $\ast$time\-Info)}\label{class_port_audio_wrap_a4d2bb7132714099aa2a0390f11a57ce6}
+\hypertarget{class_port_audio_wrap_abb0273b674c970ee96594dd61f7abfc9}{const Pa\-Stream\-Parameters \& {\bfseries get\-Output\-Buffer} () const }\label{class_port_audio_wrap_abb0273b674c970ee96594dd61f7abfc9}
 
 \item 
-\hypertarget{class_port_audio_wrap_a2bac5a36a40fd1f86df5c1f94e964ac4}{void {\bfseries set\-User\-Data} (void $\ast$user\-Data)}\label{class_port_audio_wrap_a2bac5a36a40fd1f86df5c1f94e964ac4}
+\hypertarget{class_port_audio_wrap_a43a6d5f7562fde40166872b77a7804ea}{const Pa\-Stream\-Callback\-Flags \& {\bfseries get\-Status\-Flags} () const }\label{class_port_audio_wrap_a43a6d5f7562fde40166872b77a7804ea}
 
 \item 
 \hypertarget{class_port_audio_wrap_a66693a413ee2158cc331253a1035f915}{F\-D\-M\-D\-V $\ast$ {\bfseries get\-Fdmdv\-State} ()}\label{class_port_audio_wrap_a66693a413ee2158cc331253a1035f915}
 
 \item 
-\hypertarget{class_port_audio_wrap_ad2ea7c12d674b8bf882a5a5ffdff7acb}{unsigned long {\bfseries get\-Frames\-Per\-Buffer} () const }\label{class_port_audio_wrap_ad2ea7c12d674b8bf882a5a5ffdff7acb}
+\hypertarget{class_port_audio_wrap_a2007046aefb3754994b3fe883b237177}{int {\bfseries get\-Samplerate} () const }\label{class_port_audio_wrap_a2007046aefb3754994b3fe883b237177}
 
 \item 
-\hypertarget{class_port_audio_wrap_a3e2997d41e53309bfb6b06baabb43a04}{const Pa\-Stream\-Parameters \& {\bfseries get\-Input\-Buffer} () const }\label{class_port_audio_wrap_a3e2997d41e53309bfb6b06baabb43a04}
+\hypertarget{class_port_audio_wrap_a33fed4f960c963aff711932ee84e9a1e}{Pa\-Stream $\ast$ {\bfseries get\-Stream} ()}\label{class_port_audio_wrap_a33fed4f960c963aff711932ee84e9a1e}
 
 \item 
-\hypertarget{class_port_audio_wrap_abb0273b674c970ee96594dd61f7abfc9}{const Pa\-Stream\-Parameters \& {\bfseries get\-Output\-Buffer} () const }\label{class_port_audio_wrap_abb0273b674c970ee96594dd61f7abfc9}
+\hypertarget{class_port_audio_wrap_a07fdd881924d8b7b31b0ed309a8d56cb}{void $\ast$ {\bfseries get\-User\-Data} ()}\label{class_port_audio_wrap_a07fdd881924d8b7b31b0ed309a8d56cb}
 
 \item 
-\hypertarget{class_port_audio_wrap_a2007046aefb3754994b3fe883b237177}{int {\bfseries get\-Samplerate} () const }\label{class_port_audio_wrap_a2007046aefb3754994b3fe883b237177}
+\hypertarget{class_port_audio_wrap_afd5fd9f501e93f712e46b0d805b57493}{bool {\bfseries get\-Data\-Avail} ()}\label{class_port_audio_wrap_afd5fd9f501e93f712e46b0d805b57493}
 
 \item 
-\hypertarget{class_port_audio_wrap_a43a6d5f7562fde40166872b77a7804ea}{const Pa\-Stream\-Callback\-Flags \& {\bfseries get\-Status\-Flags} () const }\label{class_port_audio_wrap_a43a6d5f7562fde40166872b77a7804ea}
+\hypertarget{class_port_audio_wrap_a879e58affa1895a9fd737b44e72b609e}{Pa\-Error {\bfseries stream\-Start} ()}\label{class_port_audio_wrap_a879e58affa1895a9fd737b44e72b609e}
 
 \item 
-\hypertarget{class_port_audio_wrap_a33fed4f960c963aff711932ee84e9a1e}{Pa\-Stream $\ast$ {\bfseries get\-Stream} ()}\label{class_port_audio_wrap_a33fed4f960c963aff711932ee84e9a1e}
+\hypertarget{class_port_audio_wrap_a7f900dbb4003a1e01341e4f9f95c72e8}{Pa\-Error {\bfseries stream\-Close} ()}\label{class_port_audio_wrap_a7f900dbb4003a1e01341e4f9f95c72e8}
 
 \item 
-\hypertarget{class_port_audio_wrap_a07fdd881924d8b7b31b0ed309a8d56cb}{void $\ast$ {\bfseries get\-User\-Data} ()}\label{class_port_audio_wrap_a07fdd881924d8b7b31b0ed309a8d56cb}
+\hypertarget{class_port_audio_wrap_ae9fa5c4e8bd989d3ff722c76a381f33f}{Pa\-Error {\bfseries stream\-Open} ()}\label{class_port_audio_wrap_ae9fa5c4e8bd989d3ff722c76a381f33f}
 
 \item 
 \hypertarget{class_port_audio_wrap_a73b644da1b76cd3c6b1900218fcb4873}{void {\bfseries terminate} ()}\label{class_port_audio_wrap_a73b644da1b76cd3c6b1900218fcb4873}

diff --git a/fdmdv2/fdmdv2-doc/latex/class_top_frame.tex b/fdmdv2/fdmdv2-doc/latex/class_top_frame.tex
index c61439b75ba8072584ce3a44c42d38ade4680a10..2754555b1dff7f9dfb26d9ae769105f5258e7c51 100644 (file)
--- a/fdmdv2/fdmdv2-doc/latex/class_top_frame.tex
+++ b/fdmdv2/fdmdv2-doc/latex/class_top_frame.tex
@@ -7,8 +7,7 @@
 
 
 
-Inheritance diagram for Top\-Frame\-:
-\nopagebreak
+Inheritance diagram for Top\-Frame\-:\nopagebreak
 \begin{figure}[H]
 \begin{center}
 \leavevmode

diff --git a/fdmdv2/fdmdv2-doc/latex/doxygen.sty b/fdmdv2/fdmdv2-doc/latex/doxygen.sty
index f105a1436497a079dd7a97ff0d5d6d21acc7f1c5..30fe0690496a38259a4c40fdc14380b22313b4ed 100644 (file)
--- a/fdmdv2/fdmdv2-doc/latex/doxygen.sty
+++ b/fdmdv2/fdmdv2-doc/latex/doxygen.sty
@@ -41,8 +41,8 @@
 \fancyhead[RO]{\fancyplain{}{\bfseries\thepage}}
 \fancyfoot[LE]{\fancyplain{}{}}
 \fancyfoot[CE]{\fancyplain{}{}}
-\fancyfoot[RE]{\fancyplain{}{\bfseries\scriptsize Generated on Tue Sep 11 2012 14\-:31\-:48 for F\-D\-M\-D\-V2 by Doxygen }}
-\fancyfoot[LO]{\fancyplain{}{\bfseries\scriptsize Generated on Tue Sep 11 2012 14\-:31\-:48 for F\-D\-M\-D\-V2 by Doxygen }}
+\fancyfoot[RE]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Sep 14 2012 18\-:21\-:30 for F\-D\-M\-D\-V2 by Doxygen }}
+\fancyfoot[LO]{\fancyplain{}{\bfseries\scriptsize Generated on Fri Sep 14 2012 18\-:21\-:30 for F\-D\-M\-D\-V2 by Doxygen }}
 \fancyfoot[CO]{\fancyplain{}{}}
 \fancyfoot[RO]{\fancyplain{}{}}
 %---------- Internal commands used in this style file ----------------

diff --git a/fdmdv2/fdmdv2-doc/latex/hierarchy.tex b/fdmdv2/fdmdv2-doc/latex/hierarchy.tex
index 3e31f6ddcfdc383e56c36897c55e2bfc0fb004f8..f3a15559f7140f5129a8717319579ddf7bc55d1d 100644 (file)
--- a/fdmdv2/fdmdv2-doc/latex/hierarchy.tex
+++ b/fdmdv2/fdmdv2-doc/latex/hierarchy.tex
@@ -1,6 +1,5 @@
 \section{Class Hierarchy}
 This inheritance list is sorted roughly, but not completely, alphabetically\-:\begin{DoxyCompactList}
-\item \contentsline{section}{Audio\-Stream}{\pageref{class_audio_stream}}{}
 \item \contentsline{section}{C\-O\-M\-P}{\pageref{struct_c_o_m_p}}{}
 \item \contentsline{section}{pa\-Call\-Back\-Data}{\pageref{structpa_call_back_data}}{}
 \item \contentsline{section}{Port\-Audio\-Wrap}{\pageref{class_port_audio_wrap}}{}

diff --git a/fdmdv2/fdmdv2-doc/latex/refman.tex b/fdmdv2/fdmdv2-doc/latex/refman.tex
index 6d2dec57a2ddc63e8bad509c64349fed6aa6a971..1598d973d26e3917fda192d8bc30d79d42d269c3 100644 (file)
--- a/fdmdv2/fdmdv2-doc/latex/refman.tex
+++ b/fdmdv2/fdmdv2-doc/latex/refman.tex
@@ -54,7 +54,7 @@
 \vspace*{1cm}
 {\large Generated by Doxygen 1.8.2}\\
 \vspace*{0.5cm}
-{\small Tue Sep 11 2012 14:31:49}\\
+{\small Fri Sep 14 2012 18:21:32}\\
 \end{center}
 \end{titlepage}
 \clearemptydoublepage
@@ -70,7 +70,6 @@
 \chapter{Class Documentation}
 \input{class_about_dlg}
 \input{class_audio_dlg}
-\input{class_audio_stream}
 \input{struct_c_o_m_p}
 \input{class_com_ports_dlg}
 \input{class_dlg_about}

diff --git a/fdmdv2/fdmdv2-doc/man/man3/AboutDlg.3 b/fdmdv2/fdmdv2-doc/man/man3/AboutDlg.3
index 0cbd24fd0048ed021b97a21c573e694efe7eccc3..3c01325f684bac841dca4e666dcf04eeb94084f8 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/AboutDlg.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/AboutDlg.3
@@ -1,4 +1,4 @@
-.TH "AboutDlg" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "AboutDlg" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/AudioDlg.3 b/fdmdv2/fdmdv2-doc/man/man3/AudioDlg.3
index eecc6fd6b18bdc633dcb9b310f3a1950a3597657..b2a02d17aba62c18dff829fad15aa17b7cada649 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/AudioDlg.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/AudioDlg.3
@@ -1,4 +1,4 @@
-.TH "AudioDlg" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "AudioDlg" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/COMP.3 b/fdmdv2/fdmdv2-doc/man/man3/COMP.3
index b5e3613a1743b274b9a85dc9ee23aabea76a8eaa..1954df2732920af9d79df86c199d52f444b8802b 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/COMP.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/COMP.3
@@ -1,4 +1,4 @@
-.TH "COMP" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "COMP" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/C__bin_Projects_Radio_fdmdv2_src_.3 b/fdmdv2/fdmdv2-doc/man/man3/C__bin_Projects_Radio_fdmdv2_src_.3
index c4149bc8b36a587ad80ce866248419a9829fed39..3cb49ae74207b65161ed92dc06b25643e8606e6f 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/C__bin_Projects_Radio_fdmdv2_src_.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/C__bin_Projects_Radio_fdmdv2_src_.3
@@ -1,4 +1,4 @@
-.TH "C:/bin/Projects/Radio/fdmdv2/src Directory Reference" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "C:/bin/Projects/Radio/fdmdv2/src Directory Reference" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
@@ -10,12 +10,6 @@ C:/bin/Projects/Radio/fdmdv2/src Directory Reference \-
 
 .in +1c
 .ti -1c
-.RI "file \fBaudiostream\&.cpp\fP"
-.br
-.ti -1c
-.RI "file \fBaudiostream\&.h\fP"
-.br
-.ti -1c
 .RI "file \fBcomp\&.h\fP"
 .br
 .ti -1c

diff --git a/fdmdv2/fdmdv2-doc/man/man3/ComPortsDlg.3 b/fdmdv2/fdmdv2-doc/man/man3/ComPortsDlg.3
index c5a88cc9b980181e8b45d726256230e42c494870..dd6151ae593539c17b3ae42d4f835377060988fd 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/ComPortsDlg.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/ComPortsDlg.3
@@ -1,4 +1,4 @@
-.TH "ComPortsDlg" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "ComPortsDlg" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/DlgAbout.3 b/fdmdv2/fdmdv2-doc/man/man3/DlgAbout.3
index 7f029e50905615b6bc7653a899af0105ddb03d0d..a3911bb1cf26e4bd4d11420b25b6ae908b544eb9 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/DlgAbout.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/DlgAbout.3
@@ -1,4 +1,4 @@
-.TH "DlgAbout" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "DlgAbout" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/DlgAudio.3 b/fdmdv2/fdmdv2-doc/man/man3/DlgAudio.3
index 603426cf0fd6cc8634ab2f96790450ab257a60f1..e171ace69241a5ba21d71afb576a636c34642cad 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/DlgAudio.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/DlgAudio.3
@@ -1,4 +1,4 @@
-.TH "DlgAudio" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "DlgAudio" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/DlgComPorts.3 b/fdmdv2/fdmdv2-doc/man/man3/DlgComPorts.3
index 4c98d991f67a82f407fe77d96595a13c4b3a6040..2f7d7ed608afbd42a4d6022bc5191365ca0fb214 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/DlgComPorts.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/DlgComPorts.3
@@ -1,4 +1,4 @@
-.TH "DlgComPorts" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "DlgComPorts" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/DlgOptions.3 b/fdmdv2/fdmdv2-doc/man/man3/DlgOptions.3
index e6f554d6f8d7fbd8a0d9d095e25a07621f4a9b69..15a193f94631aab067d5fbe62b55b06d08c2db14 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/DlgOptions.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/DlgOptions.3
@@ -1,4 +1,4 @@
-.TH "DlgOptions" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "DlgOptions" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/MainApp.3 b/fdmdv2/fdmdv2-doc/man/man3/MainApp.3
index 9390647b4636678439e960f9180d4cc71be9fc77..1f969a6db75c1a52448172063fad8271a18ba504 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/MainApp.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/MainApp.3
@@ -1,4 +1,4 @@
-.TH "MainApp" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "MainApp" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
@@ -17,6 +17,16 @@ Inherits wxApp\&.
 .ti -1c
 .RI "virtual int \fBOnExit\fP ()"
 .br
+.ti -1c
+.RI "bool \fBloadConfig\fP ()"
+.br
+.in -1c
+.SS "Protected Attributes"
+
+.in +1c
+.ti -1c
+.RI "wxConfig * \fBg_config\fP"
+.br
 .in -1c
 
 .SH "Author"

diff --git a/fdmdv2/fdmdv2-doc/man/man3/MainFrame.3 b/fdmdv2/fdmdv2-doc/man/man3/MainFrame.3
index 435436ca34edc95eb894dbaa708490d2ba59f760..0591132ba8fb31cf2ee876b6419a4b5822b8df25 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/MainFrame.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/MainFrame.3
@@ -1,4 +1,4 @@
-.TH "MainFrame" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "MainFrame" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
@@ -14,6 +14,9 @@ Inherits \fBTopFrame\fP\&.
 .ti -1c
 .RI "\fBMainFrame\fP (wxWindow *parent)"
 .br
+.ti -1c
+.RI "void \fBper_frame_rx_processing\fP (short output_buf[], int *n_output_buf, int codec_bits[], short input_buf[], int *n_input_buf, int *nin, int *state, struct CODEC2 *c2)"
+.br
 .in -1c
 .SS "Static Public Member Functions"
 
@@ -85,6 +88,12 @@ Inherits \fBTopFrame\fP\&.
 .ti -1c
 .RI "wxSound * \fBm_sound\fP"
 .br
+.ti -1c
+.RI "struct FDMDV * \fBm_pFDMDV_state\fP"
+.br
+.ti -1c
+.RI "wxTimer \fBm_plotTimer\fP"
+.br
 .in -1c
 .SS "Protected Member Functions"
 
@@ -96,6 +105,9 @@ Inherits \fBTopFrame\fP\&.
 .RI "virtual void \fBOnExitClick\fP (wxCommandEvent &event)"
 .br
 .ti -1c
+.RI "void \fBaverageData\fP (float mag_dB[])"
+.br
+.ti -1c
 .RI "void \fBstartTxStream\fP ()"
 .br
 .ti -1c
@@ -237,6 +249,9 @@ Inherits \fBTopFrame\fP\&.
 .RI "void \fBOnUpdateUI\fP (wxUpdateUIEvent &event)"
 .br
 .ti -1c
+.RI "void \fBOnTimer\fP (wxTimerEvent &evt)"
+.br
+.ti -1c
 .RI "wxString \fBLoadUserImage\fP (wxImage &image)"
 .br
 .in -1c

diff --git a/fdmdv2/fdmdv2-doc/man/man3/OptionsDlg.3 b/fdmdv2/fdmdv2-doc/man/man3/OptionsDlg.3
index 8227f78092b302e27ba490d4c14a713109ae6de6..2bb8f91cf2a4957d8ba6e6d43f8cd95495e12341 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/OptionsDlg.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/OptionsDlg.3
@@ -1,4 +1,4 @@
-.TH "OptionsDlg" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "OptionsDlg" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/PlotPanel.3 b/fdmdv2/fdmdv2-doc/man/man3/PlotPanel.3
index 6993db040b7275e2b78ffbc77f792546ad7dc3c4..8ae83b94575eb33224a1becb784f5d9d5461bf03 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/PlotPanel.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/PlotPanel.3
@@ -1,4 +1,4 @@
-.TH "PlotPanel" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "PlotPanel" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
@@ -44,10 +44,10 @@ Inherited by \fBPlotScalar\fP, \fBPlotScatter\fP, \fBPlotSpectrum\fP, and \fBPlo
 .RI "void \fBpaintEvent\fP (wxPaintEvent &evt)"
 .br
 .ti -1c
-.RI "virtual void \fBdraw\fP (wxAutoBufferedPaintDC &dc)"
+.RI "virtual void \fBdraw\fP (wxAutoBufferedPaintDC &pdc)"
 .br
 .ti -1c
-.RI "virtual void \fBdrawGraticule\fP (wxAutoBufferedPaintDC &dc)"
+.RI "virtual void \fBdrawGraticule\fP (wxAutoBufferedPaintDC &pdc)"
 .br
 .ti -1c
 .RI "virtual double \fBSetZoomFactor\fP (double zf)"
@@ -78,13 +78,16 @@ Inherited by \fBPlotScalar\fP, \fBPlotScatter\fP, \fBPlotSpectrum\fP, and \fBPlo
 .RI "wxPen \fBm_penSolid\fP"
 .br
 .ti -1c
-.RI "wxRect \fBm_rectCtrl\fP"
+.RI "wxRect \fBm_rCtrlPrev\fP"
 .br
 .ti -1c
-.RI "wxRect \fBm_rectGrid\fP"
+.RI "wxRect \fBm_rCtrl\fP"
 .br
 .ti -1c
-.RI "wxRect \fBm_rectPlot\fP"
+.RI "wxRect \fBm_rGrid\fP"
+.br
+.ti -1c
+.RI "wxRect \fBm_rPlot\fP"
 .br
 .ti -1c
 .RI "\fBMainFrame\fP * \fBm_pTopFrame\fP"
@@ -118,12 +121,6 @@ Inherited by \fBPlotScalar\fP, \fBPlotScatter\fP, \fBPlotSpectrum\fP, and \fBPlo
 .RI "int \fBm_y\fP"
 .br
 .ti -1c
-.RI "int \fBm_w\fP"
-.br
-.ti -1c
-.RI "int \fBm_h\fP"
-.br
-.ti -1c
 .RI "int \fBm_left\fP"
 .br
 .ti -1c
@@ -154,6 +151,9 @@ Inherited by \fBPlotScalar\fP, \fBPlotScatter\fP, \fBPlotSpectrum\fP, and \fBPlo
 .RI "bool \fBm_mouseDown\fP"
 .br
 .ti -1c
+.RI "bool \fBm_firstPass\fP"
+.br
+.ti -1c
 .RI "double \fBm_zoomFactor\fP"
 .br
 .in -1c

diff --git a/fdmdv2/fdmdv2-doc/man/man3/PlotScalar.3 b/fdmdv2/fdmdv2-doc/man/man3/PlotScalar.3
index 827c2a6c979d3145c45597f1bcc319c2c0ce081e..45831a77c1058339f6273769d276aed14edba05a 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/PlotScalar.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/PlotScalar.3
@@ -1,4 +1,4 @@
-.TH "PlotScalar" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "PlotScalar" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/PlotScatter.3 b/fdmdv2/fdmdv2-doc/man/man3/PlotScatter.3
index aaf2fee1299ffa65bb6318c6521d4a63f0293348..79cb98d2476b74af29bf1b6d3b95926860b67b6c 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/PlotScatter.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/PlotScatter.3
@@ -1,4 +1,4 @@
-.TH "PlotScatter" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "PlotScatter" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/PlotSpectrum.3 b/fdmdv2/fdmdv2-doc/man/man3/PlotSpectrum.3
index 77886c370cfe8ad035ff97fd4fe9c6cf82b99466..6408d02e2653671d70e268936afcafafca941c67 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/PlotSpectrum.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/PlotSpectrum.3
@@ -1,4 +1,4 @@
-.TH "PlotSpectrum" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "PlotSpectrum" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/PlotWaterfall.3 b/fdmdv2/fdmdv2-doc/man/man3/PlotWaterfall.3
index 0a5b42ce7e97f5cffbc16809ed793b719324b182..d413c64616e11b4d26f3f2694109855a7e62736c 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/PlotWaterfall.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/PlotWaterfall.3
@@ -1,4 +1,4 @@
-.TH "PlotWaterfall" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "PlotWaterfall" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
@@ -25,19 +25,13 @@ Inherits \fBPlotPanel\fP\&.
 .RI "void \fBOnPaint\fP (wxPaintEvent &evt)"
 .br
 .ti -1c
-.RI "void \fBOnSize\fP (wxSizeEvent &event)"
-.br
-.ti -1c
 .RI "void \fBOnShow\fP (wxShowEvent &event)"
 .br
 .ti -1c
 .RI "void \fBdrawGraticule\fP (wxAutoBufferedPaintDC &dc)"
 .br
 .ti -1c
-.RI "void \fBdraw\fP (wxAutoBufferedPaintDC &dc)"
-.br
-.ti -1c
-.RI "void \fBplotData\fP (wxAutoBufferedPaintDC &dc)"
+.RI "void \fBdraw\fP (wxAutoBufferedPaintDC &pdc)"
 .br
 .ti -1c
 .RI "void \fBplotPixelData\fP (wxAutoBufferedPaintDC &dc)"
@@ -52,6 +46,12 @@ Inherits \fBPlotPanel\fP\&.
 .ti -1c
 .RI "int \fBm_greyscale\fP"
 .br
+.ti -1c
+.RI "wxMemoryDC \fBm_mDC\fP"
+.br
+.ti -1c
+.RI "int \fBm_line_color\fP"
+.br
 .in -1c
 .SS "Additional Inherited Members"
 

diff --git a/fdmdv2/fdmdv2-doc/man/man3/PortAudioWrap.3 b/fdmdv2/fdmdv2-doc/man/man3/PortAudioWrap.3
index 5c3c16ea4c696671ca0b673ec40ae5c7934c169d..3a3eadd1a355f5e57b5d977d589a35aa045b31a8 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/PortAudioWrap.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/PortAudioWrap.3
@@ -1,4 +1,4 @@
-.TH "PortAudioWrap" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "PortAudioWrap" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
@@ -10,7 +10,7 @@ PortAudioWrap \-
 
 .in +1c
 .ti -1c
-.RI "void \fBper_frame_rx_processing\fP (short output_buf[], int *n_output_buf, int codec_bits[], short input_buf[], int *n_input_buf, int *nin, int *state, struct CODEC2 *c2)"
+.RI "void \fBaverageData\fP (float mag_dB[])"
 .br
 .ti -1c
 .RI "PaDeviceIndex \fBgetDefaultInputDevice\fP ()"
@@ -31,16 +31,16 @@ PortAudioWrap \-
 .RI "PaError \fBsetStreamFlags\fP (PaStreamFlags flags)"
 .br
 .ti -1c
-.RI "PaError \fBsetCallback\fP (PaStreamCallback *streamCallback)"
+.RI "PaError \fBsetCallback\fP (PaStreamCallback *m_pStreamCallback)"
 .br
 .ti -1c
 .RI "PaError \fBsetStreamCallback\fP (PaStream *stream, PaStreamCallback *callback)"
 .br
 .ti -1c
-.RI "PaError \fBsetStreamFinishedCallback\fP (PaStream *stream, PaStreamFinishedCallback *streamFinishedCallback)"
+.RI "PaError \fBsetStreamFinishedCallback\fP (PaStream *stream, PaStreamFinishedCallback *m_pStreamFinishedCallback)"
 .br
 .ti -1c
-.RI "PaError \fBstreamOpen\fP ()"
+.RI "void \fBsetInputBuffer\fP (const PaStreamParameters &inputBuffer)"
 .br
 .ti -1c
 .RI "PaError \fBsetInputDevice\fP (PaDeviceIndex dev)"
@@ -85,70 +85,58 @@ PortAudioWrap \-
 .RI "PaError \fBsetOutputLatency\fP (PaTime latency)"
 .br
 .ti -1c
-.RI "PaError \fBstreamStart\fP ()"
-.br
-.ti -1c
-.RI "PaError \fBstreamClose\fP ()"
-.br
-.ti -1c
 .RI "void \fBsetOutputHostApiStreamInfo\fP (void *info=NULL)"
 .br
 .ti -1c
 .RI "PaTime \fBgetOutputDefaultLowLatency\fP ()"
 .br
 .ti -1c
-.RI "void \fBaverageData\fP (float mag_dB[])"
-.br
-.ti -1c
 .RI "void \fBsetFdmdvState\fP (FDMDV *fdmdv_state)"
 .br
 .ti -1c
-.RI "void \fBsetInputBuffer\fP (const PaStreamParameters &inputBuffer)"
-.br
-.ti -1c
 .RI "void \fBsetOutputBuffer\fP (const PaStreamParameters &outputBuffer)"
 .br
 .ti -1c
-.RI "void \fBsetSamplerate\fP (int samplerate)"
+.RI "void \fBsetTimeInfo\fP (PaStreamCallbackTimeInfo *timeInfo)"
 .br
 .ti -1c
-.RI "void \fBsetStatusFlags\fP (const PaStreamCallbackFlags &statusFlags)"
+.RI "void \fBsetUserData\fP (void *userData)"
 .br
 .ti -1c
-.RI "void \fBsetStream\fP (PaStream *stream)"
+.RI "unsigned long \fBgetFramesPerBuffer\fP () const "
 .br
 .ti -1c
-.RI "void \fBsetStreamFinishedCallback\fP (PaStreamFinishedCallback *streamFinishedCallback)"
+.RI "const PaStreamParameters & \fBgetInputBuffer\fP () const "
 .br
 .ti -1c
-.RI "void \fBsetTimeInfo\fP (PaStreamCallbackTimeInfo *timeInfo)"
+.RI "const PaStreamParameters & \fBgetOutputBuffer\fP () const "
 .br
 .ti -1c
-.RI "void \fBsetUserData\fP (void *userData)"
+.RI "const PaStreamCallbackFlags & \fBgetStatusFlags\fP () const "
 .br
 .ti -1c
 .RI "FDMDV * \fBgetFdmdvState\fP ()"
 .br
 .ti -1c
-.RI "unsigned long \fBgetFramesPerBuffer\fP () const "
+.RI "int \fBgetSamplerate\fP () const "
 .br
 .ti -1c
-.RI "const PaStreamParameters & \fBgetInputBuffer\fP () const "
+.RI "PaStream * \fBgetStream\fP ()"
 .br
 .ti -1c
-.RI "const PaStreamParameters & \fBgetOutputBuffer\fP () const "
+.RI "void * \fBgetUserData\fP ()"
 .br
 .ti -1c
-.RI "int \fBgetSamplerate\fP () const "
+.RI "bool \fBgetDataAvail\fP ()"
 .br
 .ti -1c
-.RI "const PaStreamCallbackFlags & \fBgetStatusFlags\fP () const "
+.RI "PaError \fBstreamStart\fP ()"
 .br
 .ti -1c
-.RI "PaStream * \fBgetStream\fP ()"
+.RI "PaError \fBstreamClose\fP ()"
 .br
 .ti -1c
-.RI "void * \fBgetUserData\fP ()"
+.RI "PaError \fBstreamOpen\fP ()"
 .br
 .ti -1c
 .RI "void \fBterminate\fP ()"

diff --git a/fdmdv2/fdmdv2-doc/man/man3/TopFrame.3 b/fdmdv2/fdmdv2-doc/man/man3/TopFrame.3
index 252cc9689c3e1e10f8327bed9a33f67421169b6b..79219643f9dab7601e2b1babcb07e0b39814a7c1 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/TopFrame.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/TopFrame.3
@@ -1,4 +1,4 @@
-.TH "TopFrame" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "TopFrame" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/man/man3/paCallBackData.3 b/fdmdv2/fdmdv2-doc/man/man3/paCallBackData.3
index a822f4e1f93996a7ea726fb809099364dbc01fc7..0757964dfd78a0f22c4a69b693923c032ab835c8 100644 (file)
--- a/fdmdv2/fdmdv2-doc/man/man3/paCallBackData.3
+++ b/fdmdv2/fdmdv2-doc/man/man3/paCallBackData.3
@@ -1,4 +1,4 @@
-.TH "paCallBackData" 3 "Tue Sep 11 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
+.TH "paCallBackData" 3 "Fri Sep 14 2012" "Version 02.00.01" "FDMDV2" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

diff --git a/fdmdv2/fdmdv2-doc/rtf/refman.rtf b/fdmdv2/fdmdv2-doc/rtf/refman.rtf
index a89ea9fa3e15c38e1507a2fa15c54aae18fb741f..26a0f3fdaa8ffd403514c0ba4fdd8a45cc7bf973 100644 (file)
--- a/fdmdv2/fdmdv2-doc/rtf/refman.rtf
+++ b/fdmdv2/fdmdv2-doc/rtf/refman.rtf
@@ -86,7 +86,7 @@
 02.00.01 \par
 }}FDMDV2}
 {\comment Generated byDoxgyen. }
-{\creatim \yr2012\mo9\dy11\hr14\min31\sec49}
+{\creatim \yr2012\mo9\dy14\hr18\min21\sec32}
 }\pard\plain 
 \sectd\pgnlcrm
 {\footer \s29\widctlpar\tqc\tx4320\tqr\tx8640\qr\adjustright \fs20\cgrid {\chpgn}}
@@ -121,51 +121,49 @@ Class Hierarchy\par \pard\plain
 {
 \par
 \pard\plain \s71\li360\sa27\sb27\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid 
-AudioStream\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAQ \\*MERGEFORMAT}{\fldrslt pagenum}}
+COMP\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAQ \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-COMP\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAT \\*MERGEFORMAT}{\fldrslt pagenum}}
+paCallBackData\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAHF \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-paCallBackData\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAHB \\*MERGEFORMAT}{\fldrslt pagenum}}
-\par
-PortAudioWrap\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAKO \\*MERGEFORMAT}{\fldrslt pagenum}}
+PortAudioWrap\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAKS \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
 wxApp
 {
 \par
 \pard\plain \s72\li720\sa24\sb24\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid 
-MainApp\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAADZ \\*MERGEFORMAT}{\fldrslt pagenum}}
+MainApp\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAADW \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
 }\par
 wxDialog
 {
 \par
 \pard\plain \s72\li720\sa24\sb24\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid 
-DlgAbout\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAZ \\*MERGEFORMAT}{\fldrslt pagenum}}
+DlgAbout\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAW \\*MERGEFORMAT}{\fldrslt pagenum}}
 {
 \par
 \pard\plain \s73\li1080\sa21\sb21\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid 
 AboutDlg\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAA \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
 }\par
-DlgAudio\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAABH \\*MERGEFORMAT}{\fldrslt pagenum}}
+DlgAudio\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAABE \\*MERGEFORMAT}{\fldrslt pagenum}}
 {
 \par
 \pard\plain \s73\li1080\sa21\sb21\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid 
 AudioDlg\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAD \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
 }\par
-DlgComPorts\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAACW \\*MERGEFORMAT}{\fldrslt pagenum}}
+DlgComPorts\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAACT \\*MERGEFORMAT}{\fldrslt pagenum}}
 {
 \par
 \pard\plain \s73\li1080\sa21\sb21\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid 
-ComPortsDlg\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAW \\*MERGEFORMAT}{\fldrslt pagenum}}
+ComPortsDlg\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAT \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
 }\par
-DlgOptions\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAADG \\*MERGEFORMAT}{\fldrslt pagenum}}
+DlgOptions\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAADD \\*MERGEFORMAT}{\fldrslt pagenum}}
 {
 \par
 \pard\plain \s73\li1080\sa21\sb21\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid 
-OptionsDlg\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAGX \\*MERGEFORMAT}{\fldrslt pagenum}}
+OptionsDlg\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAHB \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
 }\par
 }\par
@@ -177,7 +175,7 @@ TopFrame\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAMS \\*MERGEFORMAT}{\fld
 {
 \par
 \pard\plain \s73\li1080\sa21\sb21\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid 
-MainFrame\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAEC \\*MERGEFORMAT}{\fldrslt pagenum}}
+MainFrame\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAEB \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
 }\par
 }\par
@@ -185,17 +183,17 @@ wxPanel
 {
 \par
 \pard\plain \s72\li720\sa24\sb24\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid 
-PlotPanel\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAHE \\*MERGEFORMAT}{\fldrslt pagenum}}
+PlotPanel\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAHI \\*MERGEFORMAT}{\fldrslt pagenum}}
 {
 \par
 \pard\plain \s73\li1080\sa21\sb21\widctlpar\tqr\tldot\tx8640\adjustright \fs20\cgrid 
-PlotScalar\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAIY \\*MERGEFORMAT}{\fldrslt pagenum}}
+PlotScalar\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAJC \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-PlotScatter\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAJM \\*MERGEFORMAT}{\fldrslt pagenum}}
+PlotScatter\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAJQ \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-PlotSpectrum\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAJV \\*MERGEFORMAT}{\fldrslt pagenum}}
+PlotSpectrum\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAJZ \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-PlotWaterfall\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAKC \\*MERGEFORMAT}{\fldrslt pagenum}}
+PlotWaterfall\tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAKG \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
 }\par
 }\par
@@ -215,39 +213,37 @@ Class List\par \pard\plain
 \par
 {\b {\b AudioDlg} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAD \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b AudioStream} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAQ \\*MERGEFORMAT}{\fldrslt pagenum}}
-\par
-{\b {\b COMP} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAT \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b COMP} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAQ \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b ComPortsDlg} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAW \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b ComPortsDlg} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAT \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b DlgAbout} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAZ \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b DlgAbout} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAAW \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b DlgAudio} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAABH \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b DlgAudio} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAABE \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b DlgComPorts} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAACW \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b DlgComPorts} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAACT \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b DlgOptions} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAADG \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b DlgOptions} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAADD \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b MainApp} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAADZ \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b MainApp} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAADW \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b MainFrame} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAEC \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b MainFrame} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAEB \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b OptionsDlg} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAGX \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b OptionsDlg} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAHB \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b paCallBackData} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAHB \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b paCallBackData} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAHF \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b PlotPanel} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAHE \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b PlotPanel} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAHI \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b PlotScalar} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAIY \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b PlotScalar} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAJC \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b PlotScatter} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAJM \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b PlotScatter} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAJQ \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b PlotSpectrum} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAJV \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b PlotSpectrum} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAJZ \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b PlotWaterfall} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAKC \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b PlotWaterfall} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAKG \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
-{\b {\b PortAudioWrap} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAKO \\*MERGEFORMAT}{\fldrslt pagenum}}
+{\b {\b PortAudioWrap} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAKS \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
 {\b {\b TopFrame} } \tab {\field\fldedit {\*\fldinst PAGEREF AAAAAAAAMS \\*MERGEFORMAT}{\fldrslt pagenum}}
 \par
@@ -434,46 +430,14 @@ C:/bin/Projects/Radio/fdmdv2/src/dlg_audio.h\par
 C:/bin/Projects/Radio/fdmdv2/src/dlg_audio.cpp\par
 }\par \pard\plain 
 
-\pard\plain \sect\sbkpage
-\s2\sb240\sa60\keepn\widctlpar\adjustright \b\f1\fs28\kerning28\cgrid 
-\pard\plain \s2\sb240\sa60\keepn\widctlpar\adjustright \b\f1\fs28\kerning28\cgrid 
-AudioStream Class Reference\par \pard\plain 
-{\tc\tcl2 \v AudioStream}
-{\xe \v AudioStream}
-{\bkmkstart AAAAAAAAAQ}
-{\bkmkend AAAAAAAAAQ}
-\pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
-Public Member Functions\par
-\pard\plain 
-
-{
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-{\b AudioStream} (int tableSize){\bkmkstart AAAAAAAAAR}
-{\bkmkend AAAAAAAAAR}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-int {\b generate} (const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags){\bkmkstart AAAAAAAAAS}
-{\bkmkend AAAAAAAAAS}
-\par
-}
-{\pard\widctlpar\brdrb\brdrs\brdrw5\brsp20 \adjustright \par}
-The documentation for this class was generated from the following files:{\par
-\pard\plain \s81\fi-360\li720\widctlpar\jclisttab\tx720{\*\pn \pnlvlbody\ilvl0\ls2\pnrnot0\pndec }\ls2\adjustright \fs20\cgrid 
-C:/bin/Projects/Radio/fdmdv2/src/audiostream.h\par
-\pard\plain \s81\fi-360\li720\widctlpar\jclisttab\tx720{\*\pn \pnlvlbody\ilvl0\ls2\pnrnot0\pndec }\ls2\adjustright \fs20\cgrid 
-C:/bin/Projects/Radio/fdmdv2/src/audiostream.cpp\par
-}\par \pard\plain 
-
 \pard\plain \sect\sbkpage
 \s2\sb240\sa60\keepn\widctlpar\adjustright \b\f1\fs28\kerning28\cgrid 
 \pard\plain \s2\sb240\sa60\keepn\widctlpar\adjustright \b\f1\fs28\kerning28\cgrid 
 COMP Struct Reference\par \pard\plain 
 {\tc\tcl2 \v COMP}
 {\xe \v COMP}
-{\bkmkstart AAAAAAAAAT}
-{\bkmkend AAAAAAAAAT}
+{\bkmkstart AAAAAAAAAQ}
+{\bkmkend AAAAAAAAAQ}
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
 Public Attributes\par
 \pard\plain 
@@ -481,13 +445,13 @@ Public Attributes\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-float {\b real}{\bkmkstart AAAAAAAAAU}
-{\bkmkend AAAAAAAAAU}
+float {\b real}{\bkmkstart AAAAAAAAAR}
+{\bkmkend AAAAAAAAAR}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-float {\b imag}{\bkmkstart AAAAAAAAAV}
-{\bkmkend AAAAAAAAAV}
+float {\b imag}{\bkmkstart AAAAAAAAAS}
+{\bkmkend AAAAAAAAAS}
 \par
 }
 {\pard\widctlpar\brdrb\brdrs\brdrw5\brsp20 \adjustright \par}
@@ -502,8 +466,8 @@ C:/bin/Projects/Radio/fdmdv2/src/comp.h\par
 ComPortsDlg Class Reference\par \pard\plain 
 {\tc\tcl2 \v ComPortsDlg}
 {\xe \v ComPortsDlg}
-{\bkmkstart AAAAAAAAAW}
-{\bkmkend AAAAAAAAAW}
+{\bkmkstart AAAAAAAAAT}
+{\bkmkend AAAAAAAAAT}
 Inheritance diagram for ComPortsDlg:{
 \pard\plain 
 \par\pard \qc {\field\flddirty {\*\fldinst INCLUDEPICTURE "class_com_ports_dlg__inherit__graph.png" \\d \\*MERGEFORMAT}{\fldrslt IMAGE}}\par
@@ -529,8 +493,8 @@ Protected Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnListItemSelected} (wxListEvent &event){\bkmkstart AAAAAAAAAX}
-{\bkmkend AAAAAAAAAX}
+void {\b OnListItemSelected} (wxListEvent &event){\bkmkstart AAAAAAAAAU}
+{\bkmkend AAAAAAAAAU}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -546,8 +510,8 @@ Constructor & Destructor Documentation\par
 {\b 
 ComPortsDlg::ComPortsDlg (wxWindow * {\i parent})}}
 \par
-{\bkmkstart AAAAAAAAAY}
-{\bkmkend AAAAAAAAAY}
+{\bkmkstart AAAAAAAAAV}
+{\bkmkend AAAAAAAAAV}
 {
 \pard\plain \s51\li360\sa60\sb30\qj\widctlpar\qj\adjustright \fs20\cgrid 
 {\s17\sa60\sb30\widctlpar\qj \fs22\cgrid 
@@ -567,8 +531,8 @@ C:/bin/Projects/Radio/fdmdv2/src/dlg_comports.cpp\par
 DlgAbout Class Reference\par \pard\plain 
 {\tc\tcl2 \v DlgAbout}
 {\xe \v DlgAbout}
-{\bkmkstart AAAAAAAAAZ}
-{\bkmkend AAAAAAAAAZ}
+{\bkmkstart AAAAAAAAAW}
+{\bkmkend AAAAAAAAAW}
 \par
 {
 {\f2 #include <topFrame.h>}}\par
@@ -589,8 +553,8 @@ Public Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b DlgAbout} (wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("About FDMDV2"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(352, 343), long style=wxDEFAULT_DIALOG_STYLE){\bkmkstart AAAAAAAABA}
-{\bkmkend AAAAAAAABA}
+{\b DlgAbout} (wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("About FDMDV2"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(352, 343), long style=wxDEFAULT_DIALOG_STYLE){\bkmkstart AAAAAAAAAX}
+{\bkmkend AAAAAAAAAX}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -600,13 +564,13 @@ Protected Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnClose} (wxCloseEvent &event){\bkmkstart AAAAAAAABB}
-{\bkmkend AAAAAAAABB}
+virtual void {\b OnClose} (wxCloseEvent &event){\bkmkstart AAAAAAAAAY}
+{\bkmkend AAAAAAAAAY}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnInitDialog} (wxInitDialogEvent &event){\bkmkstart AAAAAAAABC}
-{\bkmkend AAAAAAAABC}
+virtual void {\b OnInitDialog} (wxInitDialogEvent &event){\bkmkstart AAAAAAAAAZ}
+{\bkmkend AAAAAAAAAZ}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -616,23 +580,23 @@ Protected Attributes\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticBitmap * {\b m_bitmapAbout}{\bkmkstart AAAAAAAABD}
-{\bkmkend AAAAAAAABD}
+wxStaticBitmap * {\b m_bitmapAbout}{\bkmkstart AAAAAAAABA}
+{\bkmkend AAAAAAAABA}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText1}{\bkmkstart AAAAAAAABE}
-{\bkmkend AAAAAAAABE}
+wxStaticText * {\b m_staticText1}{\bkmkstart AAAAAAAABB}
+{\bkmkend AAAAAAAABB}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textCtrl2}{\bkmkstart AAAAAAAABF}
-{\bkmkend AAAAAAAABF}
+wxTextCtrl * {\b m_textCtrl2}{\bkmkstart AAAAAAAABC}
+{\bkmkend AAAAAAAABC}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxButton * {\b m_button9}{\bkmkstart AAAAAAAABG}
-{\bkmkend AAAAAAAABG}
+wxButton * {\b m_button9}{\bkmkstart AAAAAAAABD}
+{\bkmkend AAAAAAAABD}
 \par
 }
 {\pard\widctlpar\brdrb\brdrs\brdrw5\brsp20 \adjustright \par}
@@ -657,8 +621,8 @@ C:/bin/Projects/Radio/fdmdv2/src/topFrame.cpp\par
 DlgAudio Class Reference\par \pard\plain 
 {\tc\tcl2 \v DlgAudio}
 {\xe \v DlgAudio}
-{\bkmkstart AAAAAAAABH}
-{\bkmkend AAAAAAAABH}
+{\bkmkstart AAAAAAAABE}
+{\bkmkend AAAAAAAABE}
 \par
 {
 {\f2 #include <topFrame.h>}}\par
@@ -679,8 +643,8 @@ Public Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b DlgAudio} (wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("Audio Options"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(555, 419), long style=wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER){\bkmkstart AAAAAAAABI}
-{\bkmkend AAAAAAAABI}
+{\b DlgAudio} (wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("Audio Options"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(555, 419), long style=wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER){\bkmkstart AAAAAAAABF}
+{\bkmkend AAAAAAAABF}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -690,205 +654,205 @@ Protected Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnClose} (wxCloseEvent &event){\bkmkstart AAAAAAAABJ}
+virtual void {\b OnClose} (wxCloseEvent &event){\bkmkstart AAAAAAAABG}
+{\bkmkend AAAAAAAABG}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+virtual void {\b OnInitDialog} (wxInitDialogEvent &event){\bkmkstart AAAAAAAABH}
+{\bkmkend AAAAAAAABH}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+virtual void {\b OnRxInputSelect} (wxCommandEvent &event){\bkmkstart AAAAAAAABI}
+{\bkmkend AAAAAAAABI}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+virtual void {\b OnTxOutputSelect} (wxCommandEvent &event){\bkmkstart AAAAAAAABJ}
 {\bkmkend AAAAAAAABJ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnInitDialog} (wxInitDialogEvent &event){\bkmkstart AAAAAAAABK}
+virtual void {\b OnVoiceInputSelect} (wxCommandEvent &event){\bkmkstart AAAAAAAABK}
 {\bkmkend AAAAAAAABK}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnRxInputSelect} (wxCommandEvent &event){\bkmkstart AAAAAAAABL}
+virtual void {\b OnVoiceOutputSelect} (wxCommandEvent &event){\bkmkstart AAAAAAAABL}
 {\bkmkend AAAAAAAABL}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnTxOutputSelect} (wxCommandEvent &event){\bkmkstart AAAAAAAABM}
+virtual void {\b OnApply} (wxCommandEvent &event){\bkmkstart AAAAAAAABM}
 {\bkmkend AAAAAAAABM}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnVoiceInputSelect} (wxCommandEvent &event){\bkmkstart AAAAAAAABN}
+virtual void {\b OnCancel} (wxCommandEvent &event){\bkmkstart AAAAAAAABN}
 {\bkmkend AAAAAAAABN}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnVoiceOutputSelect} (wxCommandEvent &event){\bkmkstart AAAAAAAABO}
+virtual void {\b OnOK} (wxCommandEvent &event){\bkmkstart AAAAAAAABO}
 {\bkmkend AAAAAAAABO}
 \par
+}
+\pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
+Protected Attributes\par
+\pard\plain 
+
+{
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnApply} (wxCommandEvent &event){\bkmkstart AAAAAAAABP}
+wxNotebook * {\b m_nbAudioOptions}{\bkmkstart AAAAAAAABP}
 {\bkmkend AAAAAAAABP}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnCancel} (wxCommandEvent &event){\bkmkstart AAAAAAAABQ}
+wxPanel * {\b m_panelDevices}{\bkmkstart AAAAAAAABQ}
 {\bkmkend AAAAAAAABQ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnOK} (wxCommandEvent &event){\bkmkstart AAAAAAAABR}
+wxRadioButton * {\b m_radioBtnPortAudio}{\bkmkstart AAAAAAAABR}
 {\bkmkend AAAAAAAABR}
 \par
-}
-\pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
-Protected Attributes\par
-\pard\plain 
-
-{
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxNotebook * {\b m_nbAudioOptions}{\bkmkstart AAAAAAAABS}
+wxStaticText * {\b m_staticText151}{\bkmkstart AAAAAAAABS}
 {\bkmkend AAAAAAAABS}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxPanel * {\b m_panelDevices}{\bkmkstart AAAAAAAABT}
+wxTextCtrl * {\b m_textNumChOut}{\bkmkstart AAAAAAAABT}
 {\bkmkend AAAAAAAABT}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxRadioButton * {\b m_radioBtnPortAudio}{\bkmkstart AAAAAAAABU}
+wxStaticText * {\b m_staticText141}{\bkmkstart AAAAAAAABU}
 {\bkmkend AAAAAAAABU}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText151}{\bkmkstart AAAAAAAABV}
+wxTextCtrl * {\b m_textNumChIn}{\bkmkstart AAAAAAAABV}
 {\bkmkend AAAAAAAABV}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textNumChOut}{\bkmkstart AAAAAAAABW}
+wxStaticText * {\b m_staticText14}{\bkmkstart AAAAAAAABW}
 {\bkmkend AAAAAAAABW}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText141}{\bkmkstart AAAAAAAABX}
+wxComboBox * {\b m_comboAudioCodec}{\bkmkstart AAAAAAAABX}
 {\bkmkend AAAAAAAABX}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textNumChIn}{\bkmkstart AAAAAAAABY}
+wxStaticText * {\b m_staticText15}{\bkmkstart AAAAAAAABY}
 {\bkmkend AAAAAAAABY}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText14}{\bkmkstart AAAAAAAABZ}
+wxComboBox * {\b m_comboCodecTx}{\bkmkstart AAAAAAAABZ}
 {\bkmkend AAAAAAAABZ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxComboBox * {\b m_comboAudioCodec}{\bkmkstart AAAAAAAACA}
+wxStaticText * {\b m_staticText16}{\bkmkstart AAAAAAAACA}
 {\bkmkend AAAAAAAACA}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText15}{\bkmkstart AAAAAAAACB}
+wxComboBox * {\b m_comboRadioRx}{\bkmkstart AAAAAAAACB}
 {\bkmkend AAAAAAAACB}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxComboBox * {\b m_comboCodecTx}{\bkmkstart AAAAAAAACC}
+wxStaticText * {\b m_staticText17}{\bkmkstart AAAAAAAACC}
 {\bkmkend AAAAAAAACC}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText16}{\bkmkstart AAAAAAAACD}
+wxComboBox * {\b m_comboCodecSpkr}{\bkmkstart AAAAAAAACD}
 {\bkmkend AAAAAAAACD}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxComboBox * {\b m_comboRadioRx}{\bkmkstart AAAAAAAACE}
+wxRadioButton * {\b m_radioBtnFileOnly}{\bkmkstart AAAAAAAACE}
 {\bkmkend AAAAAAAACE}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText17}{\bkmkstart AAAAAAAACF}
+wxPanel * {\b m_panelSettings}{\bkmkstart AAAAAAAACF}
 {\bkmkend AAAAAAAACF}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxComboBox * {\b m_comboCodecSpkr}{\bkmkstart AAAAAAAACG}
+wxListBox * {\b m_lbRxInput}{\bkmkstart AAAAAAAACG}
 {\bkmkend AAAAAAAACG}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxRadioButton * {\b m_radioBtnFileOnly}{\bkmkstart AAAAAAAACH}
+wxTextCtrl * {\b m_textRxInput}{\bkmkstart AAAAAAAACH}
 {\bkmkend AAAAAAAACH}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxPanel * {\b m_panelSettings}{\bkmkstart AAAAAAAACI}
+wxListBox * {\b m_lbTxOutput}{\bkmkstart AAAAAAAACI}
 {\bkmkend AAAAAAAACI}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxListBox * {\b m_lbRxInput}{\bkmkstart AAAAAAAACJ}
+wxTextCtrl * {\b m_textCtrl15}{\bkmkstart AAAAAAAACJ}
 {\bkmkend AAAAAAAACJ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textRxInput}{\bkmkstart AAAAAAAACK}
+wxListBox * {\b m_lbVoiceInput}{\bkmkstart AAAAAAAACK}
 {\bkmkend AAAAAAAACK}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxListBox * {\b m_lbTxOutput}{\bkmkstart AAAAAAAACL}
+wxTextCtrl * {\b m_textVoiceInput}{\bkmkstart AAAAAAAACL}
 {\bkmkend AAAAAAAACL}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textCtrl15}{\bkmkstart AAAAAAAACM}
+wxListBox * {\b m_lbVoiceOutput}{\bkmkstart AAAAAAAACM}
 {\bkmkend AAAAAAAACM}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxListBox * {\b m_lbVoiceInput}{\bkmkstart AAAAAAAACN}
+wxTextCtrl * {\b m_textVoiceOutput}{\bkmkstart AAAAAAAACN}
 {\bkmkend AAAAAAAACN}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textVoiceInput}{\bkmkstart AAAAAAAACO}
+wxPanel * {\b m_panelRightChannel}{\bkmkstart AAAAAAAACO}
 {\bkmkend AAAAAAAACO}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxListBox * {\b m_lbVoiceOutput}{\bkmkstart AAAAAAAACP}
+wxStdDialogButtonSizer * {\b m_sdbSizer3}{\bkmkstart AAAAAAAACP}
 {\bkmkend AAAAAAAACP}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textVoiceOutput}{\bkmkstart AAAAAAAACQ}
+wxButton * {\b m_sdbSizer3OK}{\bkmkstart AAAAAAAACQ}
 {\bkmkend AAAAAAAACQ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxPanel * {\b m_panelRightChannel}{\bkmkstart AAAAAAAACR}
+wxButton * {\b m_sdbSizer3Apply}{\bkmkstart AAAAAAAACR}
 {\bkmkend AAAAAAAACR}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStdDialogButtonSizer * {\b m_sdbSizer3}{\bkmkstart AAAAAAAACS}
+wxButton * {\b m_sdbSizer3Cancel}{\bkmkstart AAAAAAAACS}
 {\bkmkend AAAAAAAACS}
 \par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-wxButton * {\b m_sdbSizer3OK}{\bkmkstart AAAAAAAACT}
-{\bkmkend AAAAAAAACT}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-wxButton * {\b m_sdbSizer3Apply}{\bkmkstart AAAAAAAACU}
-{\bkmkend AAAAAAAACU}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-wxButton * {\b m_sdbSizer3Cancel}{\bkmkstart AAAAAAAACV}
-{\bkmkend AAAAAAAACV}
-\par
 }
 {\pard\widctlpar\brdrb\brdrs\brdrw5\brsp20 \adjustright \par}
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -912,8 +876,8 @@ C:/bin/Projects/Radio/fdmdv2/src/topFrame.cpp\par
 DlgComPorts Class Reference\par \pard\plain 
 {\tc\tcl2 \v DlgComPorts}
 {\xe \v DlgComPorts}
-{\bkmkstart AAAAAAAACW}
-{\bkmkend AAAAAAAACW}
+{\bkmkstart AAAAAAAACT}
+{\bkmkend AAAAAAAACT}
 \par
 {
 {\f2 #include <topFrame.h>}}\par
@@ -934,8 +898,8 @@ Public Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b DlgComPorts} (wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("Select Com Port"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(399, 226), long style=wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER){\bkmkstart AAAAAAAACX}
-{\bkmkend AAAAAAAACX}
+{\b DlgComPorts} (wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("Select Com Port"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(399, 226), long style=wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER){\bkmkstart AAAAAAAACU}
+{\bkmkend AAAAAAAACU}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -945,8 +909,8 @@ Protected Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnListItemSelected} (wxListEvent &event){\bkmkstart AAAAAAAACY}
-{\bkmkend AAAAAAAACY}
+virtual void {\b OnListItemSelected} (wxListEvent &event){\bkmkstart AAAAAAAACV}
+{\bkmkend AAAAAAAACV}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -956,38 +920,38 @@ Protected Attributes\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText8}{\bkmkstart AAAAAAAACZ}
-{\bkmkend AAAAAAAACZ}
+wxStaticText * {\b m_staticText8}{\bkmkstart AAAAAAAACW}
+{\bkmkend AAAAAAAACW}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxListCtrl * {\b m_listCtrlPortSelect}{\bkmkstart AAAAAAAADA}
-{\bkmkend AAAAAAAADA}
+wxListCtrl * {\b m_listCtrlPortSelect}{\bkmkstart AAAAAAAACX}
+{\bkmkend AAAAAAAACX}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText9}{\bkmkstart AAAAAAAADB}
-{\bkmkend AAAAAAAADB}
+wxStaticText * {\b m_staticText9}{\bkmkstart AAAAAAAACY}
+{\bkmkend AAAAAAAACY}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textCtrl10}{\bkmkstart AAAAAAAADC}
-{\bkmkend AAAAAAAADC}
+wxTextCtrl * {\b m_textCtrl10}{\bkmkstart AAAAAAAACZ}
+{\bkmkend AAAAAAAACZ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStdDialogButtonSizer * {\b m_sdbSizer3}{\bkmkstart AAAAAAAADD}
-{\bkmkend AAAAAAAADD}
+wxStdDialogButtonSizer * {\b m_sdbSizer3}{\bkmkstart AAAAAAAADA}
+{\bkmkend AAAAAAAADA}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxButton * {\b m_sdbSizer3OK}{\bkmkstart AAAAAAAADE}
-{\bkmkend AAAAAAAADE}
+wxButton * {\b m_sdbSizer3OK}{\bkmkstart AAAAAAAADB}
+{\bkmkend AAAAAAAADB}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxButton * {\b m_sdbSizer3Cancel}{\bkmkstart AAAAAAAADF}
-{\bkmkend AAAAAAAADF}
+wxButton * {\b m_sdbSizer3Cancel}{\bkmkstart AAAAAAAADC}
+{\bkmkend AAAAAAAADC}
 \par
 }
 {\pard\widctlpar\brdrb\brdrs\brdrw5\brsp20 \adjustright \par}
@@ -1012,8 +976,8 @@ C:/bin/Projects/Radio/fdmdv2/src/topFrame.cpp\par
 DlgOptions Class Reference\par \pard\plain 
 {\tc\tcl2 \v DlgOptions}
 {\xe \v DlgOptions}
-{\bkmkstart AAAAAAAADG}
-{\bkmkend AAAAAAAADG}
+{\bkmkstart AAAAAAAADD}
+{\bkmkend AAAAAAAADD}
 \par
 {
 {\f2 #include <topFrame.h>}}\par
@@ -1034,8 +998,8 @@ Public Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b DlgOptions} (wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("Program Options"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(332, 364), long style=wxDEFAULT_DIALOG_STYLE){\bkmkstart AAAAAAAADH}
-{\bkmkend AAAAAAAADH}
+{\b DlgOptions} (wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("Program Options"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(332, 364), long style=wxDEFAULT_DIALOG_STYLE){\bkmkstart AAAAAAAADE}
+{\bkmkend AAAAAAAADE}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -1045,13 +1009,13 @@ Protected Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnClose} (wxCloseEvent &event){\bkmkstart AAAAAAAADI}
-{\bkmkend AAAAAAAADI}
+virtual void {\b OnClose} (wxCloseEvent &event){\bkmkstart AAAAAAAADF}
+{\bkmkend AAAAAAAADF}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnInitDialog} (wxInitDialogEvent &event){\bkmkstart AAAAAAAADJ}
-{\bkmkend AAAAAAAADJ}
+virtual void {\b OnInitDialog} (wxInitDialogEvent &event){\bkmkstart AAAAAAAADG}
+{\bkmkend AAAAAAAADG}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -1061,79 +1025,79 @@ Protected Attributes\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText2}{\bkmkstart AAAAAAAADK}
+wxStaticText * {\b m_staticText2}{\bkmkstart AAAAAAAADH}
+{\bkmkend AAAAAAAADH}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+wxTextCtrl * {\b m_textCtrl3}{\bkmkstart AAAAAAAADI}
+{\bkmkend AAAAAAAADI}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+wxStaticText * {\b m_staticText3}{\bkmkstart AAAAAAAADJ}
+{\bkmkend AAAAAAAADJ}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+wxTextCtrl * {\b m_textCtrl4}{\bkmkstart AAAAAAAADK}
 {\bkmkend AAAAAAAADK}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textCtrl3}{\bkmkstart AAAAAAAADL}
+wxStaticText * {\b m_staticText4}{\bkmkstart AAAAAAAADL}
 {\bkmkend AAAAAAAADL}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText3}{\bkmkstart AAAAAAAADM}
+wxTextCtrl * {\b m_textCtrl5}{\bkmkstart AAAAAAAADM}
 {\bkmkend AAAAAAAADM}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textCtrl4}{\bkmkstart AAAAAAAADN}
+wxStaticText * {\b m_staticText5}{\bkmkstart AAAAAAAADN}
 {\bkmkend AAAAAAAADN}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText4}{\bkmkstart AAAAAAAADO}
+wxTextCtrl * {\b m_textCtrl6}{\bkmkstart AAAAAAAADO}
 {\bkmkend AAAAAAAADO}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textCtrl5}{\bkmkstart AAAAAAAADP}
+wxStaticText * {\b m_staticText6}{\bkmkstart AAAAAAAADP}
 {\bkmkend AAAAAAAADP}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText5}{\bkmkstart AAAAAAAADQ}
+wxTextCtrl * {\b m_textCtrl7}{\bkmkstart AAAAAAAADQ}
 {\bkmkend AAAAAAAADQ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textCtrl6}{\bkmkstart AAAAAAAADR}
+wxStaticText * {\b m_staticText7}{\bkmkstart AAAAAAAADR}
 {\bkmkend AAAAAAAADR}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText6}{\bkmkstart AAAAAAAADS}
+wxTextCtrl * {\b m_textCtrl8}{\bkmkstart AAAAAAAADS}
 {\bkmkend AAAAAAAADS}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textCtrl7}{\bkmkstart AAAAAAAADT}
+wxStdDialogButtonSizer * {\b m_sdbSizer4}{\bkmkstart AAAAAAAADT}
 {\bkmkend AAAAAAAADT}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxStaticText * {\b m_staticText7}{\bkmkstart AAAAAAAADU}
+wxButton * {\b m_sdbSizer4OK}{\bkmkstart AAAAAAAADU}
 {\bkmkend AAAAAAAADU}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxTextCtrl * {\b m_textCtrl8}{\bkmkstart AAAAAAAADV}
+wxButton * {\b m_sdbSizer4Cancel}{\bkmkstart AAAAAAAADV}
 {\bkmkend AAAAAAAADV}
 \par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-wxStdDialogButtonSizer * {\b m_sdbSizer4}{\bkmkstart AAAAAAAADW}
-{\bkmkend AAAAAAAADW}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-wxButton * {\b m_sdbSizer4OK}{\bkmkstart AAAAAAAADX}
-{\bkmkend AAAAAAAADX}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-wxButton * {\b m_sdbSizer4Cancel}{\bkmkstart AAAAAAAADY}
-{\bkmkend AAAAAAAADY}
-\par
 }
 {\pard\widctlpar\brdrb\brdrs\brdrw5\brsp20 \adjustright \par}
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -1157,8 +1121,8 @@ C:/bin/Projects/Radio/fdmdv2/src/topFrame.cpp\par
 MainApp Class Reference\par \pard\plain 
 {\tc\tcl2 \v MainApp}
 {\xe \v MainApp}
-{\bkmkstart AAAAAAAADZ}
-{\bkmkend AAAAAAAADZ}
+{\bkmkstart AAAAAAAADW}
+{\bkmkend AAAAAAAADW}
 Inheritance diagram for MainApp:{
 \pard\plain 
 \par\pard \qc {\field\flddirty {\*\fldinst INCLUDEPICTURE "class_main_app__inherit__graph.png" \\d \\*MERGEFORMAT}{\fldrslt IMAGE}}\par
@@ -1176,13 +1140,29 @@ Public Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual bool {\b OnInit} (){\bkmkstart AAAAAAAAEA}
-{\bkmkend AAAAAAAAEA}
+virtual bool {\b OnInit} (){\bkmkstart AAAAAAAADX}
+{\bkmkend AAAAAAAADX}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual int {\b OnExit} (){\bkmkstart AAAAAAAAEB}
-{\bkmkend AAAAAAAAEB}
+virtual int {\b OnExit} (){\bkmkstart AAAAAAAADY}
+{\bkmkend AAAAAAAADY}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+bool {\b loadConfig} (){\bkmkstart AAAAAAAADZ}
+{\bkmkend AAAAAAAADZ}
+\par
+}
+\pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
+Protected Attributes\par
+\pard\plain 
+
+{
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+wxConfig * {\b g_config}{\bkmkstart AAAAAAAAEA}
+{\bkmkend AAAAAAAAEA}
 \par
 }
 {\pard\widctlpar\brdrb\brdrs\brdrw5\brsp20 \adjustright \par}
@@ -1199,8 +1179,8 @@ C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_main.cpp\par
 MainFrame Class Reference\par \pard\plain 
 {\tc\tcl2 \v MainFrame}
 {\xe \v MainFrame}
-{\bkmkstart AAAAAAAAEC}
-{\bkmkend AAAAAAAAEC}
+{\bkmkstart AAAAAAAAEB}
+{\bkmkend AAAAAAAAEB}
 Inheritance diagram for MainFrame:{
 \pard\plain 
 \par\pard \qc {\field\flddirty {\*\fldinst INCLUDEPICTURE "class_main_frame__inherit__graph.png" \\d \\*MERGEFORMAT}{\fldrslt IMAGE}}\par
@@ -1218,7 +1198,12 @@ Public Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b MainFrame} (wxWindow *parent){\bkmkstart AAAAAAAAED}
+{\b MainFrame} (wxWindow *parent){\bkmkstart AAAAAAAAEC}
+{\bkmkend AAAAAAAAEC}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+void {\b per_frame_rx_processing} (short output_buf[], int *n_output_buf, int codec_bits[], short input_buf[], int *n_input_buf, int *nin, int *state, struct CODEC2 *c2){\bkmkstart AAAAAAAAED}
 {\bkmkend AAAAAAAAED}
 \par
 }
@@ -1338,262 +1323,282 @@ PaError {\b m_txErr}{\bkmkstart AAAAAAAAEX}
 wxSound * {\b m_sound}{\bkmkstart AAAAAAAAEY}
 {\bkmkend AAAAAAAAEY}
 \par
-}
-\pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
-Protected Member Functions\par
-\pard\plain 
-
-{
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnCloseFrame} (wxCloseEvent &event){\bkmkstart AAAAAAAAEZ}
+struct FDMDV * {\b m_pFDMDV_state}{\bkmkstart AAAAAAAAEZ}
 {\bkmkend AAAAAAAAEZ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnExitClick} (wxCommandEvent &event){\bkmkstart AAAAAAAAFA}
+wxTimer {\b m_plotTimer}{\bkmkstart AAAAAAAAFA}
 {\bkmkend AAAAAAAAFA}
 \par
+}
+\pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
+Protected Member Functions\par
+\pard\plain 
+
+{
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b startTxStream} (){\bkmkstart AAAAAAAAFB}
+virtual void {\b OnCloseFrame} (wxCloseEvent &event){\bkmkstart AAAAAAAAFB}
 {\bkmkend AAAAAAAAFB}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b startRxStream} (){\bkmkstart AAAAAAAAFC}
+virtual void {\b OnExitClick} (wxCommandEvent &event){\bkmkstart AAAAAAAAFC}
 {\bkmkend AAAAAAAAFC}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b stopTxStream} (){\bkmkstart AAAAAAAAFD}
+void {\b averageData} (float mag_dB[]){\bkmkstart AAAAAAAAFD}
 {\bkmkend AAAAAAAAFD}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b stopRxStream} (){\bkmkstart AAAAAAAAFE}
+void {\b startTxStream} (){\bkmkstart AAAAAAAAFE}
 {\bkmkend AAAAAAAAFE}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b abortTxStream} (){\bkmkstart AAAAAAAAFF}
+void {\b startRxStream} (){\bkmkstart AAAAAAAAFF}
 {\bkmkend AAAAAAAAFF}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b abortRxStream} (){\bkmkstart AAAAAAAAFG}
+void {\b stopTxStream} (){\bkmkstart AAAAAAAAFG}
 {\bkmkend AAAAAAAAFG}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnOpen} (wxCommandEvent &event){\bkmkstart AAAAAAAAFH}
+void {\b stopRxStream} (){\bkmkstart AAAAAAAAFH}
 {\bkmkend AAAAAAAAFH}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnOpenUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFI}
+void {\b abortTxStream} (){\bkmkstart AAAAAAAAFI}
 {\bkmkend AAAAAAAAFI}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnSave} (wxCommandEvent &event){\bkmkstart AAAAAAAAFJ}
+void {\b abortRxStream} (){\bkmkstart AAAAAAAAFJ}
 {\bkmkend AAAAAAAAFJ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnSaveUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFK}
+void {\b OnOpen} (wxCommandEvent &event){\bkmkstart AAAAAAAAFK}
 {\bkmkend AAAAAAAAFK}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnClose} (wxCommandEvent &event){\bkmkstart AAAAAAAAFL}
+void {\b OnOpenUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFL}
 {\bkmkend AAAAAAAAFL}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnCloseUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFM}
+void {\b OnSave} (wxCommandEvent &event){\bkmkstart AAAAAAAAFM}
 {\bkmkend AAAAAAAAFM}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnExit} (wxCommandEvent &event){\bkmkstart AAAAAAAAFN}
+void {\b OnSaveUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFN}
 {\bkmkend AAAAAAAAFN}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnCopy} (wxCommandEvent &event){\bkmkstart AAAAAAAAFO}
+void {\b OnClose} (wxCommandEvent &event){\bkmkstart AAAAAAAAFO}
 {\bkmkend AAAAAAAAFO}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnCopyUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFP}
+void {\b OnCloseUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFP}
 {\bkmkend AAAAAAAAFP}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnCut} (wxCommandEvent &event){\bkmkstart AAAAAAAAFQ}
+void {\b OnExit} (wxCommandEvent &event){\bkmkstart AAAAAAAAFQ}
 {\bkmkend AAAAAAAAFQ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnCutUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFR}
+void {\b OnCopy} (wxCommandEvent &event){\bkmkstart AAAAAAAAFR}
 {\bkmkend AAAAAAAAFR}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnPaste} (wxCommandEvent &event){\bkmkstart AAAAAAAAFS}
+void {\b OnCopyUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFS}
 {\bkmkend AAAAAAAAFS}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnPasteUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFT}
+void {\b OnCut} (wxCommandEvent &event){\bkmkstart AAAAAAAAFT}
 {\bkmkend AAAAAAAAFT}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnToolsAudio} (wxCommandEvent &event){\bkmkstart AAAAAAAAFU}
+void {\b OnCutUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFU}
 {\bkmkend AAAAAAAAFU}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnToolsAudioUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFV}
+void {\b OnPaste} (wxCommandEvent &event){\bkmkstart AAAAAAAAFV}
 {\bkmkend AAAAAAAAFV}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnToolsComCfg} (wxCommandEvent &event){\bkmkstart AAAAAAAAFW}
+void {\b OnPasteUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFW}
 {\bkmkend AAAAAAAAFW}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnToolsComCfgUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFX}
+void {\b OnToolsAudio} (wxCommandEvent &event){\bkmkstart AAAAAAAAFX}
 {\bkmkend AAAAAAAAFX}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnToolsOptions} (wxCommandEvent &event){\bkmkstart AAAAAAAAFY}
+void {\b OnToolsAudioUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFY}
 {\bkmkend AAAAAAAAFY}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnToolsOptionsUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAFZ}
+void {\b OnToolsComCfg} (wxCommandEvent &event){\bkmkstart AAAAAAAAFZ}
 {\bkmkend AAAAAAAAFZ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnCaptureRxStream} (wxCommandEvent &event){\bkmkstart AAAAAAAAGA}
+void {\b OnToolsComCfgUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAGA}
 {\bkmkend AAAAAAAAGA}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnCaptureTxStream} (wxCommandEvent &event){\bkmkstart AAAAAAAAGB}
+void {\b OnToolsOptions} (wxCommandEvent &event){\bkmkstart AAAAAAAAGB}
 {\bkmkend AAAAAAAAGB}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnPlayAudioFile} (wxCommandEvent &event){\bkmkstart AAAAAAAAGC}
+void {\b OnToolsOptionsUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAGC}
 {\bkmkend AAAAAAAAGC}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnHelpCheckUpdates} (wxCommandEvent &event){\bkmkstart AAAAAAAAGD}
+void {\b OnCaptureRxStream} (wxCommandEvent &event){\bkmkstart AAAAAAAAGD}
 {\bkmkend AAAAAAAAGD}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnHelpCheckUpdatesUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAGE}
+void {\b OnCaptureTxStream} (wxCommandEvent &event){\bkmkstart AAAAAAAAGE}
 {\bkmkend AAAAAAAAGE}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnHelpAbout} (wxCommandEvent &event){\bkmkstart AAAAAAAAGF}
+void {\b OnPlayAudioFile} (wxCommandEvent &event){\bkmkstart AAAAAAAAGF}
 {\bkmkend AAAAAAAAGF}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnCmdSliderScroll} (wxScrollEvent &event){\bkmkstart AAAAAAAAGG}
+void {\b OnHelpCheckUpdates} (wxCommandEvent &event){\bkmkstart AAAAAAAAGG}
 {\bkmkend AAAAAAAAGG}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnSliderScrollBottom} (wxScrollEvent &event){\bkmkstart AAAAAAAAGH}
+void {\b OnHelpCheckUpdatesUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAGH}
 {\bkmkend AAAAAAAAGH}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnCmdSliderScrollChanged} (wxScrollEvent &event){\bkmkstart AAAAAAAAGI}
+void {\b OnHelpAbout} (wxCommandEvent &event){\bkmkstart AAAAAAAAGI}
 {\bkmkend AAAAAAAAGI}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnSliderScrollTop} (wxScrollEvent &event){\bkmkstart AAAAAAAAGJ}
+void {\b OnCmdSliderScroll} (wxScrollEvent &event){\bkmkstart AAAAAAAAGJ}
 {\bkmkend AAAAAAAAGJ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnCheckSQClick} (wxCommandEvent &event){\bkmkstart AAAAAAAAGK}
+void {\b OnSliderScrollBottom} (wxScrollEvent &event){\bkmkstart AAAAAAAAGK}
 {\bkmkend AAAAAAAAGK}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnTogBtnSplitClick} (wxCommandEvent &event){\bkmkstart AAAAAAAAGL}
+void {\b OnCmdSliderScrollChanged} (wxScrollEvent &event){\bkmkstart AAAAAAAAGL}
 {\bkmkend AAAAAAAAGL}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnTogBtnAnalogClick} (wxCommandEvent &event){\bkmkstart AAAAAAAAGM}
+void {\b OnSliderScrollTop} (wxScrollEvent &event){\bkmkstart AAAAAAAAGM}
 {\bkmkend AAAAAAAAGM}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnTogBtnALCClick} (wxCommandEvent &event){\bkmkstart AAAAAAAAGN}
+void {\b OnCheckSQClick} (wxCommandEvent &event){\bkmkstart AAAAAAAAGN}
 {\bkmkend AAAAAAAAGN}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnTogBtnRxID} (wxCommandEvent &event){\bkmkstart AAAAAAAAGO}
+void {\b OnTogBtnSplitClick} (wxCommandEvent &event){\bkmkstart AAAAAAAAGO}
 {\bkmkend AAAAAAAAGO}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnTogBtnTxID} (wxCommandEvent &event){\bkmkstart AAAAAAAAGP}
+void {\b OnTogBtnAnalogClick} (wxCommandEvent &event){\bkmkstart AAAAAAAAGP}
 {\bkmkend AAAAAAAAGP}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnTogBtnTXClick} (wxCommandEvent &event){\bkmkstart AAAAAAAAGQ}
+void {\b OnTogBtnALCClick} (wxCommandEvent &event){\bkmkstart AAAAAAAAGQ}
 {\bkmkend AAAAAAAAGQ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnTogBtnOnOff} (wxCommandEvent &event){\bkmkstart AAAAAAAAGR}
+void {\b OnTogBtnRxID} (wxCommandEvent &event){\bkmkstart AAAAAAAAGR}
 {\bkmkend AAAAAAAAGR}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnPaint} (wxPaintEvent &event){\bkmkstart AAAAAAAAGS}
+void {\b OnTogBtnTxID} (wxCommandEvent &event){\bkmkstart AAAAAAAAGS}
 {\bkmkend AAAAAAAAGS}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnClose} (wxCloseEvent &event){\bkmkstart AAAAAAAAGT}
+void {\b OnTogBtnTXClick} (wxCommandEvent &event){\bkmkstart AAAAAAAAGT}
 {\bkmkend AAAAAAAAGT}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnSize} (wxSizeEvent &event){\bkmkstart AAAAAAAAGU}
+void {\b OnTogBtnOnOff} (wxCommandEvent &event){\bkmkstart AAAAAAAAGU}
 {\bkmkend AAAAAAAAGU}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAGV}
+void {\b OnPaint} (wxPaintEvent &event){\bkmkstart AAAAAAAAGV}
 {\bkmkend AAAAAAAAGV}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxString {\b LoadUserImage} (wxImage &image){\bkmkstart AAAAAAAAGW}
+void {\b OnClose} (wxCloseEvent &event){\bkmkstart AAAAAAAAGW}
 {\bkmkend AAAAAAAAGW}
 \par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+void {\b OnSize} (wxSizeEvent &event){\bkmkstart AAAAAAAAGX}
+{\bkmkend AAAAAAAAGX}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+void {\b OnUpdateUI} (wxUpdateUIEvent &event){\bkmkstart AAAAAAAAGY}
+{\bkmkend AAAAAAAAGY}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+void {\b OnTimer} (wxTimerEvent &evt){\bkmkstart AAAAAAAAGZ}
+{\bkmkend AAAAAAAAGZ}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+wxString {\b LoadUserImage} (wxImage &image){\bkmkstart AAAAAAAAHA}
+{\bkmkend AAAAAAAAHA}
+\par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
 Additional Inherited Members\par
@@ -1612,8 +1617,8 @@ C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_main.cpp\par
 OptionsDlg Class Reference\par \pard\plain 
 {\tc\tcl2 \v OptionsDlg}
 {\xe \v OptionsDlg}
-{\bkmkstart AAAAAAAAGX}
-{\bkmkend AAAAAAAAGX}
+{\bkmkstart AAAAAAAAHB}
+{\bkmkend AAAAAAAAHB}
 Inheritance diagram for OptionsDlg:{
 \pard\plain 
 \par\pard \qc {\field\flddirty {\*\fldinst INCLUDEPICTURE "class_options_dlg__inherit__graph.png" \\d \\*MERGEFORMAT}{\fldrslt IMAGE}}\par
@@ -1639,13 +1644,13 @@ Protected Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnClose} (wxCloseEvent &event){\bkmkstart AAAAAAAAGY}
-{\bkmkend AAAAAAAAGY}
+void {\b OnClose} (wxCloseEvent &event){\bkmkstart AAAAAAAAHC}
+{\bkmkend AAAAAAAAHC}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnInitDialog} (wxInitDialogEvent &event){\bkmkstart AAAAAAAAGZ}
-{\bkmkend AAAAAAAAGZ}
+void {\b OnInitDialog} (wxInitDialogEvent &event){\bkmkstart AAAAAAAAHD}
+{\bkmkend AAAAAAAAHD}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -1661,8 +1666,8 @@ Constructor & Destructor Documentation\par
 {\b 
 OptionsDlg::OptionsDlg (wxWindow * {\i parent})}}
 \par
-{\bkmkstart AAAAAAAAHA}
-{\bkmkend AAAAAAAAHA}
+{\bkmkstart AAAAAAAAHE}
+{\bkmkend AAAAAAAAHE}
 {
 \pard\plain \s51\li360\sa60\sb30\qj\widctlpar\qj\adjustright \fs20\cgrid 
 {\s17\sa60\sb30\widctlpar\qj \fs22\cgrid 
@@ -1682,8 +1687,8 @@ C:/bin/Projects/Radio/fdmdv2/src/dlg_options.cpp\par
 paCallBackData Struct Reference\par \pard\plain 
 {\tc\tcl2 \v paCallBackData}
 {\xe \v paCallBackData}
-{\bkmkstart AAAAAAAAHB}
-{\bkmkend AAAAAAAAHB}
+{\bkmkstart AAAAAAAAHF}
+{\bkmkend AAAAAAAAHF}
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
 Public Attributes\par
 \pard\plain 
@@ -1691,13 +1696,13 @@ Public Attributes\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-float {\b in48k} [FDMDV_OS_TAPS+N48]{\bkmkstart AAAAAAAAHC}
-{\bkmkend AAAAAAAAHC}
+float {\b in48k} [FDMDV_OS_TAPS+N48]{\bkmkstart AAAAAAAAHG}
+{\bkmkend AAAAAAAAHG}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-float {\b in8k} [MEM8+N8]{\bkmkstart AAAAAAAAHD}
-{\bkmkend AAAAAAAAHD}
+float {\b in8k} [MEM8+N8]{\bkmkstart AAAAAAAAHH}
+{\bkmkend AAAAAAAAHH}
 \par
 }
 {\pard\widctlpar\brdrb\brdrs\brdrw5\brsp20 \adjustright \par}
@@ -1712,8 +1717,8 @@ C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_pa_wrapper.cpp\par
 PlotPanel Class Reference\par \pard\plain 
 {\tc\tcl2 \v PlotPanel}
 {\xe \v PlotPanel}
-{\bkmkstart AAAAAAAAHE}
-{\bkmkend AAAAAAAAHE}
+{\bkmkstart AAAAAAAAHI}
+{\bkmkend AAAAAAAAHI}
 Inheritance diagram for PlotPanel:{
 \pard\plain 
 \par\pard \qc {\field\flddirty {\*\fldinst INCLUDEPICTURE "class_plot_panel__inherit__graph.png" \\d \\*MERGEFORMAT}{\fldrslt IMAGE}}\par
@@ -1731,241 +1736,241 @@ Public Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b PlotPanel} (wxFrame *parent){\bkmkstart AAAAAAAAHF}
-{\bkmkend AAAAAAAAHF}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-void {\b OnMouseMove} (wxMouseEvent &event){\bkmkstart AAAAAAAAHG}
-{\bkmkend AAAAAAAAHG}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-void {\b OnMouseDown} (wxMouseEvent &event){\bkmkstart AAAAAAAAHH}
-{\bkmkend AAAAAAAAHH}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-void {\b OnMouseUp} (wxMouseEvent &event){\bkmkstart AAAAAAAAHI}
-{\bkmkend AAAAAAAAHI}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-void {\b OnMouseWheelMoved} (wxMouseEvent &event){\bkmkstart AAAAAAAAHJ}
+{\b PlotPanel} (wxFrame *parent){\bkmkstart AAAAAAAAHJ}
 {\bkmkend AAAAAAAAHJ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnClose} (wxCloseEvent &event){\bkmkstart AAAAAAAAHK}
+void {\b OnMouseMove} (wxMouseEvent &event){\bkmkstart AAAAAAAAHK}
 {\bkmkend AAAAAAAAHK}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnSize} (wxSizeEvent &event){\bkmkstart AAAAAAAAHL}
+void {\b OnMouseDown} (wxMouseEvent &event){\bkmkstart AAAAAAAAHL}
 {\bkmkend AAAAAAAAHL}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnErase} (wxEraseEvent &event){\bkmkstart AAAAAAAAHM}
+void {\b OnMouseUp} (wxMouseEvent &event){\bkmkstart AAAAAAAAHM}
 {\bkmkend AAAAAAAAHM}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnPaint} (wxPaintEvent &event){\bkmkstart AAAAAAAAHN}
+void {\b OnMouseWheelMoved} (wxMouseEvent &event){\bkmkstart AAAAAAAAHN}
 {\bkmkend AAAAAAAAHN}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b paintEvent} (wxPaintEvent &evt){\bkmkstart AAAAAAAAHO}
+void {\b OnClose} (wxCloseEvent &event){\bkmkstart AAAAAAAAHO}
 {\bkmkend AAAAAAAAHO}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b draw} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAHP}
+void {\b OnSize} (wxSizeEvent &event){\bkmkstart AAAAAAAAHP}
 {\bkmkend AAAAAAAAHP}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b drawGraticule} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAHQ}
+void {\b OnErase} (wxEraseEvent &event){\bkmkstart AAAAAAAAHQ}
 {\bkmkend AAAAAAAAHQ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual double {\b SetZoomFactor} (double zf){\bkmkstart AAAAAAAAHR}
+void {\b OnPaint} (wxPaintEvent &event){\bkmkstart AAAAAAAAHR}
 {\bkmkend AAAAAAAAHR}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual double {\b GetZoomFactor} (double zf){\bkmkstart AAAAAAAAHS}
+void {\b paintEvent} (wxPaintEvent &evt){\bkmkstart AAAAAAAAHS}
 {\bkmkend AAAAAAAAHS}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b OnShow} (wxShowEvent &event){\bkmkstart AAAAAAAAHT}
+virtual void {\b draw} (wxAutoBufferedPaintDC &pdc){\bkmkstart AAAAAAAAHT}
 {\bkmkend AAAAAAAAHT}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual double {\b GetLabelSize} (){\bkmkstart AAAAAAAAHU}
+virtual void {\b drawGraticule} (wxAutoBufferedPaintDC &pdc){\bkmkstart AAAAAAAAHU}
 {\bkmkend AAAAAAAAHU}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-virtual void {\b SetLabelSize} (double size){\bkmkstart AAAAAAAAHV}
+virtual double {\b SetZoomFactor} (double zf){\bkmkstart AAAAAAAAHV}
 {\bkmkend AAAAAAAAHV}
 \par
-}
-\pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
-Public Attributes\par
-\pard\plain 
-
-{
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxPen {\b m_penShortDash}{\bkmkstart AAAAAAAAHW}
+virtual double {\b GetZoomFactor} (double zf){\bkmkstart AAAAAAAAHW}
 {\bkmkend AAAAAAAAHW}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxPen {\b m_penDotDash}{\bkmkstart AAAAAAAAHX}
+virtual void {\b OnShow} (wxShowEvent &event){\bkmkstart AAAAAAAAHX}
 {\bkmkend AAAAAAAAHX}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxPen {\b m_penSolid}{\bkmkstart AAAAAAAAHY}
+virtual double {\b GetLabelSize} (){\bkmkstart AAAAAAAAHY}
 {\bkmkend AAAAAAAAHY}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxRect {\b m_rectCtrl}{\bkmkstart AAAAAAAAHZ}
+virtual void {\b SetLabelSize} (double size){\bkmkstart AAAAAAAAHZ}
 {\bkmkend AAAAAAAAHZ}
 \par
+}
+\pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
+Public Attributes\par
+\pard\plain 
+
+{
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxRect {\b m_rectGrid}{\bkmkstart AAAAAAAAIA}
+wxPen {\b m_penShortDash}{\bkmkstart AAAAAAAAIA}
 {\bkmkend AAAAAAAAIA}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxRect {\b m_rectPlot}{\bkmkstart AAAAAAAAIB}
+wxPen {\b m_penDotDash}{\bkmkstart AAAAAAAAIB}
 {\bkmkend AAAAAAAAIB}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b MainFrame} * {\b m_pTopFrame}{\bkmkstart AAAAAAAAIC}
+wxPen {\b m_penSolid}{\bkmkstart AAAAAAAAIC}
 {\bkmkend AAAAAAAAIC}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxAuiNotebook * {\b m_pNoteBook}{\bkmkstart AAAAAAAAID}
+wxRect {\b m_rCtrlPrev}{\bkmkstart AAAAAAAAID}
 {\bkmkend AAAAAAAAID}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-double {\b m_label_size}{\bkmkstart AAAAAAAAIE}
+wxRect {\b m_rCtrl}{\bkmkstart AAAAAAAAIE}
 {\bkmkend AAAAAAAAIE}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxSize {\b m_Bufsz}{\bkmkstart AAAAAAAAIF}
+wxRect {\b m_rGrid}{\bkmkstart AAAAAAAAIF}
 {\bkmkend AAAAAAAAIF}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-bool {\b m_newdata}{\bkmkstart AAAAAAAAIG}
+wxRect {\b m_rPlot}{\bkmkstart AAAAAAAAIG}
 {\bkmkend AAAAAAAAIG}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxBitmap * {\b m_bmp}{\bkmkstart AAAAAAAAIH}
+{\b MainFrame} * {\b m_pTopFrame}{\bkmkstart AAAAAAAAIH}
 {\bkmkend AAAAAAAAIH}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-wxNativePixelData * {\b m_pBmp}{\bkmkstart AAAAAAAAII}
+wxAuiNotebook * {\b m_pNoteBook}{\bkmkstart AAAAAAAAII}
 {\bkmkend AAAAAAAAII}
 \par
-}
-\pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
-Protected Attributes\par
-\pard\plain 
-
-{
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_x}{\bkmkstart AAAAAAAAIJ}
+double {\b m_label_size}{\bkmkstart AAAAAAAAIJ}
 {\bkmkend AAAAAAAAIJ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_y}{\bkmkstart AAAAAAAAIK}
+wxSize {\b m_Bufsz}{\bkmkstart AAAAAAAAIK}
 {\bkmkend AAAAAAAAIK}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_w}{\bkmkstart AAAAAAAAIL}
+bool {\b m_newdata}{\bkmkstart AAAAAAAAIL}
 {\bkmkend AAAAAAAAIL}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_h}{\bkmkstart AAAAAAAAIM}
+wxBitmap * {\b m_bmp}{\bkmkstart AAAAAAAAIM}
 {\bkmkend AAAAAAAAIM}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_left}{\bkmkstart AAAAAAAAIN}
+wxNativePixelData * {\b m_pBmp}{\bkmkstart AAAAAAAAIN}
 {\bkmkend AAAAAAAAIN}
 \par
+}
+\pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
+Protected Attributes\par
+\pard\plain 
+
+{
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_top}{\bkmkstart AAAAAAAAIO}
+int {\b m_x}{\bkmkstart AAAAAAAAIO}
 {\bkmkend AAAAAAAAIO}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_prev_w}{\bkmkstart AAAAAAAAIP}
+int {\b m_y}{\bkmkstart AAAAAAAAIP}
 {\bkmkend AAAAAAAAIP}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_prev_h}{\bkmkstart AAAAAAAAIQ}
+int {\b m_left}{\bkmkstart AAAAAAAAIQ}
 {\bkmkend AAAAAAAAIQ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_prev_x}{\bkmkstart AAAAAAAAIR}
+int {\b m_top}{\bkmkstart AAAAAAAAIR}
 {\bkmkend AAAAAAAAIR}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_prev_y}{\bkmkstart AAAAAAAAIS}
+int {\b m_prev_w}{\bkmkstart AAAAAAAAIS}
 {\bkmkend AAAAAAAAIS}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-bool {\b m_use_bitmap}{\bkmkstart AAAAAAAAIT}
+int {\b m_prev_h}{\bkmkstart AAAAAAAAIT}
 {\bkmkend AAAAAAAAIT}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-bool {\b m_clip}{\bkmkstart AAAAAAAAIU}
+int {\b m_prev_x}{\bkmkstart AAAAAAAAIU}
 {\bkmkend AAAAAAAAIU}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-bool {\b m_rubberBand}{\bkmkstart AAAAAAAAIV}
+int {\b m_prev_y}{\bkmkstart AAAAAAAAIV}
 {\bkmkend AAAAAAAAIV}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-bool {\b m_mouseDown}{\bkmkstart AAAAAAAAIW}
+bool {\b m_use_bitmap}{\bkmkstart AAAAAAAAIW}
 {\bkmkend AAAAAAAAIW}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-double {\b m_zoomFactor}{\bkmkstart AAAAAAAAIX}
+bool {\b m_clip}{\bkmkstart AAAAAAAAIX}
 {\bkmkend AAAAAAAAIX}
 \par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+bool {\b m_rubberBand}{\bkmkstart AAAAAAAAIY}
+{\bkmkend AAAAAAAAIY}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+bool {\b m_mouseDown}{\bkmkstart AAAAAAAAIZ}
+{\bkmkend AAAAAAAAIZ}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+bool {\b m_firstPass}{\bkmkstart AAAAAAAAJA}
+{\bkmkend AAAAAAAAJA}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+double {\b m_zoomFactor}{\bkmkstart AAAAAAAAJB}
+{\bkmkend AAAAAAAAJB}
+\par
 }
 {\pard\widctlpar\brdrb\brdrs\brdrw5\brsp20 \adjustright \par}
 The documentation for this class was generated from the following files:{\par
@@ -1981,8 +1986,8 @@ C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot.cpp\par
 PlotScalar Class Reference\par \pard\plain 
 {\tc\tcl2 \v PlotScalar}
 {\xe \v PlotScalar}
-{\bkmkstart AAAAAAAAIY}
-{\bkmkend AAAAAAAAIY}
+{\bkmkstart AAAAAAAAJC}
+{\bkmkend AAAAAAAAJC}
 Inheritance diagram for PlotScalar:{
 \pard\plain 
 \par\pard \qc {\field\flddirty {\*\fldinst INCLUDEPICTURE "class_plot_scalar__inherit__graph.png" \\d \\*MERGEFORMAT}{\fldrslt IMAGE}}\par
@@ -2000,13 +2005,13 @@ Public Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b PlotScalar} (wxFrame *parent, int x_max_, int y_max_){\bkmkstart AAAAAAAAIZ}
-{\bkmkend AAAAAAAAIZ}
+{\b PlotScalar} (wxFrame *parent, int x_max_, int y_max_){\bkmkstart AAAAAAAAJD}
+{\bkmkend AAAAAAAAJD}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b add_new_sample} (float sample){\bkmkstart AAAAAAAAJA}
-{\bkmkend AAAAAAAAJA}
+void {\b add_new_sample} (float sample){\bkmkstart AAAAAAAAJE}
+{\bkmkend AAAAAAAAJE}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -2016,28 +2021,28 @@ Protected Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b clip} (int y1){\bkmkstart AAAAAAAAJB}
-{\bkmkend AAAAAAAAJB}
+int {\b clip} (int y1){\bkmkstart AAAAAAAAJF}
+{\bkmkend AAAAAAAAJF}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b draw} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAJC}
-{\bkmkend AAAAAAAAJC}
+void {\b draw} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAJG}
+{\bkmkend AAAAAAAAJG}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnPaint} (wxPaintEvent &event){\bkmkstart AAAAAAAAJD}
-{\bkmkend AAAAAAAAJD}
+void {\b OnPaint} (wxPaintEvent &event){\bkmkstart AAAAAAAAJH}
+{\bkmkend AAAAAAAAJH}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnSize} (wxSizeEvent &event){\bkmkstart AAAAAAAAJE}
-{\bkmkend AAAAAAAAJE}
+void {\b OnSize} (wxSizeEvent &event){\bkmkstart AAAAAAAAJI}
+{\bkmkend AAAAAAAAJI}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnShow} (wxShowEvent &event){\bkmkstart AAAAAAAAJF}
-{\bkmkend AAAAAAAAJF}
+void {\b OnShow} (wxShowEvent &event){\bkmkstart AAAAAAAAJJ}
+{\bkmkend AAAAAAAAJJ}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -2047,33 +2052,33 @@ Protected Attributes\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_x_max}{\bkmkstart AAAAAAAAJG}
-{\bkmkend AAAAAAAAJG}
+int {\b m_x_max}{\bkmkstart AAAAAAAAJK}
+{\bkmkend AAAAAAAAJK}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_y_max}{\bkmkstart AAAAAAAAJH}
-{\bkmkend AAAAAAAAJH}
+int {\b m_y_max}{\bkmkstart AAAAAAAAJL}
+{\bkmkend AAAAAAAAJL}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-float * {\b m_mem}{\bkmkstart AAAAAAAAJI}
-{\bkmkend AAAAAAAAJI}
+float * {\b m_mem}{\bkmkstart AAAAAAAAJM}
+{\bkmkend AAAAAAAAJM}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-float {\b m_new_sample}{\bkmkstart AAAAAAAAJJ}
-{\bkmkend AAAAAAAAJJ}
+float {\b m_new_sample}{\bkmkstart AAAAAAAAJN}
+{\bkmkend AAAAAAAAJN}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_index}{\bkmkstart AAAAAAAAJK}
-{\bkmkend AAAAAAAAJK}
+int {\b m_index}{\bkmkstart AAAAAAAAJO}
+{\bkmkend AAAAAAAAJO}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_step}{\bkmkstart AAAAAAAAJL}
-{\bkmkend AAAAAAAAJL}
+int {\b m_step}{\bkmkstart AAAAAAAAJP}
+{\bkmkend AAAAAAAAJP}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -2093,8 +2098,8 @@ C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot_scalar.cpp\par
 PlotScatter Class Reference\par \pard\plain 
 {\tc\tcl2 \v PlotScatter}
 {\xe \v PlotScatter}
-{\bkmkstart AAAAAAAAJM}
-{\bkmkend AAAAAAAAJM}
+{\bkmkstart AAAAAAAAJQ}
+{\bkmkend AAAAAAAAJQ}
 Inheritance diagram for PlotScatter:{
 \pard\plain 
 \par\pard \qc {\field\flddirty {\*\fldinst INCLUDEPICTURE "class_plot_scatter__inherit__graph.png" \\d \\*MERGEFORMAT}{\fldrslt IMAGE}}\par
@@ -2112,8 +2117,8 @@ Public Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b PlotScatter} (wxFrame *parent){\bkmkstart AAAAAAAAJN}
-{\bkmkend AAAAAAAAJN}
+{\b PlotScatter} (wxFrame *parent){\bkmkstart AAAAAAAAJR}
+{\bkmkend AAAAAAAAJR}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -2123,28 +2128,28 @@ Protected Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b draw} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAJO}
-{\bkmkend AAAAAAAAJO}
+void {\b draw} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAJS}
+{\bkmkend AAAAAAAAJS}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b add_new_samples} ({\b COMP} samples[]){\bkmkstart AAAAAAAAJP}
-{\bkmkend AAAAAAAAJP}
+void {\b add_new_samples} ({\b COMP} samples[]){\bkmkstart AAAAAAAAJT}
+{\bkmkend AAAAAAAAJT}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnPaint} (wxPaintEvent &event){\bkmkstart AAAAAAAAJQ}
-{\bkmkend AAAAAAAAJQ}
+void {\b OnPaint} (wxPaintEvent &event){\bkmkstart AAAAAAAAJU}
+{\bkmkend AAAAAAAAJU}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnSize} (wxSizeEvent &event){\bkmkstart AAAAAAAAJR}
-{\bkmkend AAAAAAAAJR}
+void {\b OnSize} (wxSizeEvent &event){\bkmkstart AAAAAAAAJV}
+{\bkmkend AAAAAAAAJV}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnShow} (wxShowEvent &event){\bkmkstart AAAAAAAAJS}
-{\bkmkend AAAAAAAAJS}
+void {\b OnShow} (wxShowEvent &event){\bkmkstart AAAAAAAAJW}
+{\bkmkend AAAAAAAAJW}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -2154,13 +2159,13 @@ Protected Attributes\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b COMP} {\b m_mem} [SCATTER_MEM]{\bkmkstart AAAAAAAAJT}
-{\bkmkend AAAAAAAAJT}
+{\b COMP} {\b m_mem} [SCATTER_MEM]{\bkmkstart AAAAAAAAJX}
+{\bkmkend AAAAAAAAJX}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b COMP} {\b m_new_samples} [FDMDV_NSYM]{\bkmkstart AAAAAAAAJU}
-{\bkmkend AAAAAAAAJU}
+{\b COMP} {\b m_new_samples} [FDMDV_NSYM]{\bkmkstart AAAAAAAAJY}
+{\bkmkend AAAAAAAAJY}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -2180,8 +2185,8 @@ C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot_scatter.cpp\par
 PlotSpectrum Class Reference\par \pard\plain 
 {\tc\tcl2 \v PlotSpectrum}
 {\xe \v PlotSpectrum}
-{\bkmkstart AAAAAAAAJV}
-{\bkmkend AAAAAAAAJV}
+{\bkmkstart AAAAAAAAJZ}
+{\bkmkend AAAAAAAAJZ}
 Inheritance diagram for PlotSpectrum:{
 \pard\plain 
 \par\pard \qc {\field\flddirty {\*\fldinst INCLUDEPICTURE "class_plot_spectrum__inherit__graph.png" \\d \\*MERGEFORMAT}{\fldrslt IMAGE}}\par
@@ -2199,8 +2204,8 @@ Public Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b PlotSpectrum} (wxFrame *parent){\bkmkstart AAAAAAAAJW}
-{\bkmkend AAAAAAAAJW}
+{\b PlotSpectrum} (wxFrame *parent){\bkmkstart AAAAAAAAKA}
+{\bkmkend AAAAAAAAKA}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -2210,28 +2215,28 @@ Protected Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnPaint} (wxPaintEvent &event){\bkmkstart AAAAAAAAJX}
-{\bkmkend AAAAAAAAJX}
+void {\b OnPaint} (wxPaintEvent &event){\bkmkstart AAAAAAAAKB}
+{\bkmkend AAAAAAAAKB}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnSize} (wxSizeEvent &event){\bkmkstart AAAAAAAAJY}
-{\bkmkend AAAAAAAAJY}
+void {\b OnSize} (wxSizeEvent &event){\bkmkstart AAAAAAAAKC}
+{\bkmkend AAAAAAAAKC}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnShow} (wxShowEvent &event){\bkmkstart AAAAAAAAJZ}
-{\bkmkend AAAAAAAAJZ}
+void {\b OnShow} (wxShowEvent &event){\bkmkstart AAAAAAAAKD}
+{\bkmkend AAAAAAAAKD}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b drawGraticule} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAKA}
-{\bkmkend AAAAAAAAKA}
+void {\b drawGraticule} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAKE}
+{\bkmkend AAAAAAAAKE}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b draw} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAKB}
-{\bkmkend AAAAAAAAKB}
+void {\b draw} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAKF}
+{\bkmkend AAAAAAAAKF}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -2251,8 +2256,8 @@ C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot_spectrum.cpp\par
 PlotWaterfall Class Reference\par \pard\plain 
 {\tc\tcl2 \v PlotWaterfall}
 {\xe \v PlotWaterfall}
-{\bkmkstart AAAAAAAAKC}
-{\bkmkend AAAAAAAAKC}
+{\bkmkstart AAAAAAAAKG}
+{\bkmkend AAAAAAAAKG}
 Inheritance diagram for PlotWaterfall:{
 \pard\plain 
 \par\pard \qc {\field\flddirty {\*\fldinst INCLUDEPICTURE "class_plot_waterfall__inherit__graph.png" \\d \\*MERGEFORMAT}{\fldrslt IMAGE}}\par
@@ -2270,8 +2275,8 @@ Public Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-{\b PlotWaterfall} (wxFrame *parent){\bkmkstart AAAAAAAAKD}
-{\bkmkend AAAAAAAAKD}
+{\b PlotWaterfall} (wxFrame *parent){\bkmkstart AAAAAAAAKH}
+{\bkmkend AAAAAAAAKH}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -2281,43 +2286,33 @@ Protected Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-unsigned {\b heatmap} (float val, float min, float max){\bkmkstart AAAAAAAAKE}
-{\bkmkend AAAAAAAAKE}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-void {\b OnPaint} (wxPaintEvent &evt){\bkmkstart AAAAAAAAKF}
-{\bkmkend AAAAAAAAKF}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-void {\b OnSize} (wxSizeEvent &event){\bkmkstart AAAAAAAAKG}
-{\bkmkend AAAAAAAAKG}
+unsigned {\b heatmap} (float val, float min, float max){\bkmkstart AAAAAAAAKI}
+{\bkmkend AAAAAAAAKI}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b OnShow} (wxShowEvent &event){\bkmkstart AAAAAAAAKH}
-{\bkmkend AAAAAAAAKH}
+void {\b OnPaint} (wxPaintEvent &evt){\bkmkstart AAAAAAAAKJ}
+{\bkmkend AAAAAAAAKJ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b drawGraticule} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAKI}
-{\bkmkend AAAAAAAAKI}
+void {\b OnShow} (wxShowEvent &event){\bkmkstart AAAAAAAAKK}
+{\bkmkend AAAAAAAAKK}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b draw} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAKJ}
-{\bkmkend AAAAAAAAKJ}
+void {\b drawGraticule} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAKL}
+{\bkmkend AAAAAAAAKL}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b plotData} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAKK}
-{\bkmkend AAAAAAAAKK}
+void {\b draw} (wxAutoBufferedPaintDC &pdc){\bkmkstart AAAAAAAAKM}
+{\bkmkend AAAAAAAAKM}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b plotPixelData} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAKL}
-{\bkmkend AAAAAAAAKL}
+void {\b plotPixelData} (wxAutoBufferedPaintDC &dc){\bkmkstart AAAAAAAAKN}
+{\bkmkend AAAAAAAAKN}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -2327,13 +2322,23 @@ Protected Attributes\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-unsigned {\b m_heatmap_lut} [256]{\bkmkstart AAAAAAAAKM}
-{\bkmkend AAAAAAAAKM}
+unsigned {\b m_heatmap_lut} [256]{\bkmkstart AAAAAAAAKO}
+{\bkmkend AAAAAAAAKO}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b m_greyscale}{\bkmkstart AAAAAAAAKN}
-{\bkmkend AAAAAAAAKN}
+int {\b m_greyscale}{\bkmkstart AAAAAAAAKP}
+{\bkmkend AAAAAAAAKP}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+wxMemoryDC {\b m_mDC}{\bkmkstart AAAAAAAAKQ}
+{\bkmkend AAAAAAAAKQ}
+\par
+\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
+
+int {\b m_line_color}{\bkmkstart AAAAAAAAKR}
+{\bkmkend AAAAAAAAKR}
 \par
 }
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
@@ -2353,8 +2358,8 @@ C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot_waterfall.cpp\par
 PortAudioWrap Class Reference\par \pard\plain 
 {\tc\tcl2 \v PortAudioWrap}
 {\xe \v PortAudioWrap}
-{\bkmkstart AAAAAAAAKO}
-{\bkmkend AAAAAAAAKO}
+{\bkmkstart AAAAAAAAKS}
+{\bkmkend AAAAAAAAKS}
 \pard\plain \s3\sb240\sa60\keepn\widctlpar\adjustright \b\f1\cgrid 
 Public Member Functions\par
 \pard\plain 
@@ -2362,162 +2367,142 @@ Public Member Functions\par
 {
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b per_frame_rx_processing} (short output_buf[], int *n_output_buf, int codec_bits[], short input_buf[], int *n_input_buf, int *nin, int *state, struct CODEC2 *c2){\bkmkstart AAAAAAAAKP}
-{\bkmkend AAAAAAAAKP}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-PaDeviceIndex {\b getDefaultInputDevice} (){\bkmkstart AAAAAAAAKQ}
-{\bkmkend AAAAAAAAKQ}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-PaDeviceIndex {\b getDefaultOutputDevice} (){\bkmkstart AAAAAAAAKR}
-{\bkmkend AAAAAAAAKR}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-PaStreamParameters * {\b getDeviceInfo} (PaDeviceIndex idx){\bkmkstart AAAAAAAAKS}
-{\bkmkend AAAAAAAAKS}
-\par
-\pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
-
-PaError {\b setFramesPerBuffer} (unsigned long size){\bkmkstart AAAAAAAAKT}
+void {\b averageData} (float mag_dB[]){\bkmkstart AAAAAAAAKT}
 {\bkmkend AAAAAAAAKT}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setSampleRate} (unsigned long size){\bkmkstart AAAAAAAAKU}
+PaDeviceIndex {\b getDefaultInputDevice} (){\bkmkstart AAAAAAAAKU}
 {\bkmkend AAAAAAAAKU}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setStreamFlags} (PaStreamFlags flags){\bkmkstart AAAAAAAAKV}
+PaDeviceIndex {\b getDefaultOutputDevice} (){\bkmkstart AAAAAAAAKV}
 {\bkmkend AAAAAAAAKV}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setCallback} (PaStreamCallback *streamCallback){\bkmkstart AAAAAAAAKW}
+PaStreamParameters * {\b getDeviceInfo} (PaDeviceIndex idx){\bkmkstart AAAAAAAAKW}
 {\bkmkend AAAAAAAAKW}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setStreamCallback} (PaStream *stream, PaStreamCallback *callback){\bkmkstart AAAAAAAAKX}
+PaError {\b setFramesPerBuffer} (unsigned long size){\bkmkstart AAAAAAAAKX}
 {\bkmkend AAAAAAAAKX}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setStreamFinishedCallback} (PaStream *stream, PaStreamFinishedCallback *streamFinishedCallback){\bkmkstart AAAAAAAAKY}
+PaError {\b setSampleRate} (unsigned long size){\bkmkstart AAAAAAAAKY}
 {\bkmkend AAAAAAAAKY}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b streamOpen} (){\bkmkstart AAAAAAAAKZ}
+PaError {\b setStreamFlags} (PaStreamFlags flags){\bkmkstart AAAAAAAAKZ}
 {\bkmkend AAAAAAAAKZ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setInputDevice} (PaDeviceIndex dev){\bkmkstart AAAAAAAALA}
+PaError {\b setCallback} (PaStreamCallback *m_pStreamCallback){\bkmkstart AAAAAAAALA}
 {\bkmkend AAAAAAAALA}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setInputChannelCount} (int count){\bkmkstart AAAAAAAALB}
+PaError {\b setStreamCallback} (PaStream *stream, PaStreamCallback *callback){\bkmkstart AAAAAAAALB}
 {\bkmkend AAAAAAAALB}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b getInputChannelCount} (){\bkmkstart AAAAAAAALC}
+PaError {\b setStreamFinishedCallback} (PaStream *stream, PaStreamFinishedCallback *m_pStreamFinishedCallback){\bkmkstart AAAAAAAALC}
 {\bkmkend AAAAAAAALC}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setInputSampleFormat} (PaSampleFormat format){\bkmkstart AAAAAAAALD}
+void {\b setInputBuffer} (const PaStreamParameters &inputBuffer){\bkmkstart AAAAAAAALD}
 {\bkmkend AAAAAAAALD}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setInputSampleRate} (PaSampleFormat format){\bkmkstart AAAAAAAALE}
+PaError {\b setInputDevice} (PaDeviceIndex dev){\bkmkstart AAAAAAAALE}
 {\bkmkend AAAAAAAALE}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setInputLatency} (PaTime latency){\bkmkstart AAAAAAAALF}
+PaError {\b setInputChannelCount} (int count){\bkmkstart AAAAAAAALF}
 {\bkmkend AAAAAAAALF}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b setInputHostApiStreamInfo} (void *info=NULL){\bkmkstart AAAAAAAALG}
+int {\b getInputChannelCount} (){\bkmkstart AAAAAAAALG}
 {\bkmkend AAAAAAAALG}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaTime {\b getInputDefaultLowLatency} (){\bkmkstart AAAAAAAALH}
+PaError {\b setInputSampleFormat} (PaSampleFormat format){\bkmkstart AAAAAAAALH}
 {\bkmkend AAAAAAAALH}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-const char * {\b getDeviceName} (PaDeviceIndex dev){\bkmkstart AAAAAAAALI}
+PaError {\b setInputSampleRate} (PaSampleFormat format){\bkmkstart AAAAAAAALI}
 {\bkmkend AAAAAAAALI}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setOutputDevice} (PaDeviceIndex dev){\bkmkstart AAAAAAAALJ}
+PaError {\b setInputLatency} (PaTime latency){\bkmkstart AAAAAAAALJ}
 {\bkmkend AAAAAAAALJ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setOutputChannelCount} (int count){\bkmkstart AAAAAAAALK}
+void {\b setInputHostApiStreamInfo} (void *info=NULL){\bkmkstart AAAAAAAALK}
 {\bkmkend AAAAAAAALK}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-const int {\b getOutputChannelCount} (){\bkmkstart AAAAAAAALL}
+PaTime {\b getInputDefaultLowLatency} (){\bkmkstart AAAAAAAALL}
 {\bkmkend AAAAAAAALL}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setOutputSampleFormat} (PaSampleFormat format){\bkmkstart AAAAAAAALM}
+const char * {\b getDeviceName} (PaDeviceIndex dev){\bkmkstart AAAAAAAALM}
 {\bkmkend AAAAAAAALM}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b setOutputLatency} (PaTime latency){\bkmkstart AAAAAAAALN}
+PaError {\b setOutputDevice} (PaDeviceIndex dev){\bkmkstart AAAAAAAALN}
 {\bkmkend AAAAAAAALN}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b streamStart} (){\bkmkstart AAAAAAAALO}
+PaError {\b setOutputChannelCount} (int count){\bkmkstart AAAAAAAALO}
 {\bkmkend AAAAAAAALO}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaError {\b streamClose} (){\bkmkstart AAAAAAAALP}
+const int {\b getOutputChannelCount} (){\bkmkstart AAAAAAAALP}
 {\bkmkend AAAAAAAALP}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b setOutputHostApiStreamInfo} (void *info=NULL){\bkmkstart AAAAAAAALQ}
+PaError {\b setOutputSampleFormat} (PaSampleFormat format){\bkmkstart AAAAAAAALQ}
 {\bkmkend AAAAAAAALQ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaTime {\b getOutputDefaultLowLatency} (){\bkmkstart AAAAAAAALR}
+PaError {\b setOutputLatency} (PaTime latency){\bkmkstart AAAAAAAALR}
 {\bkmkend AAAAAAAALR}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b averageData} (float mag_dB[]){\bkmkstart AAAAAAAALS}
+void {\b setOutputHostApiStreamInfo} (void *info=NULL){\bkmkstart AAAAAAAALS}
 {\bkmkend AAAAAAAALS}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b setFdmdvState} (FDMDV *fdmdv_state){\bkmkstart AAAAAAAALT}
+PaTime {\b getOutputDefaultLowLatency} (){\bkmkstart AAAAAAAALT}
 {\bkmkend AAAAAAAALT}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b setInputBuffer} (const PaStreamParameters &inputBuffer){\bkmkstart AAAAAAAALU}
+void {\b setFdmdvState} (FDMDV *fdmdv_state){\bkmkstart AAAAAAAALU}
 {\bkmkend AAAAAAAALU}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
@@ -2527,32 +2512,32 @@ void {\b setOutputBuffer} (const PaStreamParameters &outputBuffer){\bkmkstart AA
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b setSamplerate} (int samplerate){\bkmkstart AAAAAAAALW}
+void {\b setTimeInfo} (PaStreamCallbackTimeInfo *timeInfo){\bkmkstart AAAAAAAALW}
 {\bkmkend AAAAAAAALW}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b setStatusFlags} (const PaStreamCallbackFlags &statusFlags){\bkmkstart AAAAAAAALX}
+void {\b setUserData} (void *userData){\bkmkstart AAAAAAAALX}
 {\bkmkend AAAAAAAALX}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b setStream} (PaStream *stream){\bkmkstart AAAAAAAALY}
+unsigned long {\b getFramesPerBuffer} () const {\bkmkstart AAAAAAAALY}
 {\bkmkend AAAAAAAALY}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b setStreamFinishedCallback} (PaStreamFinishedCallback *streamFinishedCallback){\bkmkstart AAAAAAAALZ}
+const PaStreamParameters & {\b getInputBuffer} () const {\bkmkstart AAAAAAAALZ}
 {\bkmkend AAAAAAAALZ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b setTimeInfo} (PaStreamCallbackTimeInfo *timeInfo){\bkmkstart AAAAAAAAMA}
+const PaStreamParameters & {\b getOutputBuffer} () const {\bkmkstart AAAAAAAAMA}
 {\bkmkend AAAAAAAAMA}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void {\b setUserData} (void *userData){\bkmkstart AAAAAAAAMB}
+const PaStreamCallbackFlags & {\b getStatusFlags} () const {\bkmkstart AAAAAAAAMB}
 {\bkmkend AAAAAAAAMB}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
@@ -2562,37 +2547,37 @@ FDMDV * {\b getFdmdvState} (){\bkmkstart AAAAAAAAMC}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-unsigned long {\b getFramesPerBuffer} () const {\bkmkstart AAAAAAAAMD}
+int {\b getSamplerate} () const {\bkmkstart AAAAAAAAMD}
 {\bkmkend AAAAAAAAMD}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-const PaStreamParameters & {\b getInputBuffer} () const {\bkmkstart AAAAAAAAME}
+PaStream * {\b getStream} (){\bkmkstart AAAAAAAAME}
 {\bkmkend AAAAAAAAME}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-const PaStreamParameters & {\b getOutputBuffer} () const {\bkmkstart AAAAAAAAMF}
+void * {\b getUserData} (){\bkmkstart AAAAAAAAMF}
 {\bkmkend AAAAAAAAMF}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-int {\b getSamplerate} () const {\bkmkstart AAAAAAAAMG}
+bool {\b getDataAvail} (){\bkmkstart AAAAAAAAMG}
 {\bkmkend AAAAAAAAMG}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-const PaStreamCallbackFlags & {\b getStatusFlags} () const {\bkmkstart AAAAAAAAMH}
+PaError {\b streamStart} (){\bkmkstart AAAAAAAAMH}
 {\bkmkend AAAAAAAAMH}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-PaStream * {\b getStream} (){\bkmkstart AAAAAAAAMI}
+PaError {\b streamClose} (){\bkmkstart AAAAAAAAMI}
 {\bkmkend AAAAAAAAMI}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 
 
-void * {\b getUserData} (){\bkmkstart AAAAAAAAMJ}
+PaError {\b streamOpen} (){\bkmkstart AAAAAAAAMJ}
 {\bkmkend AAAAAAAAMJ}
 \par
 \pard\plain \s80\fi-360\li360\widctlpar\jclisttab\tx360{\*\pn \pnlvlbody\ilvl0\ls1\pnrnot0\pndec }\ls1\adjustright \fs20\cgrid 

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index 0298298c223a99d9a6c23abdd4b7146bcb05ee80..ad98b1c2f950c6d34966c2f2cabd547a2d4b760e 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -32,7 +32,6 @@
 #define wxUSE_LIBTIFF   1\r
 \r
 //float  av_mag[FDMDV_NSPEC];                  // shared between a few classes
-\r
 // initialize the application\r
 IMPLEMENT_APP(MainApp);\r
 \r
@@ -45,18 +44,48 @@ bool MainApp::OnInit()
     {\r
         return false;\r
     }\r
+    if(!loadConfig())\r
+    {\r
+        wxMessageBox(wxT("Unable to open configuration data.  Create New?"), wxT("Configuration"), wxYES_NO | wxCANCEL);\r
+    }\r
     // Create the main application window\r
     MainFrame *frame = new MainFrame(NULL);\r
-\r
     SetTopWindow(frame);\r
-\r
     // Should guarantee that the first plot tab defined is the one\r
     // displayed. But it doesn't when built from command line.  Why?\r
     frame->m_auiNbookCtrl->ChangeSelection(0);\r
-\r
     frame->Layout();\r
     frame->Show();\r
+    return true;\r
+}\r
 \r
+//-------------------------------------------------------------------------\r
+// loadConfig()\r
+//-------------------------------------------------------------------------\r
+bool MainApp::loadConfig()\r
+{\r
+    g_config = new wxConfig("FDMDV2");\r
+    wxString str;\r
+    if(g_config->Read("LastPrompt", &str))\r
+    {\r
+        // last prompt was found in the config file/registry and its value is\r
+        // now in str\r
+        // ...\r
+    }\r
+    else\r
+    {\r
+        // no last prompt...\r
+    }\r
+    // another example: using default values and the full path instead of just\r
+    // key name: if the key is not found , the value 17 is returned\r
+    long value = g_config->ReadLong("/LastRun/CalculatedValues/MaxValue", 17);\r
+\r
+    // at the end of the program we would save everything back\r
+    g_config->Write("LastPrompt", str);\r
+    g_config->Write("/LastRun/CalculatedValues/MaxValue", value);\r
+\r
+    // the changes will be written back automatically\r
+    delete g_config;\r
     return true;\r
 }\r
 \r
@@ -97,6 +126,12 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent)
     // Add generic plot window\r
     m_panelDefaultA = new PlotPanel((wxFrame*) m_auiNbookCtrl );\r
     m_auiNbookCtrl->AddPage(m_panelDefaultA, _("Test A"), true, wxNullBitmap );\r
+#ifdef USE_TIMER\r
+//    this->Connect(wxEVT_TIMER, MainFrame::OnTimer);    //, ID_TIMER_WATERFALL);\r
+    Bind(wxEVT_TIMER, &MainFrame::OnTimer, this);   // ID_MY_WINDOW);\r
+    m_plotTimer.SetOwner(this, ID_TIMER_WATERFALL);
+    m_plotTimer.Start(500, wxTIMER_CONTINUOUS);\r
+#endif\r
 }\r
 \r
 //-------------------------------------------------------------------------\r
@@ -104,7 +139,25 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent)
 //-------------------------------------------------------------------------\r
 MainFrame::~MainFrame()\r
 {\r
+#ifdef USE_TIMER\r
+    if (m_plotTimer.IsRunning())\r
+    {\r
+        m_plotTimer.Stop();\r
+        Unbind(wxEVT_TIMER, &MainFrame::OnTimer, this);   // ID_MY_WINDOW);\r
+    }
+#endif\r
+}
+\r
+#ifdef USE_TIMER\r
+//----------------------------------------------------------------\r
+// OnTimer()\r
+//----------------------------------------------------------------\r
+void MainFrame::OnTimer(wxTimerEvent &evt)\r
+{\r
+    m_panelWaterfall->m_newdata = true;\r
+    m_panelWaterfall->Refresh();\r
 }\r
+#endif\r
 \r
 //-------------------------------------------------------------------------\r
 // OnCloseFrame()\r
@@ -125,7 +178,7 @@ void MainFrame::OnExitClick(wxCommandEvent& event)
 }\r
 \r
 //-------------------------------------------------------------------------\r
-// Onpa->nt()\r
+// Onpa->Paint()\r
 //-------------------------------------------------------------------------\r
 void MainFrame::OnPaint(wxPaintEvent& WXUNUSED(event))\r
 {\r
@@ -136,8 +189,6 @@ void MainFrame::OnPaint(wxPaintEvent& WXUNUSED(event))
         dc.Clear();\r
     }\r
     dc.SetUserScale(m_zoom, m_zoom);\r
-//    const wxSize size = GetClientSize();\r
-//    dc.DrawBitmap(m_bitmap, dc.DeviceToLogicalX((size.x - m_zoom * m_bitmap.GetWidth()) / 2), dc.DeviceToLogicalY((size.y - m_zoom * m_bitmap.GetHeight()) / 2), true);\r
 }\r
 \r
 //-------------------------------------------------------------------------\r
@@ -245,73 +296,6 @@ void MainFrame::OnTogBtnALCClick(wxCommandEvent& event)
     event.Skip();\r
 }\r
 \r
-//-------------------------------------------------------------------------\r
-// rxCallback()\r
-//-------------------------------------------------------------------------\r
-int MainFrame::rxCallback(\r
-                            const void *inBuffer,\r
-                            void *outBuffer,\r
-                            unsigned long framesPerBuffer,\r
-                            const PaStreamCallbackTimeInfo *outTime,\r
-                            PaStreamCallbackFlags statusFlags,\r
-                            void *userData\r
-                         )\r
-{\r
-    float *out = (float *) outBuffer;\r
-    float *in  = (float *) inBuffer;\r
-    float leftIn;\r
-    float rightIn;\r
-    unsigned int i;\r
-\r
-    if(inBuffer == NULL)\r
-    {\r
-        return 0;\r
-    }\r
-    // Read input buffer, process data, and fill output buffer.\r
-    for(i = 0; i < framesPerBuffer; i++)\r
-    {\r
-        leftIn  = *in++;                            // Get interleaved samples from input buffer.\r
-        rightIn = *in++;\r
-        *out++  = leftIn * rightIn;                 // ring modulation\r
-        *out++  = 0.5f * (leftIn + rightIn);        // mixing\r
-    }\r
-    return paContinue;                              // 0;\r
-}\r
-
-\r
-//-------------------------------------------------------------------------\r
-// txCallback()\r
-//-------------------------------------------------------------------------\r
-int MainFrame::txCallback(\r
-                            const void *inBuffer,\r
-                            void *outBuffer,\r
-                            unsigned long framesPerBuffer,\r
-                            const PaStreamCallbackTimeInfo *outTime,\r
-                            PaStreamCallbackFlags statusFlags,\r
-                            void *userData\r
-                         )\r
-{\r
-    float *out = (float *) outBuffer;\r
-    float *in  = (float *) inBuffer;\r
-    float leftIn;\r
-    float rightIn;\r
-    unsigned int i;\r
-\r
-    if(inBuffer == NULL)\r
-    {\r
-        return 0;\r
-    }\r
-    // Read input buffer, process data, and fill output buffer.\r
-    for(i = 0; i < framesPerBuffer; i++)\r
-    {\r
-        leftIn  = *in++;                            // Get interleaved samples from input buffer.\r
-        rightIn = *in++;\r
-        *out++  = leftIn * rightIn;                 // ring modulation\r
-        *out++  = 0.5f * (leftIn + rightIn);        // mixing\r
-    }\r
-    return paContinue;                              // 0;\r
-}
-\r
 \r
 //-------------------------------------------------------------------------\r
 // OnTogBtnOnOff()\r
@@ -738,8 +722,6 @@ wxString MainFrame::LoadUserImage(wxImage& image)
 //-------------------------------------------------------------------------\r
 void MainFrame::OnSave(wxCommandEvent& WXUNUSED(event))\r
 {\r
- //   wxImage image = m_bitmap.ConvertToImage();\r
-\r
     wxString savefilename = wxFileSelector(wxT("Save Sound File"),\r
                                            wxEmptyString,\r
                                            wxEmptyString,\r
@@ -750,7 +732,6 @@ void MainFrame::OnSave(wxCommandEvent& WXUNUSED(event))
                                            wxT("FLAC files (*.flc)|*.flc|"),\r
                                            wxFD_SAVE,\r
                                            this);\r
-\r
     if(savefilename.empty())\r
     {\r
         return;\r
@@ -758,140 +739,248 @@ void MainFrame::OnSave(wxCommandEvent& WXUNUSED(event))
     wxString extension;\r
     wxFileName::SplitPath(savefilename, NULL, NULL, &extension);\r
     bool saved = false;\r
-/*\r
-    if(extension == wxT("bmp"))\r
+    if(!saved)\r
     {\r
-        static const int bppvalues[] =\r
-        {\r
-            wxBMP_1BPP,\r
-            wxBMP_1BPP_BW,\r
-            wxBMP_4BPP,\r
-            wxBMP_8BPP,\r
-            wxBMP_8BPP_GREY,\r
-            wxBMP_8BPP_RED,\r
-            wxBMP_8BPP_PALETTE,\r
-            wxBMP_24BPP\r
-        };\r
-\r
-        const wxString bppchoices[] =\r
-        {\r
-            wxT("1 bpp color"),\r
-            wxT("1 bpp B&W"),\r
-            wxT("4 bpp color"),\r
-            wxT("8 bpp color"),\r
-            wxT("8 bpp greyscale"),\r
-            wxT("8 bpp red"),\r
-            wxT("8 bpp own pa->ette"),\r
-            wxT("24 bpp")\r
-        };\r
-\r
-        int bppselection = wxGetSingleChoiceIndex(wxT("Set BMP BPP"),\r
-                           wxT("Image sample: save file"),\r
-                           WXSIZEOF(bppchoices),\r
-                           bppchoices,\r
-                           this);\r
-        if(bppselection != -1)\r
-        {\r
-            int format = bppvalues[bppselection];\r
-\r
-            image.SetOption(wxIMAGE_OPTION_BMP_FORMAT, format);\r
-            if(format == wxBMP_8BPP_PALETTE)\r
-            {\r
-                unsigned char *cmap = new unsigned char [256];\r
-                for(int i = 0; i < 256; i++)\r
-                {\r
-                    cmap[i] = (unsigned char)i;\r
-                }\r
-                image.SetPalette(wxPalette(256, cmap, cmap, cmap));\r
-                delete[] cmap;\r
-            }\r
-        }\r
+        // This one guesses image format from filename extension\r
+        // (it may fail if the extension is not recognized):\r
+        //image.SaveFile(savefilename);\r
     }\r
-    else if(extension == wxT("png"))\r
+}\r
+
+//-------------------------------------------------------------------------\r
+// rxCallback()\r
+//-------------------------------------------------------------------------\r
+int MainFrame::rxCallback(\r
+                            const void *inBuffer,\r
+                            void *outBuffer,\r
+                            unsigned long framesPerBuffer,\r
+                            const PaStreamCallbackTimeInfo *outTime,\r
+                            PaStreamCallbackFlags statusFlags,\r
+                            void *userData\r
+                         )\r
+{\r
+    float *out = (float *) outBuffer;\r
+    float *in  = (float *) inBuffer;\r
+    float leftIn;\r
+    float rightIn;\r
+    unsigned int i;\r
+\r
+    if(inBuffer == NULL)\r
     {\r
-        static const int pngvalues[] =\r
-        {\r
-            wxPNG_TYPE_COLOUR,\r
-            wxPNG_TYPE_COLOUR,\r
-            wxPNG_TYPE_GREY,\r
-            wxPNG_TYPE_GREY,\r
-            wxPNG_TYPE_GREY_RED,\r
-            wxPNG_TYPE_GREY_RED,\r
-        };\r
-\r
-        const wxString pngchoices[] =\r
-        {\r
-            wxT("Colour 8bpp"),\r
-            wxT("Colour 16bpp"),\r
-            wxT("Grey 8bpp"),\r
-            wxT("Grey 16bpp"),\r
-            wxT("Grey red 8bpp"),\r
-            wxT("Grey red 16bpp"),\r
-        };\r
-\r
-        int sel = wxGetSingleChoiceIndex(wxT("Set PNG format"),\r
-                                         wxT("Image sample: save file"),\r
-                                         WXSIZEOF(pngchoices),\r
-                                         pngchoices,\r
-                                         this);\r
-        if(sel != -1)\r
-        {\r
-            image.SetOption(wxIMAGE_OPTION_PNG_FORMAT, pngvalues[sel]);\r
-            image.SetOption(wxIMAGE_OPTION_PNG_BITDEPTH, sel % 2 ? 16 : 8);\r
-\r
-            // these values are taken from OptiPNG with -o3 switch\r
-            const wxString compressionChoices[] =\r
-            {\r
-                wxT("compression = 9, memory = 8, strategy = 0, filter = 0"),\r
-                wxT("compression = 9, memory = 9, strategy = 0, filter = 0"),\r
-                wxT("compression = 9, memory = 8, strategy = 1, filter = 0"),\r
-                wxT("compression = 9, memory = 9, strategy = 1, filter = 0"),\r
-                wxT("compression = 1, memory = 8, strategy = 2, filter = 0"),\r
-                wxT("compression = 1, memory = 9, strategy = 2, filter = 0"),\r
-                wxT("compression = 9, memory = 8, strategy = 0, filter = 5"),\r
-                wxT("compression = 9, memory = 9, strategy = 0, filter = 5"),\r
-                wxT("compression = 9, memory = 8, strategy = 1, filter = 5"),\r
-                wxT("compression = 9, memory = 9, strategy = 1, filter = 5"),\r
-                wxT("compression = 1, memory = 8, strategy = 2, filter = 5"),\r
-                wxT("compression = 1, memory = 9, strategy = 2, filter = 5"),\r
-            };\r
-\r
-            int sel = wxGetSingleChoiceIndex(wxT("Select compression option (Cancel to use default)\n"),\r
-                                             wxT("PNG Compression Options"),\r
-                                             WXSIZEOF(compressionChoices),\r
-                                             compressionChoices,\r
-                                             this);\r
-            if(sel != -1)\r
-            {\r
-                const int zc[] = {9, 9, 9, 9, 1, 1, 9, 9, 9, 9, 1, 1};\r
-                const int zm[] = {8, 9, 8, 9, 8, 9, 8, 9, 8, 9, 8, 9};\r
-                const int zs[] = {0, 0, 1, 1, 2, 2, 0, 0, 1, 1, 2, 2};\r
-                const int f[]  = {0x08, 0x08, 0x08, 0x08, 0x08, 0x08,\r
-                                  0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8\r
-                                 };\r
-\r
-                image.SetOption(wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL      , zc[sel]);\r
-                image.SetOption(wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL  , zm[sel]);\r
-                image.SetOption(wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY   , zs[sel]);\r
-                image.SetOption(wxIMAGE_OPTION_PNG_FILTER                 , f[sel]);\r
-                image.SetOption(wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE, 1048576); // 1 MB\r
-            }\r
-        }\r
+        return 0;\r
     }\r
-    else if(extension == wxT("cur"))\r
+    // Read input buffer, process data, and fill output buffer.\r
+    for(i = 0; i < framesPerBuffer; i++)\r
     {\r
-        image.Rescale(32, 32);\r
-        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, 0);\r
-        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, 0);\r
-        // This shows how you can save an image with explicitly\r
-        // specified image format:\r
-        saved = image.SaveFile(savefilename, wxBITMAP_TYPE_CUR);\r
+        leftIn  = *in++;                            // Get interleaved samples from input buffer.\r
+        rightIn = *in++;\r
+        *out++  = leftIn * rightIn;                 // ring modulation\r
+        *out++  = 0.5f * (leftIn + rightIn);        // mixing\r
     }\r
-*/\r
-    if(!saved)\r
+    return paContinue;                              // 0;\r
+}
+\r
+//-------------------------------------------------------------------------\r
+// txCallback()\r
+//-------------------------------------------------------------------------\r
+int MainFrame::txCallback(\r
+                            const void *inBuffer,\r
+                            void *outBuffer,\r
+                            unsigned long framesPerBuffer,\r
+                            const PaStreamCallbackTimeInfo *outTime,\r
+                            PaStreamCallbackFlags statusFlags,\r
+                            void *userData\r
+                         )\r
+{\r
+    float *out = (float *) outBuffer;\r
+    float *in  = (float *) inBuffer;\r
+    float leftIn;\r
+    float rightIn;\r
+    unsigned int i;\r
+\r
+    if(inBuffer == NULL)\r
     {\r
-        // This one guesses image format from filename extension\r
-        // (it may fail if the extension is not recognized):\r
-        //image.SaveFile(savefilename);\r
+        return 0;\r
     }\r
+    // Read input buffer, process data, and fill output buffer.\r
+    for(i = 0; i < framesPerBuffer; i++)\r
+    {\r
+        leftIn  = *in++;                            // Get interleaved samples from input buffer.\r
+        rightIn = *in++;\r
+        *out++  = leftIn * rightIn;                 // ring modulation\r
+        *out++  = 0.5f * (leftIn + rightIn);        // mixing\r
+    }\r
+    return paContinue;                              // 0;\r
+}
+\r
+//----------------------------------------------------------------
+// update average of each spectrum point
+//----------------------------------------------------------------
+void MainFrame::averageData(float mag_dB[])
+{
+    int i;
+
+    for(i = 0; i < FDMDV_NSPEC; i++)
+    {
+        m_rxPa->m_av_mag[i] = (1.0 - BETA) * m_rxPa->m_av_mag[i] + BETA * mag_dB[i];
+    }
+}\r
+\r
+//----------------------------------------------------------------
+// per_frame_rx_processing()
+//----------------------------------------------------------------
+void MainFrame::per_frame_rx_processing(
+                                            short   output_buf[],  // output buf of decoded speech samples
+                                            int     *n_output_buf, // how many samples currently in output_buf[]
+                                            int     codec_bits[],  // current frame of bits for decoder
+                                            short   input_buf[],   // input buf of modem samples input to demod
+                                            int     *n_input_buf,  // how many samples currently in input_buf[]
+                                            int     *nin,          // amount of samples demod needs for next call
+                                            int     *state,        // used to collect codec_bits[] halves
+                                            struct  CODEC2 *c2     // Codec 2 states
+                                       )
+{
+    struct FDMDV_STATS  stats;
+    int                 sync_bit;
+    float               rx_fdm[FDMDV_MAX_SAMPLES_PER_FRAME];
+    int                 rx_bits[FDMDV_BITS_PER_FRAME];
+    unsigned char       packed_bits[BYTES_PER_CODEC_FRAME];
+    float               rx_spec[FDMDV_NSPEC];
+    int                 i;\r
+    int                 nin_prev;\r
+    int                 bit;\r
+    int                 byte;
+    int                 next_state;
+
+    assert(*n_input_buf <= (2 * FDMDV_NOM_SAMPLES_PER_FRAME));
+
+    //
+    //  This while loop will run the demod 0, 1 (nominal) or 2 times:
+    //
+    //  0: when tx sample clock runs faster than rx, occasionally we
+    //     will run out of samples
+    //
+    //  1: normal, run decoder once, every 2nd frame output a frame of
+    //     speech samples to D/A
+    //
+    //  2: when tx sample clock runs slower than rx, occasionally we will
+    //     have enough samples to run demod twice.
+    //
+    //  With a +/- 10 Hz sample clock difference at FS=8000Hz (+/- 1250
+    //  ppm), case 0 or 1 occured about once every 30 seconds.  This is
+    //  no problem for the decoded audio.
+    //
+    while(*n_input_buf >= *nin)
+    {
+        // demod per frame processing
+        for(i = 0; i < *nin; i++)
+        {
+            rx_fdm[i] = (float)input_buf[i]/FDMDV_SCALE;
+        }
+        nin_prev = *nin;
+        fdmdv_demod(m_pFDMDV_state, rx_bits, &sync_bit, rx_fdm, nin);
+        *n_input_buf -= nin_prev;
+        assert(*n_input_buf >= 0);
+
+        // shift input buffer
+        for(i = 0; i < *n_input_buf; i++)
+        {
+            input_buf[i] = input_buf[i+nin_prev];
+        }
+\r
+        // compute rx spectrum & get demod stats, and update GUI plot data
+        fdmdv_get_rx_spectrum(m_pFDMDV_state, rx_spec, rx_fdm, nin_prev);
+        fdmdv_get_demod_stats(m_pFDMDV_state, &stats);
+        averageData(rx_spec);\r
+        //m_panelWaterfall;\r
+        //m_panelScalar;
+//        m_panelScatter->add_new_samples(stats.rx_symbols);
+//        aTimingEst->add_new_sample(stats.rx_timing);
+//        aFreqEst->add_new_sample(stats.foff);
+//        aSNR->add_new_sample(stats.snr_est);
+        //
+        //   State machine to:
+        //
+        //   + Mute decoded audio when out of sync.  The demod is synced
+        //     when we are using the fine freq estimate and SNR is above
+        //     a thresh.
+        //
+        //   + Decode codec bits only if we have a 0,1 sync bit
+        //     sequence.  Collects two frames of demod bits to decode
+        //     one frame of codec bits.
+        //
+        next_state = *state;
+        switch(*state)
+        {
+            case 0:
+                // mute output audio when out of sync
+                if(*n_output_buf < 2 * codec2_samples_per_frame(c2) - N8)
+                {
+                    for(i=0; i<N8; i++)\r
+                    {
+                        output_buf[*n_output_buf + i] = 0;
+                    }
+                    *n_output_buf += N8;
+                }
+                assert(*n_output_buf <= (2 * codec2_samples_per_frame(c2)));
+                if((stats.fest_coarse_fine == 1) && (stats.snr_est > 3.0))
+                {
+                    next_state = 1;
+                }
+                break;
+
+            case 1:
+                if(sync_bit == 0)
+                {
+                    next_state = 2;
+                    // first half of frame of codec bits
+                    memcpy(codec_bits, rx_bits, FDMDV_BITS_PER_FRAME * sizeof(int));
+                }
+                else
+                {
+                    next_state = 1;
+                }
+                if(stats.fest_coarse_fine == 0)
+                {
+                    next_state = 0;
+                }
+                break;
+
+            case 2:
+                next_state = 1;
+                if(stats.fest_coarse_fine == 0)
+                {
+                    next_state = 0;
+                }
+                if(sync_bit == 1)
+                {
+                    // second half of frame of codec bits
+                    memcpy(&codec_bits[FDMDV_BITS_PER_FRAME], rx_bits, FDMDV_BITS_PER_FRAME*sizeof(int));
+                    // pack bits, MSB received first
+                    bit  = 7;
+                    byte = 0;
+                    memset(packed_bits, 0, BYTES_PER_CODEC_FRAME);
+                    for(i = 0; i < BITS_PER_CODEC_FRAME; i++)
+                    {
+                        packed_bits[byte] |= (codec_bits[i] << bit);
+                        bit--;
+                        if(bit < 0)
+                        {
+                            bit = 7;
+                            byte++;
+                        }
+                    }
+                    assert(byte == BYTES_PER_CODEC_FRAME);
+                    // add decoded speech to end of output buffer
+                    if(*n_output_buf <= codec2_samples_per_frame(c2))
+                    {
+                        codec2_decode(c2, &output_buf[*n_output_buf], packed_bits);
+                        *n_output_buf += codec2_samples_per_frame(c2);
+                    }
+                    assert(*n_output_buf <= (2 * codec2_samples_per_frame(c2)));
+                }
+                break;
+        }
+        *state = next_state;
+    }
 }\r

diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h
index bfdcdeb64a2ca860623f629ef1a7a36e992cb09d..a6e038799d0c39924308ea87fd29ffb0359504f4 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.h
+++ b/fdmdv2/src/fdmdv2_main.h
@@ -13,6 +13,7 @@
 #include <wx/wx.h>\r
 
 #include "wx/file.h"
+#include "wx/config.h"\r
 #include "wx/filename.h"
 #include "wx/graphics.h"
 #include "wx/mstream.h"
@@ -22,7 +23,6 @@
 #include "wx/stopwatch.h"
 #include "wx/versioninfo.h"
 #include <wx/sound.h>
-//#include <wx/thread.h>\r
 \r
 #include "codec2.h"
 #include "fdmdv.h"\r
@@ -41,6 +41,16 @@
 #include "sndfile.h"\r
 #include "portaudio.h"
 \r
+#define USE_TIMER 1\r
+\r
+enum {\r
+        ID_START = wxID_HIGHEST,\r
+        ID_TIMER_WATERFALL,\r
+        ID_TIMER_SPECTRUM,\r
+        ID_TIMER_SCATTER,\r
+        ID_TIMER_SCALAR\r
+    };\r
+\r
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
 // Class MainApp\r
 //\r
@@ -59,8 +69,9 @@ class MainApp : public wxApp
         {
             return 0;
         }
-
+        bool loadConfig();\r
     protected:\r
+        wxConfig *g_config;\r
 };
 
 // declare global static function wxGetApp()
@@ -101,6 +112,8 @@ class MainFrame : public TopFrame
         PaError         m_rxErr;
         PaError         m_txErr;
         wxSound         *m_sound;
+        struct FDMDV    *m_pFDMDV_state;\r
+        wxTimer         m_plotTimer;\r
 \r
         static int rxCallback(\r
                                 const void *inBuffer,\r
@@ -119,17 +132,30 @@ class MainFrame : public TopFrame
                                 void *userData\r
                              );\r
 \r
+        void per_frame_rx_processing(\r
+                                        short   output_buf[],  // output buf of decoded speech samples\r
+                                        int     *n_output_buf, // how many samples currently in output_buf[]\r
+                                        int     codec_bits[],  // current frame of bits for decoder\r
+                                        short   input_buf[],   // input buf of modem samples input to demod\r
+                                        int     *n_input_buf,  // how many samples currently in input_buf[]\r
+                                        int     *nin,          // amount of samples demod needs for next call\r
+                                        int     *state,        // used to collect codec_bits[] halves\r
+                                        struct  CODEC2 *c2     // Codec 2 states\r
+                                    );\r
+\r
     protected:\r
         // protected event handlers
         virtual void OnCloseFrame(wxCloseEvent& event);
         virtual void OnExitClick(wxCommandEvent& event);
 
+        void averageData(float mag_dB[]);\r
         void startTxStream();\r
         void startRxStream();\r
         void stopTxStream();\r
         void stopRxStream();\r
         void abortTxStream();\r
         void abortRxStream();\r
+\r
         void OnOpen( wxCommandEvent& event );\r
         void OnOpenUpdateUI( wxUpdateUIEvent& event );\r
         void OnSave( wxCommandEvent& event );\r
@@ -160,6 +186,7 @@ class MainFrame : public TopFrame
         void OnCmdSliderScrollChanged( wxScrollEvent& event );\r
         void OnSliderScrollTop( wxScrollEvent& event );\r
         void OnCheckSQClick( wxCommandEvent& event );
+\r
         // Toggle Buttons\r
         void OnTogBtnSplitClick(wxCommandEvent& event);
         void OnTogBtnAnalogClick(wxCommandEvent& event);
@@ -168,22 +195,23 @@ class MainFrame : public TopFrame
         void OnTogBtnTxID( wxCommandEvent& event );\r
         void OnTogBtnTXClick( wxCommandEvent& event );\r
         void OnTogBtnOnOff( wxCommandEvent& event );
+\r
+        //System Events\r
         void OnPaint(wxPaintEvent& event);
         void OnClose( wxCloseEvent& event );
         void OnSize( wxSizeEvent& event );
         void OnUpdateUI( wxUpdateUIEvent& event );
+        void OnTimer(wxTimerEvent &evt);\r
 
         wxString LoadUserImage(wxImage& image);
 
     private:
         bool CreateSound(wxSound& snd) const;
-
         wxString    m_soundFile;
 #ifdef __WXMSW__
         wxString    m_soundRes;
 #endif // __WXMSW__
         bool        m_useMemory;
-
         wxTextCtrl* m_tc;
         int         m_zoom;
 };

diff --git a/fdmdv2/src/fdmdv2_pa_wrapper.cpp b/fdmdv2/src/fdmdv2_pa_wrapper.cpp
index 35121f6b26ed70c57890732d7605048b1c8e7e6d..ca45d79bbfbc4af108e449f24b993e6409d2bdf3 100644 (file)
--- a/fdmdv2/src/fdmdv2_pa_wrapper.cpp
+++ b/fdmdv2/src/fdmdv2_pa_wrapper.cpp
@@ -23,52 +23,64 @@
 //==========================================================================\r
 #include "fdmdv2_pa_wrapper.h"
 
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
+// PortAudioWrap()\r
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
 PortAudioWrap::PortAudioWrap()
 {
-    stream                  = NULL;\r
-    userData                = NULL;\r
-    samplerate              = 0;\r
-    framesPerBuffer         = 0;
-    statusFlags             = 0;\r
-    streamCallback          = NULL;\r
-    streamFinishedCallback  = NULL;\r
-    timeInfo                = 0;\r
+    m_pStream                   = NULL;\r
+    m_pUserData                 = NULL;\r
+    m_samplerate                = 0;\r
+    m_framesPerBuffer           = 0;
+    m_statusFlags               = 0;\r
+    m_pStreamCallback           = NULL;\r
+    m_pStreamFinishedCallback   = NULL;\r
+    m_pTimeInfo                 = 0;\r
+    m_newdata                   = false;\r
+\r
     loadData();\r
 }
 
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
+// ~PortAudioWrap()
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
 PortAudioWrap::~PortAudioWrap()
 {
 }
 
-//PaError PortAudioWrap::init()
-//{
-//    return Pa_Initialize();
-//}
-
+//----------------------------------------------------------------
+// streamOpen()
+//----------------------------------------------------------------
 PaError PortAudioWrap::streamOpen()\r
 {
     return Pa_OpenStream(
-                            &stream,
-                            &inputBuffer,
-                            &outputBuffer,
-                            samplerate,
-                            framesPerBuffer,
-                            statusFlags,
-                            *streamCallback,
-                            userData
+                            &m_pStream,
+                            &m_inputBuffer,
+                            &m_outputBuffer,
+                            m_samplerate,
+                            m_framesPerBuffer,
+                            m_statusFlags,
+                            *m_pStreamCallback,
+                            m_pUserData
                         );
 }
 
+//----------------------------------------------------------------
+// streamStart()
+//----------------------------------------------------------------
 PaError PortAudioWrap::streamStart()\r
 {
-    return Pa_StartStream(stream);
+    return Pa_StartStream(m_pStream);
 }
 
+//----------------------------------------------------------------
+// streamClose()
+//----------------------------------------------------------------
 PaError PortAudioWrap::streamClose()\r
 {
     if(isOpen())
     {
-        PaError rv = Pa_CloseStream(stream);
+        PaError rv = Pa_CloseStream(m_pStream);
         return rv;
     }
     else
@@ -77,96 +89,147 @@ PaError PortAudioWrap::streamClose()
     }
 }
 \r
+//----------------------------------------------------------------
+// terminate()
+//----------------------------------------------------------------
 void PortAudioWrap::terminate()\r
 {
-    if(Pa_IsStreamStopped(stream) != paNoError)
+    if(Pa_IsStreamStopped(m_pStream) != paNoError)
     {
-        Pa_StopStream(stream);
+        Pa_StopStream(m_pStream);
     }
     Pa_Terminate();
 }
 \r
+//----------------------------------------------------------------
+// stop()
+//----------------------------------------------------------------
 void PortAudioWrap::stop()
 {
-    Pa_StopStream(stream);
+    Pa_StopStream(m_pStream);
 }
 
+//----------------------------------------------------------------
+// abort()
+//----------------------------------------------------------------
 void PortAudioWrap::abort()
 {
-    Pa_AbortStream(stream);
+    Pa_AbortStream(m_pStream);
 }
 
+//----------------------------------------------------------------
+// isStopped()
+//----------------------------------------------------------------
 bool PortAudioWrap::isStopped() const
 {
-    PaError ret = Pa_IsStreamStopped(stream);
+    PaError ret = Pa_IsStreamStopped(m_pStream);
     return ret;
 }
 
+//----------------------------------------------------------------
+// isActive()
+//----------------------------------------------------------------
 bool PortAudioWrap::isActive() const
 {
-    PaError ret = Pa_IsStreamActive(stream);
+    PaError ret = Pa_IsStreamActive(m_pStream);
     return ret;
 }
 
+//----------------------------------------------------------------
+// isOpen()
+//----------------------------------------------------------------
 bool PortAudioWrap::isOpen() const\r
 {\r
-    return (stream != NULL);\r
+    return (m_pStream != NULL);\r
 }\r
 
+//----------------------------------------------------------------
+// getDefaultInputDevice()
+//----------------------------------------------------------------
 PaDeviceIndex PortAudioWrap::getDefaultInputDevice()
 {
     return Pa_GetDefaultInputDevice();
 }
 
+//----------------------------------------------------------------
+// getDefaultOutputDevice()
+//----------------------------------------------------------------
 PaDeviceIndex PortAudioWrap::getDefaultOutputDevice()
 {
     return Pa_GetDefaultOutputDevice();
 }
 
+//----------------------------------------------------------------
+// setInputChannelCount()
+//----------------------------------------------------------------
 PaError PortAudioWrap::setInputChannelCount(int count)
 {
-    inputBuffer.channelCount = count;
+    m_inputBuffer.channelCount = count;
     return paNoError;
 }
 
+//----------------------------------------------------------------
+// getInputChannelCount()
+//----------------------------------------------------------------
 PaError PortAudioWrap::getInputChannelCount()
 {
-    return inputBuffer.channelCount;
+    return m_inputBuffer.channelCount;
 }
 
+//----------------------------------------------------------------
+// setInputSampleFormat()
+//----------------------------------------------------------------
 PaError PortAudioWrap::setInputSampleFormat(PaSampleFormat format)
 {
-    inputBuffer.sampleFormat = format;
+    m_inputBuffer.sampleFormat = format;
     return paNoError;
 }
 
+//----------------------------------------------------------------
+// setInputLatency()
+//----------------------------------------------------------------
 PaError PortAudioWrap::setInputLatency(PaTime latency)
 {
-    inputBuffer.suggestedLatency = latency;
+    m_inputBuffer.suggestedLatency = latency;
     return paNoError;
 }
 \r
+//----------------------------------------------------------------
+// setInputHostApiStreamInfo()
+//----------------------------------------------------------------
 void PortAudioWrap::setInputHostApiStreamInfo(void *info)
 {
-    inputBuffer.hostApiSpecificStreamInfo = info;
+    m_inputBuffer.hostApiSpecificStreamInfo = info;
 }
 \r
+//----------------------------------------------------------------
+// getInputDefaultLowLatency()
+//----------------------------------------------------------------
 PaTime  PortAudioWrap::getInputDefaultLowLatency()
 {
-    return Pa_GetDeviceInfo(inputBuffer.device)->defaultLowInputLatency;
+    return Pa_GetDeviceInfo(m_inputBuffer.device)->defaultLowInputLatency;
 }
 
+//----------------------------------------------------------------
+// setOutputChannelCount()
+//----------------------------------------------------------------
 PaError PortAudioWrap::setOutputChannelCount(int count)
 {
-    outputBuffer.channelCount = count;
+    m_outputBuffer.channelCount = count;
     return paNoError;
 }
 
+//----------------------------------------------------------------
+// getOutputChannelCount()
+//----------------------------------------------------------------
 const int PortAudioWrap::getOutputChannelCount()
 {
-    return outputBuffer.channelCount;
+    return m_outputBuffer.channelCount;
 }
 
+//----------------------------------------------------------------
+// getDeviceName()
+//----------------------------------------------------------------
 const char *PortAudioWrap::getDeviceName(PaDeviceIndex dev)
 {
     const PaDeviceInfo *info;
@@ -174,61 +237,91 @@ const char *PortAudioWrap::getDeviceName(PaDeviceIndex dev)
     return info->name;
 }
 
+//----------------------------------------------------------------
+// setOutputSampleFormat()
+//----------------------------------------------------------------
 PaError PortAudioWrap::setOutputSampleFormat(PaSampleFormat format)
 {
-    outputBuffer.sampleFormat = format;
+    m_outputBuffer.sampleFormat = format;
     return paNoError;
 }
 
+//----------------------------------------------------------------
+// setOutputLatency()
+//----------------------------------------------------------------
 PaError PortAudioWrap::setOutputLatency(PaTime latency)
 {
-    outputBuffer.suggestedLatency = latency;
+    m_outputBuffer.suggestedLatency = latency;
     return paNoError;
 }
 
+//----------------------------------------------------------------
+// setOutputHostApiStreamInfo()
+//----------------------------------------------------------------
 void PortAudioWrap::setOutputHostApiStreamInfo(void *info)
 {
-    outputBuffer.hostApiSpecificStreamInfo = info;
+    m_outputBuffer.hostApiSpecificStreamInfo = info;
 }
 
+//----------------------------------------------------------------
+// getOutputDefaultLowLatency()
+//----------------------------------------------------------------
 PaTime  PortAudioWrap::getOutputDefaultLowLatency()
 {
-    return Pa_GetDeviceInfo(outputBuffer.device)->defaultLowOutputLatency;
+    return Pa_GetDeviceInfo(m_outputBuffer.device)->defaultLowOutputLatency;
 }
 
+//----------------------------------------------------------------
+// setFramesPerBuffer()
+//----------------------------------------------------------------
 PaError PortAudioWrap::setFramesPerBuffer(unsigned long size)
 {
-    framesPerBuffer = size;
+    m_framesPerBuffer = size;
     return paNoError;
 }
 
+//----------------------------------------------------------------
+// setSampleRate()
+//----------------------------------------------------------------
 PaError PortAudioWrap::setSampleRate(unsigned long rate)\r
 {
-    samplerate = rate;
+    m_samplerate = rate;
     return paNoError;
 }
 
+//----------------------------------------------------------------
+// setStreamFlags()
+//----------------------------------------------------------------
 PaError PortAudioWrap::setStreamFlags(PaStreamFlags flags)\r
 {
-    statusFlags = flags;
+    m_statusFlags = flags;
     return paNoError;
 }
 
+//----------------------------------------------------------------
+// setInputDevice()
+//----------------------------------------------------------------
 PaError PortAudioWrap::setInputDevice(PaDeviceIndex index)\r
 {
-    inputBuffer.device = index;
+    m_inputBuffer.device = index;
     return paNoError;
 }
 
+//----------------------------------------------------------------
+// setOutputDevice()
+//----------------------------------------------------------------
 PaError PortAudioWrap::setOutputDevice(PaDeviceIndex index)\r
 {
-    outputBuffer.device = index;
+    m_outputBuffer.device = index;
     return paNoError;
 }
 
+//----------------------------------------------------------------
+// setCallback()
+//----------------------------------------------------------------
 PaError PortAudioWrap::setCallback(PaStreamCallback *callback)\r
 {
-    streamCallback = callback;
+    m_pStreamCallback = callback;
     return paNoError;
 }
 \r
@@ -238,179 +331,8 @@ typedef struct
     float               in8k[MEM8 + N8];
 } paCallBackData;
 \r
-
-//----------------------------------------------------------------
-// per_frame_rx_processing()
-//----------------------------------------------------------------
-void  PortAudioWrap::per_frame_rx_processing(
-                                short   output_buf[],  /* output buf of decoded speech samples          */
-                                int     *n_output_buf, /* how many samples currently in output_buf[]    */
-                                int     codec_bits[],  /* current frame of bits for decoder             */
-                                short   input_buf[],   /* input buf of modem samples input to demod     */
-                                int     *n_input_buf,  /* how many samples currently in input_buf[]     */
-                                int     *nin,          /* amount of samples demod needs for next call   */
-                                int     *state,        /* used to collect codec_bits[] halves           */
-                                struct  CODEC2 *c2     /* Codec 2 states                                */
-                            )
-{
-    struct FDMDV_STATS  stats;
-    int                 sync_bit;
-    float               rx_fdm[FDMDV_MAX_SAMPLES_PER_FRAME];
-    int                 rx_bits[FDMDV_BITS_PER_FRAME];
-    unsigned char       packed_bits[BYTES_PER_CODEC_FRAME];
-    float               rx_spec[FDMDV_NSPEC];
-    int                 i;\r
-    int                 nin_prev;\r
-    int                 bit;\r
-    int                 byte;
-    int                 next_state;
-
-    assert(*n_input_buf <= (2 * FDMDV_NOM_SAMPLES_PER_FRAME));
-
-    /*
-      This while loop will run the demod 0, 1 (nominal) or 2 times:
-
-      0: when tx sample clock runs faster than rx, occasionally we
-         will run out of samples
-
-      1: normal, run decoder once, every 2nd frame output a frame of
-         speech samples to D/A
-
-      2: when tx sample clock runs slower than rx, occasionally we will
-         have enough samples to run demod twice.
-
-      With a +/- 10 Hz sample clock difference at FS=8000Hz (+/- 1250
-      ppm), case 0 or 1 occured about once every 30 seconds.  This is
-      no problem for the decoded audio.
-    */
-    while(*n_input_buf >= *nin)
-    {
-        // demod per frame processing
-        for(i = 0; i < *nin; i++)
-        {
-            rx_fdm[i] = (float)input_buf[i]/FDMDV_SCALE;
-        }
-        nin_prev = *nin;
-        fdmdv_demod(fdmdv_state, rx_bits, &sync_bit, rx_fdm, nin);
-        *n_input_buf -= nin_prev;
-        assert(*n_input_buf >= 0);
-
-        // shift input buffer
-        for(i=0; i<*n_input_buf; i++)
-        {
-            input_buf[i] = input_buf[i+nin_prev];
-        }
-
-        // compute rx spectrum & get demod stats, and update GUI plot data
-        fdmdv_get_rx_spectrum(fdmdv_state, rx_spec, rx_fdm, nin_prev);
-        fdmdv_get_demod_stats(fdmdv_state, &stats);
-        averageData(rx_spec);
-//        aScatter->add_new_samples(stats.rx_symbols);
-//        aTimingEst->add_new_sample(stats.rx_timing);
-//        aFreqEst->add_new_sample(stats.foff);
-//        aSNR->add_new_sample(stats.snr_est);
-        /*
-           State machine to:
-
-           + Mute decoded audio when out of sync.  The demod is synced
-             when we are using the fine freq estimate and SNR is above
-             a thresh.
-
-           + Decode codec bits only if we have a 0,1 sync bit
-             sequence.  Collects two frames of demod bits to decode
-             one frame of codec bits.
-        */
-        next_state = *state;
-        switch(*state)
-        {
-            case 0:
-                // mute output audio when out of sync
-                if(*n_output_buf < 2 * codec2_samples_per_frame(c2) - N8)
-                {
-                    for(i=0; i<N8; i++)\r
-                    {
-                        output_buf[*n_output_buf + i] = 0;
-                    }
-                    *n_output_buf += N8;
-                }
-                assert(*n_output_buf <= (2 * codec2_samples_per_frame(c2)));
-                if((stats.fest_coarse_fine == 1) && (stats.snr_est > 3.0))
-                {
-                    next_state = 1;
-                }
-                break;
-
-            case 1:
-                if(sync_bit == 0)
-                {
-                    next_state = 2;
-                    // first half of frame of codec bits
-                    memcpy(codec_bits, rx_bits, FDMDV_BITS_PER_FRAME * sizeof(int));
-                }
-                else
-                {
-                    next_state = 1;
-                }
-                if(stats.fest_coarse_fine == 0)
-                {
-                    next_state = 0;
-                }
-                break;
-
-            case 2:
-                next_state = 1;
-                if(stats.fest_coarse_fine == 0)
-                {
-                    next_state = 0;
-                }
-                if(sync_bit == 1)
-                {
-                    // second half of frame of codec bits
-                    memcpy(&codec_bits[FDMDV_BITS_PER_FRAME], rx_bits, FDMDV_BITS_PER_FRAME*sizeof(int));
-                    // pack bits, MSB received first
-                    bit  = 7;
-                    byte = 0;
-                    memset(packed_bits, 0, BYTES_PER_CODEC_FRAME);
-                    for(i = 0; i < BITS_PER_CODEC_FRAME; i++)
-                    {
-                        packed_bits[byte] |= (codec_bits[i] << bit);
-                        bit--;
-                        if(bit < 0)
-                        {
-                            bit = 7;
-                            byte++;
-                        }
-                    }
-                    assert(byte == BYTES_PER_CODEC_FRAME);
-                    // add decoded speech to end of output buffer
-                    if(*n_output_buf <= codec2_samples_per_frame(c2))
-                    {
-                        codec2_decode(c2, &output_buf[*n_output_buf], packed_bits);
-                        *n_output_buf += codec2_samples_per_frame(c2);
-                    }
-                    assert(*n_output_buf <= (2 * codec2_samples_per_frame(c2)));
-                }
-                break;
-        }
-        *state = next_state;
-    }
-}\r
-\r
 //----------------------------------------------------------------
-// update average of each spectrum point
-//----------------------------------------------------------------
-void PortAudioWrap::averageData(float mag_dB[])
-{
-    int i;
-
-    for(i = 0; i < FDMDV_NSPEC; i++)
-    {
-        m_av_mag[i] = (1.0 - BETA) * m_av_mag[i] + BETA * mag_dB[i];
-    }
-}\r
-\r
-//----------------------------------------------------------------
-// create Dummy Data
+// loadData() : create Dummy Data
 //----------------------------------------------------------------
 void PortAudioWrap::loadData()\r
 {\r
@@ -420,3 +342,4 @@ void PortAudioWrap::loadData()
         m_av_mag[i] = i;\r
     }\r
 }
+\r

diff --git a/fdmdv2/src/fdmdv2_pa_wrapper.h b/fdmdv2/src/fdmdv2_pa_wrapper.h
index 657baa055887e25a4fa68449df4c0333ca58974c..574e5939b9a94893200b341d6d3a6922422d57f8 100644 (file)
--- a/fdmdv2/src/fdmdv2_pa_wrapper.h
+++ b/fdmdv2/src/fdmdv2_pa_wrapper.h
@@ -47,48 +47,22 @@ class PortAudioWrap
         float                           m_av_mag[FDMDV_NSPEC];
 \r
     private:
-        PaStream                        *stream;
-        PaStreamParameters              inputBuffer;
-        PaStreamParameters              outputBuffer;
-        void                            *userData;
-        int                             samplerate;
-        unsigned long                   framesPerBuffer;
-        PaStreamCallbackFlags           statusFlags;
-        PaStreamCallback                *streamCallback;
-        PaStreamFinishedCallback        *streamFinishedCallback;
-        const PaStreamCallbackTimeInfo  *timeInfo;
-        struct FDMDV                    *fdmdv_state;\r
+        PaStream                        *m_pStream;
+        void                            *m_pUserData;
+        PaStreamCallback                *m_pStreamCallback;
+        PaStreamFinishedCallback        *m_pStreamFinishedCallback;
+        const PaStreamCallbackTimeInfo  *m_pTimeInfo;
+        struct FDMDV                    *m_pFDMDV_state;\r
+        PaStreamParameters              m_inputBuffer;
+        PaStreamParameters              m_outputBuffer;
+        int                             m_samplerate;
+        unsigned long                   m_framesPerBuffer;
+        PaStreamCallbackFlags           m_statusFlags;
+        bool                            m_newdata;\r
 \r
     public:\r
-        void per_frame_rx_processing(\r
-            short   output_buf[],  /* output buf of decoded speech samples          */\r
-            int     *n_output_buf, /* how many samples currently in output_buf[]    */\r
-            int     codec_bits[],  /* current frame of bits for decoder             */\r
-            short   input_buf[],   /* input buf of modem samples input to demod     */\r
-            int     *n_input_buf,  /* how many samples currently in input_buf[]     */\r
-            int     *nin,          /* amount of samples demod needs for next call   */\r
-            int     *state,        /* used to collect codec_bits[] halves           */\r
-            struct  CODEC2 *c2     /* Codec 2 states                                */\r
-        );\r
 \r
-        /*\r
-                static int Callback(\r
-                                        const void *inBuffer,\r
-                                        void *outBuffer,\r
-                                        unsigned long framesPerBuffer,\r
-                                        const PaStreamCallbackTimeInfo *outTime,\r
-                                        PaStreamCallbackFlags statusFlags,\r
-                                        void *userData\r
-                                   );\r
-                static int txCallback(\r
-                                        const void *inBuffer,\r
-                                        void *outBuffer,\r
-                                        unsigned long framesPerBuffer,\r
-                                        const PaStreamCallbackTimeInfo *outTime,\r
-                                        PaStreamCallbackFlags statusFlags,\r
-                                        void *userData\r
-                                     );\r
-        */\r
+        void                averageData(float mag_dB[]);\r
 \r
         PaDeviceIndex       getDefaultInputDevice();\r
         PaDeviceIndex       getDefaultOutputDevice();\r
@@ -96,12 +70,13 @@ class PortAudioWrap
 \r
         PaError             setFramesPerBuffer(unsigned long size);\r
         PaError             setSampleRate(unsigned long size);\r
+\r
         PaError             setStreamFlags(PaStreamFlags flags);\r
-        PaError             setCallback(PaStreamCallback *streamCallback);\r
-        PaError             setStreamCallback(PaStream *stream, PaStreamCallback* callback) { streamCallback = callback; return 0;}\r
-        PaError             setStreamFinishedCallback(PaStream *stream, PaStreamFinishedCallback* streamFinishedCallback);\r
-        PaError             streamOpen();\r
+        PaError             setCallback(PaStreamCallback *m_pStreamCallback);\r
+        PaError             setStreamCallback(PaStream *stream, PaStreamCallback* callback) { m_pStreamCallback = callback; return 0;}\r
+        PaError             setStreamFinishedCallback(PaStream *stream, PaStreamFinishedCallback* m_pStreamFinishedCallback);\r
 \r
+        void                setInputBuffer(const PaStreamParameters& inputBuffer)   {this->m_inputBuffer = inputBuffer;}
         PaError             setInputDevice(PaDeviceIndex dev);\r
         PaError             setInputChannelCount(int count);\r
         int                 getInputChannelCount();\r
@@ -117,37 +92,26 @@ class PortAudioWrap
         const int           getOutputChannelCount();\r
         PaError             setOutputSampleFormat(PaSampleFormat format);\r
         PaError             setOutputLatency(PaTime latency);\r
-        PaError             streamStart();\r
-        PaError             streamClose();\r
         void                setOutputHostApiStreamInfo(void *info = NULL);\r
         PaTime              getOutputDefaultLowLatency();\r
-        void                averageData(float mag_dB[]);\r
 \r
-        void                setFdmdvState(FDMDV* fdmdv_state)                       {this->fdmdv_state = fdmdv_state;}
-//        void                setFramesPerBuffer(unsigned long framesPerBuffer)       {this->framesPerBuffer = framesPerBuffer;}
-        void                setInputBuffer(const PaStreamParameters& inputBuffer)   {this->inputBuffer = inputBuffer;}
-//        void                setAvMag(float av_mag)                                  {this->m_av_mag = av_mag;}
-        void                setOutputBuffer(const PaStreamParameters& outputBuffer) {this->outputBuffer = outputBuffer;}
-        void                setSamplerate(int samplerate)                           {this->samplerate = samplerate;}
-        void                setStatusFlags(const PaStreamCallbackFlags& statusFlags) {this->statusFlags = statusFlags;}
-        void                setStream(PaStream* stream)                             {this->stream = stream;}
-//        void                setStreamCallback(PaStreamCallback* streamCallback)     {this->streamCallback = streamCallback;}
-        void                setStreamFinishedCallback(PaStreamFinishedCallback* streamFinishedCallback) {this->streamFinishedCallback = streamFinishedCallback;}\r
-        void                setTimeInfo(PaStreamCallbackTimeInfo* timeInfo)         {this->timeInfo = timeInfo;}\r
-        void                setUserData(void* userData)                             {this->userData = userData;}\r
-        FDMDV*              getFdmdvState()                                         {return fdmdv_state;}\r
-        unsigned long       getFramesPerBuffer() const                              {return framesPerBuffer;}\r
-        const               PaStreamParameters& getInputBuffer() const              {return inputBuffer;}\r
-//        const float         *getAvMag(int idx) const                                 {return (float *)&m_av_mag[idx];}\r
-        const               PaStreamParameters& getOutputBuffer() const             {return outputBuffer;}\r
-        int                 getSamplerate() const                                   {return samplerate;}\r
-        const PaStreamCallbackFlags& getStatusFlags() const                         {return statusFlags;}\r
-        PaStream*           getStream()                                             {return stream;}\r
-//        PaStreamCallback*  getStreamCallback()                                       {return streamCallback;}\r
-//        PaStreamFinishedCallback* getStreamFinishedCallback()                       {return streamFinishedCallback;}\r
-//        PaStreamCallbackTimeInfo* getTimeInfo()                                     {return timeInfo;}\r
-        void                *getUserData()                                          {return userData;}\r
+        void                setFdmdvState(FDMDV* fdmdv_state)                       {this->m_pFDMDV_state = fdmdv_state;}
+        void                setOutputBuffer(const PaStreamParameters& outputBuffer) {this->m_outputBuffer = outputBuffer;}
+        void                setTimeInfo(PaStreamCallbackTimeInfo* timeInfo)         {this->m_pTimeInfo = timeInfo;}\r
+        void                setUserData(void* userData)                             {this->m_pUserData = userData;}\r
+        unsigned long       getFramesPerBuffer() const                              {return m_framesPerBuffer;}\r
+        const               PaStreamParameters& getInputBuffer() const              {return m_inputBuffer;}\r
+        const               PaStreamParameters& getOutputBuffer() const             {return m_outputBuffer;}\r
+        const               PaStreamCallbackFlags& getStatusFlags() const           {return m_statusFlags;}\r
 \r
+        FDMDV*              getFdmdvState()                                         {return m_pFDMDV_state;}\r
+        int                 getSamplerate() const                                   {return m_samplerate;}\r
+        PaStream*           getStream()                                             {return m_pStream;}\r
+        void                *getUserData()                                          {return m_pUserData;}\r
+        bool                getDataAvail()                                          {return m_newdata;}\r
+        PaError             streamStart();\r
+        PaError             streamClose();\r
+        PaError             streamOpen();\r
         void                terminate();\r
         void                stop();\r
         void                abort();\r

diff --git a/fdmdv2/src/fdmdv2_plot.cpp b/fdmdv2/src/fdmdv2_plot.cpp
index 1922d7a2dcef89c9322a2c43b77661d368a5a011..8f91f8281abb144e5c8677cbb9f302517f9a6226 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot.cpp
+++ b/fdmdv2/src/fdmdv2_plot.cpp
@@ -41,35 +41,31 @@ PlotPanel::PlotPanel(wxFrame* parent) : wxPanel(parent)
 {\r
     m_pNoteBook         = (wxAuiNotebook *) parent;\r
     m_pTopFrame         = (MainFrame *)m_pNoteBook->GetParent();\r
-    m_bmp               = new wxBitmap(MAX_BMP_X, MAX_BMP_Y, wxBITMAP_SCREEN_DEPTH);
-    wxNativePixelData m_pBmp(*m_bmp);\r
-    if ( !m_pBmp )\r
-    {\r
-        // ... raw access to bitmap data unavailable, do something else ...\r
-        return;\r
-    }\r
-\r
-    if ( m_pBmp.GetWidth() < 20 || m_pBmp.GetHeight() < 20 )\r
-    {\r
-        // ... complain: the bitmap it too small ...\r
-        return;\r
-    }\r
-\r
+//    m_bmp               = new wxBitmap(MAX_BMP_X, MAX_BMP_Y, wxBITMAP_SCREEN_DEPTH);
     m_zoomFactor        = 1.0;\r
+    m_newdata           = false;\r
     m_clip              = false;\r
     m_use_bitmap        = true;\r
-    m_newdata           = false;\r
     m_rubberBand        = false;\r
     m_mouseDown         = false;\r
     m_penShortDash      = wxPen(wxColor(0xA0, 0xA0, 0xA0), 1, wxPENSTYLE_SHORT_DASH);\r
     m_penDotDash        = wxPen(wxColor(0xD0, 0xD0, 0xD0), 1, wxPENSTYLE_DOT_DASH);\r
     m_penSolid          = wxPen(wxColor(0x00, 0x00, 0x00), 1, wxPENSTYLE_SOLID);\r
-//    m_gridLeftOffset    = 20;\r
-//    m_gridRightOffset   = 5;\r
-//    m_gridTopOffset     = 5;\r
-//    m_gridBottomOffset  = 10;\r
     SetBackgroundStyle(wxBG_STYLE_PAINT);\r
     SetLabelSize(10.0);\r
+/*\r
+    wxNativePixelData m_pBmp(*m_bmp);\r
+    if(!m_pBmp)\r
+    {\r
+        // ... raw access to bitmap data unavailable, do something else ...\r
+        return;\r
+    }\r
+    if(m_pBmp.GetWidth() < 20 || m_pBmp.GetHeight() < 20)\r
+    {\r
+        // ... complain: the bitmap it too small ...\r
+        return;\r
+    }\r
+*/\r
 }\r
 \r
 //-------------------------------------------------------------------------\r
@@ -120,8 +116,12 @@ void PlotPanel::OnErase(wxEraseEvent& event)
 //-------------------------------------------------------------------------\r
 void PlotPanel::OnSize(wxSizeEvent& event)\r
 {\r
+    m_rCtrlPrev = m_rCtrl;\r
+    m_rCtrl     = GetClientRect();\r
     if(m_use_bitmap)\r
     {\r
+        m_bmp = new wxBitmap(m_rCtrl.GetWidth(), m_rCtrl.GetHeight(), wxBITMAP_SCREEN_DEPTH);
+        m_firstPass = true;\r
         this->Refresh();\r
     }\r
 }\r
@@ -183,62 +183,65 @@ double PlotPanel::GetZoomFactor(double zf)
 //-------------------------------------------------------------------------\r
 // drawGraticule()\r
 //-------------------------------------------------------------------------\r
-void PlotPanel::drawGraticule(wxAutoBufferedPaintDC&  dc)\r
+void PlotPanel::drawGraticule(wxAutoBufferedPaintDC& pdc)\r
 {\r
     int p;\r
     char buf[15];\r
     wxString s;\r
 \r
     // Vertical gridlines\r
-    dc.SetPen(m_penShortDash);\r
-    for(p = (PLOT_BORDER + XLEFT_OFFSET + GRID_INCREMENT); p < ((m_w - XLEFT_OFFSET) + GRID_INCREMENT); p += GRID_INCREMENT)\r
+    pdc.SetPen(m_penShortDash);\r
+    for(p = (PLOT_BORDER + XLEFT_OFFSET + GRID_INCREMENT); p < ((m_rCtrl.GetWidth() - XLEFT_OFFSET) + GRID_INCREMENT); p += GRID_INCREMENT)\r
     {\r
-        dc.DrawLine(p, (m_h + PLOT_BORDER), p, PLOT_BORDER);\r
+        pdc.DrawLine(p, (m_rGrid.GetHeight() + PLOT_BORDER), p, PLOT_BORDER);\r
     }\r
     // Horizontal gridlines\r
-    dc.SetPen(m_penDotDash);\r
-    for(p = (m_h - GRID_INCREMENT); p > PLOT_BORDER; p -= GRID_INCREMENT)\r
+    pdc.SetPen(m_penDotDash);\r
+    for(p = (m_rGrid.GetHeight() - GRID_INCREMENT); p > PLOT_BORDER; p -= GRID_INCREMENT)\r
     {\r
-        dc.DrawLine(PLOT_BORDER + XLEFT_OFFSET, (p + PLOT_BORDER), (m_w + PLOT_BORDER + XLEFT_OFFSET), (p + PLOT_BORDER));\r
+        pdc.DrawLine(PLOT_BORDER + XLEFT_OFFSET, (p + PLOT_BORDER), (m_rCtrl.GetWidth() + PLOT_BORDER + XLEFT_OFFSET), (p + PLOT_BORDER));\r
     }\r
     // Label the X-Axis\r
-    dc.SetPen(wxPen(GREY_COLOR, 1));\r
-    for(p = GRID_INCREMENT; p < (m_w - YBOTTOM_OFFSET); p += GRID_INCREMENT)\r
+    pdc.SetPen(wxPen(GREY_COLOR, 1));\r
+    for(p = GRID_INCREMENT; p < (m_rCtrl.GetWidth() - YBOTTOM_OFFSET); p += GRID_INCREMENT)\r
     {\r
         sprintf(buf, "%1.1f Hz",(double)(p / 10));\r
-        dc.DrawText(buf, p - PLOT_BORDER + XLEFT_OFFSET, m_h + YBOTTOM_OFFSET/2);\r
+        pdc.DrawText(buf, p - PLOT_BORDER + XLEFT_OFFSET, m_rGrid.GetHeight() + YBOTTOM_OFFSET/2);\r
     }\r
     // Label the Y-Axis\r
     //for(p = GRID_INCREMENT; p < (h - YBOTTOM_OFFSET); p += GRID_INCREMENT)\r
-    for(p = (m_h - GRID_INCREMENT); p > PLOT_BORDER; p -= GRID_INCREMENT)\r
+    for(p = (m_rGrid.GetHeight() - GRID_INCREMENT); p > PLOT_BORDER; p -= GRID_INCREMENT)\r
     {\r
-        sprintf(buf, "%1.0f", (double)((m_h - p) * -10));\r
-        dc.DrawText(buf, XLEFT_TEXT_OFFSET, p);\r
+        sprintf(buf, "%1.0f", (double)((m_rGrid.GetHeight() - p) * -10));\r
+        pdc.DrawText(buf, XLEFT_TEXT_OFFSET, p);\r
     }\r
 }\r
 \r
 //-------------------------------------------------------------------------\r
 // draw()\r
 //-------------------------------------------------------------------------\r
-void PlotPanel::draw(wxAutoBufferedPaintDC&  dc)\r
+void PlotPanel::draw(wxAutoBufferedPaintDC& pdc)\r
 {\r
-    m_rectCtrl  = GetClientRect();\r
-    m_rectGrid  = m_rectCtrl;\r
+//    wxAutoBufferedPaintDC dc(this);\r
+//    wxMemoryDC memdc(&m_bmp);\r
+\r
+    m_rCtrl  = GetClientRect();\r
+    m_rGrid  = m_rCtrl;\r
 \r
-    m_rectGrid.Deflate(PLOT_BORDER + (XLEFT_OFFSET/2), (PLOT_BORDER + (YBOTTOM_OFFSET/2)));\r
-    m_rectGrid.Offset(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER);\r
+    m_rCtrl.Deflate(PLOT_BORDER + (XLEFT_OFFSET/2), (PLOT_BORDER + (YBOTTOM_OFFSET/2)));\r
+    m_rCtrl.Offset(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER);\r
 \r
-    m_h = m_rectGrid.GetHeight();\r
-    m_w = m_rectGrid.GetWidth();\r
+    //m_h = m_rCtrl.GetHeight();\r
+    //m_w = m_rCtrl.GetWidth();\r
 \r
-    dc.Clear();\r
+    pdc.Clear();\r
 \r
     // Draw a filled rectangle with aborder\r
     wxBrush ltBlueBrush = wxBrush(LIGHT_BLUE_COLOR);\r
-    dc.SetBrush(ltBlueBrush);\r
-    dc.SetPen(wxPen(BLACK_COLOR, 1));\r
-    dc.DrawRectangle(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER, m_w, m_h);\r
-    drawGraticule(dc);\r
+    pdc.SetBrush(ltBlueBrush);\r
+    pdc.SetPen(wxPen(BLACK_COLOR, 1));\r
+    pdc.DrawRectangle(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER, m_rCtrl.GetWidth(), m_rCtrl.GetHeight());\r
+    drawGraticule(pdc);\r
 }\r
 \r
 //-------------------------------------------------------------------------\r
@@ -250,7 +253,7 @@ void PlotPanel::draw(wxAutoBufferedPaintDC&  dc)
 //-------------------------------------------------------------------------\r
 void PlotPanel::OnPaint(wxPaintEvent & evt)\r
 {\r
-    wxAutoBufferedPaintDC dc(this);\r
-    draw(dc);\r
+    wxAutoBufferedPaintDC pdc(this);\r
+    draw(pdc);\r
 }\r
 \r

diff --git a/fdmdv2/src/fdmdv2_plot.h b/fdmdv2/src/fdmdv2_plot.h
index bbdc1b235934bb3894cba14a24e2b660f555053a..f1e655c328aa19a78f0a8ea3390e2e5667bf6b30 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot.h
+++ b/fdmdv2/src/fdmdv2_plot.h
@@ -16,9 +16,9 @@
 #include <wx/image.h>\r
 #include <wx/dcbuffer.h>\r
 \r
-#define MAX_ZOOM    7\r
-#define MAX_BMP_X   (400 * MAX_ZOOM)\r
-#define MAX_BMP_Y   (400 * MAX_ZOOM)\r
+#define MAX_ZOOM            7\r
+#define MAX_BMP_X           (400 * MAX_ZOOM)\r
+#define MAX_BMP_Y           (400 * MAX_ZOOM)\r
 \r
 #define wxUSE_FILEDLG       1\r
 #define wxUSE_LIBPNG        1\r
@@ -32,8 +32,14 @@
 #define XLEFT_TEXT_OFFSET   8\r
 #define YBOTTOM_OFFSET      25\r
 #define GRID_INCREMENT      50\r
-#define GREY_COLOR          wxColor(0x80, 0x80, 0x80)\r
+\r
 #define BLACK_COLOR         wxColor(0x00, 0x00, 0x00)\r
+#define GREY_COLOR          wxColor(0x80, 0x80, 0x80)\r
+#define DARK_GREY_COLOR     wxColor(0x60, 0x60, 0x60)\r
+#define MEDIUM_GREY_COLOR   wxColor(0xC0, 0xC0, 0xC0)\r
+#define LIGHT_GREY_COLOR    wxColor(0xE0, 0xE0, 0xE0)\r
+#define VERY_LTGREY_COLOR   wxColor(0xF8, 0xF8, 0xF8)\r
+#define WHITE_COLOR         wxColor(0xFF, 0xFF, 0xFF)\r
 \r
 #define BLUE_COLOR          wxColor(0x00, 0x00, 0xFF)\r
 #define LIGHT_BLUE_COLOR    wxColor(0x80, 0x80, 0xFF)\r
@@ -52,6 +58,7 @@
 #define LIGHT_YELLOW_COLOR  wxColor(0xFF, 0xFF, 0xB5)\r
 #define DARK_YELLOW_COLOR   wxColor(0xFF, 0xFF, 0x08)\r
 \r
+\r
 /*\r
     wxNullBrush\r
     wxBLACK_BRUSH\r
@@ -87,9 +94,10 @@ class PlotPanel : public wxPanel
         wxPen               m_penShortDash;\r
         wxPen               m_penDotDash;\r
         wxPen               m_penSolid;\r
-        wxRect              m_rectCtrl;\r
-        wxRect              m_rectGrid;\r
-        wxRect              m_rectPlot;\r
+        wxRect              m_rCtrlPrev;\r
+        wxRect              m_rCtrl;\r
+        wxRect              m_rGrid;\r
+        wxRect              m_rPlot;\r
         MainFrame           *m_pTopFrame;\r
         wxAuiNotebook       *m_pNoteBook;\r
         double              m_label_size;\r
@@ -110,8 +118,8 @@ class PlotPanel : public wxPanel
         //void OnUpdateUI( wxUpdateUIEvent& event ){ event.Skip(); }\r
 
         void            paintEvent(wxPaintEvent & evt);\r
-        virtual void    draw(wxAutoBufferedPaintDC& dc);\r
-        virtual void    drawGraticule(wxAutoBufferedPaintDC& dc);\r
+        virtual void    draw(wxAutoBufferedPaintDC&  pdc);\r
+        virtual void    drawGraticule(wxAutoBufferedPaintDC&  pdc);\r
         virtual double  SetZoomFactor(double zf);\r
         virtual double  GetZoomFactor(double zf);\r
         virtual void    OnShow(wxShowEvent& event);\r
@@ -119,25 +127,22 @@ class PlotPanel : public wxPanel
         virtual void    SetLabelSize(double size);\r
 
     protected:\r
-        int         m_x;
-        int         m_y;
-        int         m_w;
-        int         m_h;\r
-        int         m_left;\r
-        int         m_top;
-        int         m_prev_w;
-        int         m_prev_h;
-        int         m_prev_x;
-        int         m_prev_y;
-        bool        m_use_bitmap;\r
-        bool        m_clip;\r
-        bool        m_rubberBand;\r
-        bool        m_mouseDown;\r
-        double      m_zoomFactor;\r
-//        int             m_gridLeftOffset;\r
-//        int             m_gridRightOffset;\r
-//        int             m_gridTopOffset;\r
-//        int             m_gridBottomOffset;\r
+        int             m_x;
+        int             m_y;
+//        int             m_w;
+//        int             m_h;\r
+        int             m_left;\r
+        int             m_top;
+        int             m_prev_w;
+        int             m_prev_h;
+        int             m_prev_x;
+        int             m_prev_y;
+        bool            m_use_bitmap;\r
+        bool            m_clip;\r
+        bool            m_rubberBand;\r
+        bool            m_mouseDown;\r
+        bool            m_firstPass;\r
+        double          m_zoomFactor;\r
     DECLARE_EVENT_TABLE()\r
 };\r
 #endif //__FDMDV2_PLOT__\r

diff --git a/fdmdv2/src/fdmdv2_plot_scalar.cpp b/fdmdv2/src/fdmdv2_plot_scalar.cpp
index 4b7e32d2fa2a07fdcc6d48be226abc663cd4e65f..c026a7873e4414f84e064a8ac95bfedad943c88d 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot_scalar.cpp
+++ b/fdmdv2/src/fdmdv2_plot_scalar.cpp
@@ -39,9 +39,8 @@ BEGIN_EVENT_TABLE(PlotScalar, PlotPanel)
 END_EVENT_TABLE()\r
 \r
 //----------------------------------------------------------------\r
-//\r
+// PlotScalar()\r
 //----------------------------------------------------------------\r
-//PlotScalar::PlotScalar(wxFrame* parent, int x, int y, int w, int h, int x_max_, int y_max_, const char name[]): PlotPanel(parent)\r
 PlotScalar::PlotScalar(wxFrame* parent, int x_max_, int y_max_): PlotPanel(parent)\r
 {
     int i;\r
@@ -65,7 +64,7 @@ PlotScalar::PlotScalar(wxFrame* parent, int x_max_, int y_max_): PlotPanel(paren
 }\r
 \r
 //----------------------------------------------------------------\r
-//\r
+// ~PlotScalar()\r
 //----------------------------------------------------------------\r
 PlotScalar::~PlotScalar()\r
 {\r
@@ -73,7 +72,7 @@ PlotScalar::~PlotScalar()
 }\r
 \r
 //----------------------------------------------------------------\r
-//\r
+// add_new_sample()\r
 //----------------------------------------------------------------\r
 void PlotScalar::add_new_sample(float sample)\r
 {\r
@@ -81,23 +80,23 @@ void PlotScalar::add_new_sample(float sample)
 }\r
 \r
 //----------------------------------------------------------------\r
-//\r
+// clip()\r
 //----------------------------------------------------------------\r
 int PlotScalar::clip(int y1)\r
 {\r
-    if(y1 > (m_h/2 - 10))
+    if(y1 > (m_rCtrl.GetHeight()/2 - 10))
     {\r
-        y1 = m_h/2 - 10;\r
+        y1 = m_rCtrl.GetHeight()/2 - 10;\r
     }\r
-    if(y1 < -(m_h/2 - 10))\r
+    if(y1 < -(m_rCtrl.GetHeight()/2 - 10))\r
     {
-        y1 = -(m_h/2 - 10);
+        y1 = -(m_rCtrl.GetHeight()/2 - 10);
     }\r
     return y1;\r
 }\r
 \r
 //----------------------------------------------------------------\r
-//\r
+// draw()\r
 //----------------------------------------------------------------\r
 void PlotScalar::draw(wxAutoBufferedPaintDC&  dc)\r
 {\r
@@ -112,26 +111,26 @@ void PlotScalar::draw(wxAutoBufferedPaintDC&  dc)
     wxPen pen;\r
 \r
     /* detect resizing of window */\r
-    if((m_h != m_prev_h) || (m_w != m_prev_w) || (m_x != m_prev_x) || (m_y != m_prev_y))\r
+    if((m_rCtrl.GetHeight() != m_prev_h) || (m_rCtrl.GetWidth() != m_prev_w) || (m_x != m_prev_x) || (m_y != m_prev_y))\r
     {\r
         dc.SetPen(BLACK_COLOR);\r
-        dc.DrawRectangle(m_x, m_y, m_w, m_h);\r
-        m_prev_h = m_h;\r
-        m_prev_w = m_w;\r
+        dc.DrawRectangle(m_x, m_y, m_rCtrl.GetWidth(), m_rCtrl.GetHeight());\r
+        m_prev_h = m_rCtrl.GetHeight();\r
+        m_prev_w = m_rCtrl.GetWidth();\r
         m_prev_x = m_x;\r
         m_prev_y = m_y;\r
     }\r
 \r
     //fl_push_clip(m_x, m_y, m_w, m_h);\r
     x_scale = (float)m_x_max;\r
-    y_scale = (float)m_h /(2.0 * m_y_max);\r
+    y_scale = (float)m_rCtrl.GetHeight() /(2.0 * m_y_max);\r
 \r
     // erase last sample\r
     dc.SetPen(BLACK_COLOR);\r
     x1 = x_scale * m_index + m_x;\r
     y1 = y_scale * m_mem[m_index];\r
     y1 = clip(y1);\r
-    y1 = m_y + m_h/2 - y1;\r
+    y1 = m_y + m_rCtrl.GetHeight()/2 - y1;\r
     dc.DrawPoint(x1, y1);
 \r
     // draw new sample\r
@@ -139,7 +138,7 @@ void PlotScalar::draw(wxAutoBufferedPaintDC&  dc)
     x1 = x_scale * m_index + m_x;\r
     y1 = y_scale * m_new_sample;\r
     y1 = clip(y1);\r
-    y1 = m_y + m_h/2 - y1;\r
+    y1 = m_y + m_rCtrl.GetHeight()/2 - y1;\r
     dc.DrawPoint(x1, y1);
     m_mem[m_index] = m_new_sample;\r
     m_index++;\r
@@ -165,8 +164,8 @@ void PlotScalar::draw(wxAutoBufferedPaintDC&  dc)
     for(i =- m_y_max; i < m_y_max; i += m_step)\r
     {\r
         x1 = m_x;\r
-        y1 = m_y + m_h/2 - i * y_scale;\r
-        x2 = m_x + m_w;\r
+        y1 = m_y + m_rCtrl.GetHeight()/2 - i * y_scale;\r
+        x2 = m_x + m_rCtrl.GetWidth();\r
         y2 = y1;\r
         dc.DrawLine(x1, y1, x2, y2);
     }\r
@@ -179,7 +178,7 @@ void PlotScalar::draw(wxAutoBufferedPaintDC&  dc)
     for(i =- m_y_max; i < m_y_max; i += m_step)\r
     {\r
         x1 = m_x;\r
-        y1 = m_y + m_h/2 - i * y_scale;\r
+        y1 = m_y + m_rCtrl.GetHeight()/2 - i * y_scale;\r
         sprintf(label, "%d", i);\r
         wxSize sz = dc.GetTextExtent(label);\r
         dc.DrawLabel(label,  wxRect(x1, y1, sz.GetWidth(), sz.GetHeight()), wxALIGN_LEFT);\r

diff --git a/fdmdv2/src/fdmdv2_plot_scatter.cpp b/fdmdv2/src/fdmdv2_plot_scatter.cpp
index f8fbebc8efef5f518723bce1f1b1a33225ff2a0c..8d487e4b763731cc25d6deae05ed274538aad59f 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot_scatter.cpp
+++ b/fdmdv2/src/fdmdv2_plot_scatter.cpp
@@ -73,28 +73,28 @@ void PlotScatter::draw(wxAutoBufferedPaintDC&  dc)
     //Fl_Box::draw();
 
     /* detect resizing of window */
-    if((m_h != m_prev_h) || (m_w != m_prev_w) || (m_x != m_prev_x) || (m_y != m_prev_y))
+    if((m_rCtrl.GetHeight() != m_prev_h) || (m_rCtrl.GetWidth() != m_prev_w) || (m_x != m_prev_x) || (m_y != m_prev_y))
     {
         //fl_color(FL_BLACK);
         //fl_rectf(x(),y(),w(),h());
-        m_prev_h = m_h;
-        m_prev_w = m_w;
+        m_prev_h = m_rCtrl.GetHeight();
+        m_prev_w = m_rCtrl.GetWidth();
         m_prev_x = m_x;
         m_prev_y = m_y;
     }
 
     //fl_push_clip(x(),y(),w(),h());
 
-    x_scale = m_w/SCATTER_X_MAX;
-    y_scale = m_h/SCATTER_Y_MAX;
+    x_scale = m_rCtrl.GetWidth()/SCATTER_X_MAX;
+    y_scale = m_rCtrl.GetHeight()/SCATTER_Y_MAX;
 
     // erase last samples
     //fl_color(FL_BLACK);
 
     for(i=0; i<FDMDV_NSYM; i++)
     {
-        x1 = x_scale * m_mem[i].real + m_x + m_w/2;
-        y1 = y_scale * m_mem[i].imag + m_y + m_h/2;\r
+        x1 = x_scale * m_mem[i].real + m_x + m_rCtrl.GetWidth()/2;
+        y1 = y_scale * m_mem[i].imag + m_y + m_rCtrl.GetHeight()/2;\r
         dc.DrawPoint(x1, y1);
         //fl_point(x1, y1);
         m_mem[i] = m_mem[i+FDMDV_NSYM];
@@ -110,8 +110,8 @@ void PlotScatter::draw(wxAutoBufferedPaintDC&  dc)
     //fl_color(FL_GREEN);
     for(i = SCATTER_MEM-FDMDV_NSYM, j = 0; i < SCATTER_MEM; i++,j++)
     {
-        x1 = x_scale * m_new_samples[j].real + m_x + m_w/2;
-        y1 = y_scale * m_new_samples[j].imag + m_y + m_h/2;
+        x1 = x_scale * m_new_samples[j].real + m_x + m_rCtrl.GetWidth()/2;
+        y1 = y_scale * m_new_samples[j].imag + m_y + m_rCtrl.GetHeight()/2;
         //fl_point(x1, y1);
         m_mem[i] = m_new_samples[j];
     }

diff --git a/fdmdv2/src/fdmdv2_plot_spectrum.cpp b/fdmdv2/src/fdmdv2_plot_spectrum.cpp
index 5931a96ce0a8ce2510e0133313947d31401d29f5..4c643713be3dde41a953adb20bd73c40fde37067 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot_spectrum.cpp
+++ b/fdmdv2/src/fdmdv2_plot_spectrum.cpp
@@ -61,28 +61,28 @@ void PlotSpectrum::drawGraticule(wxAutoBufferedPaintDC&  dc)
 \r
     // Vertical gridlines\r
     dc.SetPen(m_penShortDash);\r
-    for(p = (PLOT_BORDER + XLEFT_OFFSET + GRID_INCREMENT); p < ((m_w - XLEFT_OFFSET) + GRID_INCREMENT); p += GRID_INCREMENT)\r
+    for(p = (PLOT_BORDER + XLEFT_OFFSET + GRID_INCREMENT); p < ((m_rCtrl.GetWidth() - XLEFT_OFFSET) + GRID_INCREMENT); p += GRID_INCREMENT)\r
     {\r
-        dc.DrawLine(p, (m_h + PLOT_BORDER), p, PLOT_BORDER);\r
+        dc.DrawLine(p, (m_rCtrl.GetHeight() + PLOT_BORDER), p, PLOT_BORDER);\r
     }\r
 \r
-    int y_zero = (m_h - m_top) / 2 ;\r
+    int y_zero = (m_rCtrl.GetHeight() - m_top) / 2 ;\r
     dc.SetPen(m_penSolid);\r
-    dc.DrawLine(PLOT_BORDER + XLEFT_OFFSET, y_zero, (m_w + PLOT_BORDER + XLEFT_OFFSET), y_zero);\r
+    dc.DrawLine(PLOT_BORDER + XLEFT_OFFSET, y_zero, (m_rCtrl.GetWidth() + PLOT_BORDER + XLEFT_OFFSET), y_zero);\r
     sprintf(buf, "%6.0f", 0.0);\r
     dc.DrawText(buf, XLEFT_TEXT_OFFSET, y_zero + TEXT_BASELINE_OFFSET_Y);\r
 \r
     // Horizontal gridlines\r
     dc.SetPen(m_penDotDash);\r
-    for(p = 0; (y_zero + p) < m_h ; p += GRID_INCREMENT)\r
+    for(p = 0; (y_zero + p) < m_rCtrl.GetHeight() ; p += GRID_INCREMENT)\r
     {\r
         if(p > 0)\r
         {\r
-            dc.DrawLine(PLOT_BORDER + XLEFT_OFFSET, (y_zero + p), (m_w + PLOT_BORDER + XLEFT_OFFSET), (y_zero + p));\r
+            dc.DrawLine(PLOT_BORDER + XLEFT_OFFSET, (y_zero + p), (m_rCtrl.GetWidth() + PLOT_BORDER + XLEFT_OFFSET), (y_zero + p));\r
             sprintf(buf, "%6.0f", (double)(p) * -10);\r
             dc.DrawText(buf, XLEFT_TEXT_OFFSET, (y_zero + p + TEXT_BASELINE_OFFSET_Y));\r
 \r
-            dc.DrawLine(PLOT_BORDER + XLEFT_OFFSET, (y_zero - p), (m_w + PLOT_BORDER + XLEFT_OFFSET), (y_zero - p));\r
+            dc.DrawLine(PLOT_BORDER + XLEFT_OFFSET, (y_zero - p), (m_rCtrl.GetWidth() + PLOT_BORDER + XLEFT_OFFSET), (y_zero - p));\r
             sprintf(buf, "%6.0f", (double)(p) * 10);\r
             dc.DrawText(buf, XLEFT_TEXT_OFFSET, (y_zero - p + TEXT_BASELINE_OFFSET_Y));\r
         }\r
@@ -90,10 +90,10 @@ void PlotSpectrum::drawGraticule(wxAutoBufferedPaintDC&  dc)
 \r
     // Label the X-Axis\r
     dc.SetPen(wxPen(GREY_COLOR, 1));\r
-    for(p = GRID_INCREMENT; p < (m_w - YBOTTOM_OFFSET); p += GRID_INCREMENT)\r
+    for(p = GRID_INCREMENT; p < (m_rCtrl.GetWidth() - YBOTTOM_OFFSET); p += GRID_INCREMENT)\r
     {\r
         sprintf(buf, "%1.1f Hz",(double)(p / 10));\r
-        dc.DrawText(buf, p - PLOT_BORDER + XLEFT_OFFSET, m_h + YBOTTOM_OFFSET/2);\r
+        dc.DrawText(buf, p - PLOT_BORDER + XLEFT_OFFSET, m_rCtrl.GetHeight() + YBOTTOM_OFFSET/2);\r
     }\r
 }\r
 \r
@@ -114,17 +114,17 @@ void PlotSpectrum::draw(wxAutoBufferedPaintDC&  dc)
     char  label[20];
     float px_per_hz;\r
 */\r
-    m_rectCtrl  = GetClientRect();\r
-    m_rectGrid  = m_rectCtrl;\r
+    m_rCtrl  = GetClientRect();\r
+    m_rGrid  = m_rCtrl;\r
 \r
-    m_rectGrid.Deflate(PLOT_BORDER + (XLEFT_OFFSET/2), (PLOT_BORDER + (YBOTTOM_OFFSET/2)));\r
-    m_rectGrid.Offset(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER);\r
+    m_rGrid.Deflate(PLOT_BORDER + (XLEFT_OFFSET/2), (PLOT_BORDER + (YBOTTOM_OFFSET/2)));\r
+    m_rGrid.Offset(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER);\r
 \r
-//    m_rectGrid.Deflate(PLOT_BORDER, (PLOT_BORDER + (YBOTTOM_OFFSET/2)));\r
-//    m_rectGrid.Offset(PLOT_BORDER, PLOT_BORDER);\r
+//    m_rGrid.Deflate(PLOT_BORDER, (PLOT_BORDER + (YBOTTOM_OFFSET/2)));\r
+//    m_rGrid.Offset(PLOT_BORDER, PLOT_BORDER);\r
 \r
-    m_h = m_rectGrid.GetHeight();\r
-    m_w = m_rectGrid.GetWidth();\r
+//    m_h = m_rGrid.GetHeight();\r
+//    m_w = m_rGrid.GetWidth();\r
 \r
     dc.Clear();\r
 \r
@@ -135,7 +135,7 @@ void PlotSpectrum::draw(wxAutoBufferedPaintDC&  dc)
 //    dc.SetPen(wxPen(BLACK_COLOR, 1));\r
     m_top = PLOT_BORDER;\r
     m_left = PLOT_BORDER + XLEFT_OFFSET;\r
-    dc.DrawRectangle(m_left, m_top, m_w, m_h);\r
+    dc.DrawRectangle(m_left, m_top, m_rCtrl.GetWidth(), m_rCtrl.GetHeight());\r
 \r
     drawGraticule(dc);\r
 /*
@@ -216,8 +216,11 @@ void PlotSpectrum::OnPaint(wxPaintEvent& event)
 //----------------------------------------------------------------\r
 void PlotSpectrum::OnSize(wxSizeEvent& event)\r
 {\r
+    m_rCtrlPrev = m_rCtrl;\r
+    m_rCtrl     = GetClientRect();\r
     if(m_use_bitmap)\r
     {\r
+        m_bmp = new wxBitmap(m_rCtrl.GetWidth(), m_rCtrl.GetHeight(), wxBITMAP_SCREEN_DEPTH);
         this->Refresh();\r
     }\r
 }\r

diff --git a/fdmdv2/src/fdmdv2_plot_waterfall.cpp b/fdmdv2/src/fdmdv2_plot_waterfall.cpp
index adb4412b7e4f4c2d07b4e6d8b871ee118b63b183..508d7493a4e956827939193cfd67ad394dd9100b 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot_waterfall.cpp
+++ b/fdmdv2/src/fdmdv2_plot_waterfall.cpp
@@ -27,8 +27,6 @@
 #include "fdmdv2_main.h"\r
 #include "fdmdv2_plot_waterfall.h"
 \r
-//extern float *av_mag;\r
-\r
 /*\r
 \r
   Notes:\r
@@ -61,28 +59,26 @@ END_EVENT_TABLE()
 // @brief\r
 //\r
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
-PlotWaterfall::PlotWaterfall(wxFrame* parent): PlotPanel(parent)\r
-{
-    int   i;
-\r
-//    m_bmp = new wxBitmap(MAX_BMP_X, MAX_BMP_Y, wxBITMAP_SCREEN_DEPTH);
-    for(i = 0; i < 255; i++)
+PlotWaterfall::PlotWaterfall(wxFrame* parent): PlotPanel(parent)
+{\r
+    for(int i = 0; i < 255; i++)
     {
         m_heatmap_lut[i] = heatmap((float)i, 0.0, 255.0);
     }
-    m_greyscale = 0;
+    m_greyscale     = 0;\r
+    m_Bufsz         = GetMaxClientSize();\r
+    m_newdata       = false;\r
+    m_firstPass     = true;\r
+    m_line_color    = 0;\r
     SetLabelSize(10.0);\r
-    m_Bufsz = GetMaxClientSize();\r
-//    m_newdata = true;\r
-    m_newdata = false;\r
-};
+}
 
 //----------------------------------------------------------------\r
 // ~PlotWaterfall()\r
 //----------------------------------------------------------------\r
 PlotWaterfall::~PlotWaterfall()
-{
-}
+{\r
+}\r
 \r
 /*\r
 //----------------------------------------------------------------\r
@@ -166,155 +162,141 @@ unsigned PlotWaterfall::heatmap(float val, float min, float max)
     //printf("%f %x %x %x\n", val, r, g, b);
     return  (b << 16) + (g << 8) + r;
 }
+\r
+#define DATA_LINE_WIDTH  25\r
 
+//----------------------------------------------------------------\r
+// draw()\r
+//----------------------------------------------------------------\r
+void PlotWaterfall::draw(wxAutoBufferedPaintDC& pDC)
+{\r
+    bool rc;\r
+    wxMemoryDC m_mDC;\r
+    m_mDC.SelectObject(*m_bmp);\r
+//   m_mDC.SetMapMode(pDC.GetMapMode());\r
+    m_rCtrl  = GetClientRect();\r
+    m_rGrid  = m_rCtrl;\r
+\r
+    m_rGrid = m_rGrid.Deflate(PLOT_BORDER + (XLEFT_OFFSET/2), (PLOT_BORDER + (YBOTTOM_OFFSET/2)));\r
+    m_rGrid.Offset(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER);\r
+\r
+    pDC.Clear();\r
+    m_rPlot = wxRect(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER, m_rGrid.GetWidth(), m_rGrid.GetHeight());\r
+//    m_rPlot =  m_rPlot.Deflate(1, 1);\r
+    if(m_firstPass)\r
+    {\r
+        m_firstPass = false;\r
+        m_mDC.FloodFill(0, 0, VERY_LTGREY_COLOR);\r
+//        m_rPlot.Offset(1, 1);\r
+\r
+        // Draw a filled rectangle with aborder\r
+        wxBrush ltGraphBkgBrush = wxBrush(LIGHT_RED_COLOR);\r
+        m_mDC.SetBrush(ltGraphBkgBrush);\r
+        m_mDC.SetPen(wxPen(BLACK_COLOR, 0));\r
+        m_mDC.DrawRectangle(m_rPlot);\r
+    }\r
+    if(m_newdata)\r
+    {\r
+        m_newdata = false;\r
+//        m_rPlot =  m_rPlot.Deflate(2, 2);\r
+//        m_rPlot.Offset(1, 1);\r
+\r
+//        plotPixelData(dc);\r
+#ifdef USE_TIMER\r
+        int t = m_rPlot.GetTop();\r
+        int l = m_rPlot.GetLeft();\r
+        int b = m_rPlot.GetBottom();\r
+        int r = m_rPlot.GetRight();\r
+        int h = m_rPlot.GetHeight();\r
+        int w = m_rPlot.GetWidth();\r
+\r
+        wxDateTime dt;\r
+        char buf[15];\r
+        sprintf(buf, "%9X", (unsigned int)dt.GetTimeNow());\r
+        wxPen pen;\r
+        pen.SetCap(wxCAP_BUTT);\r
+        pen.SetStyle(wxPENSTYLE_SOLID);\r
+        pen.SetWidth(1);\r
+        pen.SetColour(BLACK_COLOR);\r
+        m_mDC.SetPen(pen);\r
+        m_mDC.DrawText(buf, l + 100, h - 38);\r
+//        bool rc = pDC.StretchBlit(l, t + DATA_LINE_WIDTH, r, b , &m_mDC, l, t, r, b - DATA_LINE_WIDTH);\r
+//        bool rc = pDC.StretchBlit(l, t, w, h - DATA_LINE_WIDTH, &m_mDC, l, t + DATA_LINE_WIDTH, w, h - DATA_LINE_WIDTH);\r
+//        bool rc = pDC.StretchBlit(l, t, w, h, &m_mDC, l, t, w, h);\r
+        int t2 = t + 1;\r
+        int w2 = w - 1;\r
+        rc = m_mDC.StretchBlit(l, t2, w2, h - (DATA_LINE_WIDTH), &m_mDC, l, t2 + DATA_LINE_WIDTH, w2, h - DATA_LINE_WIDTH);\r
+        switch(m_line_color)\r
+        {\r
+            case 0:\r
+                pen.SetColour(RED_COLOR);\r
+                m_line_color = 1;\r
+                break;\r
+\r
+            case 1:\r
+                pen.SetColour(YELLOW_COLOR);\r
+                m_line_color = 2;\r
+                break;\r
+\r
+            case 2:\r
+                pen.SetColour(BLUE_COLOR);\r
+                m_line_color = 0;\r
+                break;\r
+        }\r
+        pen.SetWidth(DATA_LINE_WIDTH);\r
+        m_mDC.SetPen(pen);\r
+        m_mDC.DrawLine(l + 1, h - (DATA_LINE_WIDTH/2) + 1, r, h - (DATA_LINE_WIDTH/2) + 1);\r
+        rc = pDC.Blit(l, t, w, h, &m_mDC, l, t);\r
+#endif\r
+    }\r
+    drawGraticule(pDC);\r
+    m_mDC.SetBrush(wxNullBrush);\r
+    m_mDC.SelectObject(wxNullBitmap);\r
+}\r
+\r
 //-------------------------------------------------------------------------\r
 // drawGraticule()\r
 //-------------------------------------------------------------------------\r
-void PlotWaterfall::drawGraticule(wxAutoBufferedPaintDC&  dc)\r
+void PlotWaterfall::drawGraticule(wxAutoBufferedPaintDC&  pDC)\r
 {\r
     int p;\r
     char buf[15];\r
     wxString s;\r
 \r
+    //wxBrush ltGraphBkgBrush = wxBrush(LIGHT_RED_COLOR);\r
+    wxBrush ltGraphBkgBrush;\r
+    ltGraphBkgBrush.SetStyle(wxBRUSHSTYLE_TRANSPARENT);\r
+    pDC.SetBrush(ltGraphBkgBrush);\r
+    pDC.SetPen(wxPen(BLACK_COLOR, 1));\r
+//    pDC.DrawRectangle(m_rPlot);\r
+\r
     // Vertical gridlines\r
-    dc.SetPen(m_penShortDash);\r
-    for(p = (PLOT_BORDER + XLEFT_OFFSET + GRID_INCREMENT); p < ((m_w - XLEFT_OFFSET) + GRID_INCREMENT); p += GRID_INCREMENT)\r
+    pDC.SetPen(m_penShortDash);\r
+    for(p = (PLOT_BORDER + XLEFT_OFFSET + GRID_INCREMENT); p < ((m_rGrid.GetWidth() - XLEFT_OFFSET) + GRID_INCREMENT); p += GRID_INCREMENT)\r
     {\r
-        dc.DrawLine(p, (m_h + PLOT_BORDER), p, PLOT_BORDER);\r
+        pDC.DrawLine(p, (m_rGrid.GetHeight() + PLOT_BORDER), p, PLOT_BORDER);\r
     }\r
     // Horizontal gridlines\r
-    dc.SetPen(m_penDotDash);\r
-    for(p = (m_h - GRID_INCREMENT); p > PLOT_BORDER; p -= GRID_INCREMENT)\r
+    pDC.SetPen(m_penDotDash);\r
+    for(p = (m_rGrid.GetHeight() - GRID_INCREMENT); p > PLOT_BORDER; p -= GRID_INCREMENT)\r
     {\r
-        dc.DrawLine(PLOT_BORDER + XLEFT_OFFSET, (p + PLOT_BORDER), (m_w + PLOT_BORDER + XLEFT_OFFSET), (p + PLOT_BORDER));\r
+        pDC.DrawLine(PLOT_BORDER + XLEFT_OFFSET, (p + PLOT_BORDER), (m_rGrid.GetWidth() + PLOT_BORDER + XLEFT_OFFSET), (p + PLOT_BORDER));\r
     }\r
     // Label the X-Axis\r
-    dc.SetPen(wxPen(GREY_COLOR, 1));\r
-    for(p = GRID_INCREMENT; p < (m_w - YBOTTOM_OFFSET); p += GRID_INCREMENT)\r
+    pDC.SetPen(wxPen(GREY_COLOR, 1));\r
+    for(p = GRID_INCREMENT; p < (m_rGrid.GetWidth() - YBOTTOM_OFFSET); p += GRID_INCREMENT)\r
     {\r
         sprintf(buf, "%1.1f Hz",(double)(p / 10));\r
-        dc.DrawText(buf, p - PLOT_BORDER + XLEFT_OFFSET, m_h + YBOTTOM_OFFSET/2);\r
+        pDC.DrawText(buf, p - PLOT_BORDER + XLEFT_OFFSET, m_rGrid.GetHeight() + YBOTTOM_OFFSET/2);\r
     }\r
     // Label the Y-Axis\r
-    for(p = (m_h - GRID_INCREMENT); p > PLOT_BORDER; p -= GRID_INCREMENT)\r
+    for(p = (m_rGrid.GetHeight() - GRID_INCREMENT); p > PLOT_BORDER; p -= GRID_INCREMENT)\r
     {\r
-        sprintf(buf, "%1.0f", (double)((m_h - p) * -10));\r
-        dc.DrawText(buf, XLEFT_TEXT_OFFSET, p);\r
+        sprintf(buf, "%1.0f", (double)((m_rGrid.GetHeight() - p) * -10));\r
+        pDC.DrawText(buf, XLEFT_TEXT_OFFSET, p);\r
     }\r
 }\r
 \r
-//----------------------------------------------------------------\r
-// draw()\r
-//----------------------------------------------------------------\r
-void PlotWaterfall::draw(wxAutoBufferedPaintDC&  dc)
-{
-    m_rectCtrl  = GetClientRect();\r
-    m_rectGrid  = m_rectCtrl;\r
-\r
-    m_rectGrid.Deflate(PLOT_BORDER + (XLEFT_OFFSET/2), (PLOT_BORDER + (YBOTTOM_OFFSET/2)));\r
-    m_rectGrid.Offset(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER);\r
-\r
-    m_h = m_rectGrid.GetHeight();\r
-    m_w = m_rectGrid.GetWidth();\r
-\r
-    dc.Clear();\r
-\r
-    // Draw a filled rectangle with aborder\r
-    wxBrush ltBlueBrush = wxBrush(LIGHT_RED_COLOR);\r
-    dc.SetBrush(ltBlueBrush);\r
-    dc.SetPen(wxPen(BLACK_COLOR, 1));\r
-    dc.DrawRectangle(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER, m_w, m_h);\r
-\r
-    drawGraticule(dc);\r
-    //plotData(dc);\r
-    if(m_newdata)\r
-    {\r
-        m_newdata = false;\r
-        plotPixelData(dc);\r
-    }\r
-}\r
-\r
-//----------------------------------------------------------------\r
-// plotData()\r
-//----------------------------------------------------------------\r
-void PlotWaterfall::plotData(wxAutoBufferedPaintDC&  dc)
-{
-    float       spec_index_per_px;\r
-    float       intensity_per_dB;
-    int         px_per_sec;
-    int         index;\r
-    int         dy;\r
-    int         dy_blocks;\r
-    int         bytes_in_row_of_blocks;\r
-    int         b;
-    int         px;\r
-    int         py;\r
-    int         intensity;
-    unsigned    *last_row;\r
-    unsigned    *pdest;\r
-    unsigned    *psrc;
-//    float       *av_mag = ((MainFrame *)GetParent())->m_av_mag;\r
-    /* detect resizing of window */
-/*\r
-    if ((m_h != m_prev_h) || (m_w != m_prev_w))
-    {
-        //delete m_pBmp;
-        new_pixel_buf(m_w, m_h);
-    }\r
-*/\r
-\r
-    // determine dy, the height of one "block"
-    px_per_sec = (float)m_h / WATERFALL_SECS_Y;
-    dy = DT * px_per_sec;
-    // number of dy high blocks in spectrogram
-    dy_blocks = m_h / dy;
-    // shift previous bit map
-    bytes_in_row_of_blocks = dy * m_w * sizeof(unsigned);
-    for(b = 0; b < dy_blocks - 1; b++)
-    {
-        pdest = (unsigned int *)m_pBmp + b * m_w * dy;
-        psrc  = (unsigned int *)m_pBmp + (b + 1) * m_w * dy;
-        memcpy(pdest, psrc, bytes_in_row_of_blocks);
-    }
-    // create a new row of blocks at bottom
-    spec_index_per_px = (float)FDMDV_NSPEC / (float) m_w;
-    intensity_per_dB = (float)256 /(MAX_DB - MIN_DB);
-    last_row = (unsigned int *)m_pBmp + dy *(dy_blocks - 1)* m_w;
-    for(px = 0; px < m_w; px++)
-    {
-        index = px * spec_index_per_px;
-        intensity = intensity_per_dB * (m_pTopFrame->m_rxPa->m_av_mag[index] - MIN_DB);
-        //intensity = intensity_per_dB * m_pTopFrame->m_rxPa->getAvMag(index) - MIN_DB);\r
-
-        if(intensity > 255)
-        {
-            intensity = 255;
-        }
-        if (intensity < 0)
-        {
-            intensity = 0;
-        }
-        if(m_greyscale)
-        {
-            for(py = 0; py < dy; py++)
-            {
-                last_row[px + py * m_w] = intensity << 8;
-            }
-        }
-        else
-        {
-            for(py = 0; py < dy; py++)
-            {
-                last_row[px + py * m_w] = m_heatmap_lut[intensity];
-            }
-        }
-    }\r
-    // update bit map
-    //fl_draw_image((unsigned char*)m_pixel_buf, m_x, m_y, m_w, m_h, 4, 0);\r
-    //dc.DrawLines(4, m_pBmp, 0, 0 );\r
-
-}\r
-\r
 //-------------------------------------------------------------------------\r
 // plotPixelData()\r
 //-------------------------------------------------------------------------\r
@@ -336,22 +318,22 @@ void PlotWaterfall::plotPixelData(wxAutoBufferedPaintDC&  dc)
     unsigned    *psrc;\r
 \r
     // determine dy, the height of one "block"
-    px_per_sec = (float)m_h / WATERFALL_SECS_Y;
+    px_per_sec = (float)m_rCtrl.GetHeight() / WATERFALL_SECS_Y;
     dy = DT * px_per_sec;
     // number of dy high blocks in spectrogram
-    dy_blocks = m_h / dy;
+    dy_blocks = m_rCtrl.GetHeight()/ dy;
     // shift previous bit map
-    bytes_in_row_of_blocks = dy * m_w * sizeof(unsigned);
+    bytes_in_row_of_blocks = dy * m_rCtrl.GetWidth() * sizeof(unsigned);
     for(b = 0; b < dy_blocks - 1; b++)
     {
-        pdest = (unsigned int *)m_pBmp + b * m_w * dy;
-        psrc  = (unsigned int *)m_pBmp + (b + 1) * m_w * dy;
+        pdest = (unsigned int *)m_pBmp + b * m_rCtrl.GetWidth() * dy;
+        psrc  = (unsigned int *)m_pBmp + (b + 1) * m_rCtrl.GetWidth() * dy;
         memcpy(pdest, psrc, bytes_in_row_of_blocks);
     }
     // create a new row of blocks at bottom
-    spec_index_per_px = (float)FDMDV_NSPEC / (float) m_w;
+    spec_index_per_px = (float)FDMDV_NSPEC / (float) m_rCtrl.GetWidth();
     intensity_per_dB  = (float)256 /(MAX_DB - MIN_DB);
-    last_row = (unsigned int *)m_pBmp + dy *(dy_blocks - 1)* m_w;
+    last_row = (unsigned int *)m_pBmp + dy *(dy_blocks - 1)* m_rCtrl.GetWidth();
 \r
     wxNativePixelData data(*m_bmp);\r
     if(!data)\r
@@ -367,11 +349,12 @@ void PlotWaterfall::plotPixelData(wxAutoBufferedPaintDC&  dc)
     wxNativePixelData::Iterator p(data);\r
     // we draw a (10, 10)-(20, 20) rect manually using the given r, g, b\r
     p.Offset(data, 10, 10);\r
-    for(px = 0; px < m_w; px++)
+    for(px = 0; px < m_rCtrl.GetWidth(); px++)
     {
         index = px * spec_index_per_px;
         // intensity = intensity_per_dB * (m_av_mag[index] - MIN_DB);
         intensity = intensity_per_dB * (((MainFrame *)GetParent())->m_rxPa->m_av_mag[index] - MIN_DB);
+//        intensity = intensity_per_dB * (((MainFrame *)GetParent())->m_av_mag[index] - MIN_DB);
         if(intensity > 255)
         {
             intensity = 255;
@@ -388,31 +371,17 @@ void PlotWaterfall::plotPixelData(wxAutoBufferedPaintDC&  dc)
         {
             for(py = 0; py < dy; py++)
             {
-                last_row[px + py * m_w] = intensity << 8;
+                last_row[px + py * m_rCtrl.GetWidth()] = intensity << 8;
             }
         }
         else
         {
             for(py = 0; py < dy; py++)
             {
-                last_row[px + py * m_w] = m_heatmap_lut[intensity];
+                last_row[px + py * m_rCtrl.GetWidth()] = m_heatmap_lut[intensity];
             }
         }
     }\r
-/*\r
-    for(int y = 0; y < 10; ++y)\r
-    {\r
-        wxNativePixelData::Iterator rowStart = p;\r
-        for(int x = 0; x < 10; ++x, ++p)\r
-        {\r
-            p.Red()     = r;\r
-            p.Green()   = g;\r
-            p.Blue()    = b;\r
-        }\r
-        p = rowStart;\r
-        p.OffsetY(data, 1);\r
-    }\r
-*/\r
 }\r
 \r
 //----------------------------------------------------------------\r
@@ -424,20 +393,24 @@ void PlotWaterfall::plotPixelData(wxAutoBufferedPaintDC&  dc)
 //----------------------------------------------------------------\r
 void PlotWaterfall::OnPaint(wxPaintEvent & evt)\r
 {\r
-    wxAutoBufferedPaintDC dc(this);\r
-    draw(dc);\r
+    wxAutoBufferedPaintDC pdc(this);\r
+    draw(pdc);\r
 }\r
 \r
 //----------------------------------------------------------------\r
 // OnSize()\r
 //----------------------------------------------------------------\r
-void PlotWaterfall::OnSize(wxSizeEvent& event)\r
-{\r
-    if(m_use_bitmap)\r
-    {\r
-        this->Refresh();\r
-    }\r
-}\r
+//void PlotWaterfall::OnSize(wxSizeEvent& event)\r
+//{\r
+//    m_rCtrlPrev = m_rCtrl;\r
+//    m_rCtrl     = GetClientRect();\r
+//    if(m_use_bitmap)\r
+//    {\r
+//        m_firstPass = true;\r
+//        m_bmp = new wxBitmap(m_rCtrl.GetWidth(), m_rCtrl.GetHeight(), wxBITMAP_SCREEN_DEPTH);
+//        this->Refresh();\r
+//    }\r
+//}\r
 \r
 //----------------------------------------------------------------\r
 // OnShow()\r

diff --git a/fdmdv2/src/fdmdv2_plot_waterfall.h b/fdmdv2/src/fdmdv2_plot_waterfall.h
index 227afd24432cf2e2c4aa71ed5fec2bf4b8fcc7c3..86046c36fc343e51ac55c15b2dde4d870ed4c621 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot_waterfall.h
+++ b/fdmdv2/src/fdmdv2_plot_waterfall.h
@@ -40,25 +40,26 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=\r
 class PlotWaterfall : public PlotPanel\r
 {\r
-public:
-    PlotWaterfall(wxFrame* parent);\r
-    ~PlotWaterfall();\r
+    public:
+        PlotWaterfall(wxFrame* parent);\r
+        ~PlotWaterfall();\r
 
-protected:
-//    unsigned    *m_pixel_buf;
-    unsigned    m_heatmap_lut[256];
-    int         m_greyscale;
+    protected:
+    //    unsigned    *m_pixel_buf;
+        unsigned    m_heatmap_lut[256];
+        int         m_greyscale;
+        wxMemoryDC  m_mDC;\r
+        int         m_line_color;\r
 \r
-    unsigned    heatmap(float val, float min, float max);
+        unsigned    heatmap(float val, float min, float max);
 \r
-    void        OnPaint(wxPaintEvent & evt);\r
-    void        OnSize(wxSizeEvent& event);\r
-    void        OnShow(wxShowEvent& event);\r
-    void        drawGraticule(wxAutoBufferedPaintDC&  dc);\r
-    void        draw(wxAutoBufferedPaintDC&  dc);\r
-    void        plotData(wxAutoBufferedPaintDC&  dc);\r
-    void        plotPixelData(wxAutoBufferedPaintDC&  dc);\r
-    DECLARE_EVENT_TABLE()\r
+        void        OnPaint(wxPaintEvent & evt);\r
+        //void        OnSize(wxSizeEvent& event);\r
+        void        OnShow(wxShowEvent& event);\r
+        void        drawGraticule(wxAutoBufferedPaintDC&  dc);\r
+        void        draw(wxAutoBufferedPaintDC& pdc);\r
+        void        plotPixelData(wxAutoBufferedPaintDC&  dc);\r
+        DECLARE_EVENT_TABLE()\r
 };\r
 \r
 #endif //__FDMDV2_PLOT_WATERFALL__