From 6c012834f6831d5d19405bcc082d8e16a5d3256f Mon Sep 17 00:00:00 2001 From: wittend99 Date: Fri, 14 Sep 2012 23:26:51 +0000 Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/freetel/code@712 01035d8c-6547-0410-b346-abe4f91aad63 --- fdmdv2/build/fdmdv2.mk | 6 +- fdmdv2/build/fdmdv2.project | 2 + fdmdv2/fdmdv2-doc/html/annotated.html | 37 +- .../html/class_about_dlg-members.html | 2 +- fdmdv2/fdmdv2-doc/html/class_about_dlg.html | 2 +- .../html/class_audio_dlg-members.html | 2 +- fdmdv2/fdmdv2-doc/html/class_audio_dlg.html | 2 +- .../html/class_com_ports_dlg-members.html | 2 +- .../fdmdv2-doc/html/class_com_ports_dlg.html | 2 +- .../html/class_dlg_about-members.html | 2 +- fdmdv2/fdmdv2-doc/html/class_dlg_about.html | 2 +- .../html/class_dlg_audio-members.html | 2 +- fdmdv2/fdmdv2-doc/html/class_dlg_audio.html | 2 +- .../html/class_dlg_com_ports-members.html | 2 +- .../fdmdv2-doc/html/class_dlg_com_ports.html | 2 +- .../html/class_dlg_options-members.html | 2 +- fdmdv2/fdmdv2-doc/html/class_dlg_options.html | 2 +- .../html/class_main_app-members.html | 4 +- fdmdv2/fdmdv2-doc/html/class_main_app.html | 12 +- .../html/class_main_frame-members.html | 173 +-- fdmdv2/fdmdv2-doc/html/class_main_frame.html | 17 +- .../html/class_options_dlg-members.html | 2 +- fdmdv2/fdmdv2-doc/html/class_options_dlg.html | 2 +- .../html/class_plot_panel-members.html | 22 +- fdmdv2/fdmdv2-doc/html/class_plot_panel.html | 44 +- .../html/class_plot_scalar-members.html | 22 +- fdmdv2/fdmdv2-doc/html/class_plot_scalar.html | 38 +- .../html/class_plot_scatter-members.html | 20 +- .../fdmdv2-doc/html/class_plot_scatter.html | 38 +- .../html/class_plot_spectrum-members.html | 18 +- .../fdmdv2-doc/html/class_plot_spectrum.html | 32 +- .../html/class_plot_waterfall-members.html | 41 +- .../fdmdv2-doc/html/class_plot_waterfall.html | 50 +- .../html/class_port_audio_wrap-members.html | 56 +- .../html/class_port_audio_wrap.html | 74 +- .../html/class_top_frame-members.html | 2 +- fdmdv2/fdmdv2-doc/html/class_top_frame.html | 2 +- fdmdv2/fdmdv2-doc/html/classes.html | 11 +- fdmdv2/fdmdv2-doc/html/comp_8h_source.html | 2 +- .../fdmdv2-doc/html/dlg__about_8h_source.html | 2 +- .../fdmdv2-doc/html/dlg__audio_8h_source.html | 2 +- .../html/dlg__comports_8h_source.html | 2 +- .../html/dlg__options_8h_source.html | 2 +- .../html/fdmdv2__defines_8h_source.html | 2 +- .../html/fdmdv2__main_8h_source.html | 346 +++--- .../html/fdmdv2__pa__wrapper_8h_source.html | 182 ++- .../html/fdmdv2__plot_8h_source.html | 231 ++-- .../html/fdmdv2__plot__scalar_8h_source.html | 2 +- .../html/fdmdv2__plot__scatter_8h_source.html | 2 +- .../fdmdv2__plot__spectrum_8h_source.html | 2 +- .../fdmdv2__plot__waterfall_8h_source.html | 43 +- fdmdv2/fdmdv2-doc/html/files.html | 31 +- fdmdv2/fdmdv2-doc/html/functions.html | 2 +- fdmdv2/fdmdv2-doc/html/functions_func.html | 2 +- fdmdv2/fdmdv2-doc/html/graph_legend.html | 2 +- fdmdv2/fdmdv2-doc/html/hierarchy.html | 49 +- fdmdv2/fdmdv2-doc/html/index.hhc | 45 +- fdmdv2/fdmdv2-doc/html/index.hhk | 83 +- fdmdv2/fdmdv2-doc/html/index.hhp | 4 - fdmdv2/fdmdv2-doc/html/index.html | 2 +- fdmdv2/fdmdv2-doc/html/inherit_graph_0.map | 2 +- fdmdv2/fdmdv2-doc/html/inherit_graph_0.md5 | 2 +- fdmdv2/fdmdv2-doc/html/inherit_graph_0.png | Bin 490 -> 377 bytes fdmdv2/fdmdv2-doc/html/inherit_graph_1.map | 9 +- fdmdv2/fdmdv2-doc/html/inherit_graph_1.md5 | 2 +- fdmdv2/fdmdv2-doc/html/inherit_graph_1.png | Bin 377 -> 8080 bytes fdmdv2/fdmdv2-doc/html/inherit_graph_2.map | 9 +- fdmdv2/fdmdv2-doc/html/inherit_graph_2.md5 | 2 +- fdmdv2/fdmdv2-doc/html/inherit_graph_2.png | Bin 8080 -> 977 bytes fdmdv2/fdmdv2-doc/html/inherit_graph_3.map | 2 +- fdmdv2/fdmdv2-doc/html/inherit_graph_3.md5 | 2 +- fdmdv2/fdmdv2-doc/html/inherit_graph_3.png | Bin 977 -> 534 bytes fdmdv2/fdmdv2-doc/html/inherit_graph_4.map | 6 +- fdmdv2/fdmdv2-doc/html/inherit_graph_4.md5 | 2 +- fdmdv2/fdmdv2-doc/html/inherit_graph_4.png | Bin 534 -> 6659 bytes fdmdv2/fdmdv2-doc/html/inherit_graph_5.map | 6 +- fdmdv2/fdmdv2-doc/html/inherit_graph_5.md5 | 2 +- fdmdv2/fdmdv2-doc/html/inherit_graph_5.png | Bin 6659 -> 506 bytes fdmdv2/fdmdv2-doc/html/inherit_graph_6.map | 3 +- fdmdv2/fdmdv2-doc/html/inherit_graph_6.md5 | 2 +- fdmdv2/fdmdv2-doc/html/inherit_graph_6.png | Bin 506 -> 1318 bytes fdmdv2/fdmdv2-doc/html/inherits.html | 20 +- .../html/struct_c_o_m_p-members.html | 2 +- fdmdv2/fdmdv2-doc/html/struct_c_o_m_p.html | 2 +- .../html/structpa_call_back_data-members.html | 2 +- .../html/structpa_call_back_data.html | 2 +- .../fdmdv2-doc/html/top_frame_8h_source.html | 2 +- fdmdv2/fdmdv2-doc/latex/annotated.tex | 1 - fdmdv2/fdmdv2-doc/latex/class_main_app.tex | 9 + fdmdv2/fdmdv2-doc/latex/class_main_frame.tex | 15 + fdmdv2/fdmdv2-doc/latex/class_plot_panel.tex | 22 +- .../fdmdv2-doc/latex/class_plot_waterfall.tex | 14 +- .../latex/class_port_audio_wrap.tex | 46 +- fdmdv2/fdmdv2-doc/latex/class_top_frame.tex | 3 +- fdmdv2/fdmdv2-doc/latex/doxygen.sty | 4 +- fdmdv2/fdmdv2-doc/latex/hierarchy.tex | 1 - fdmdv2/fdmdv2-doc/latex/refman.tex | 3 +- fdmdv2/fdmdv2-doc/man/man3/AboutDlg.3 | 2 +- fdmdv2/fdmdv2-doc/man/man3/AudioDlg.3 | 2 +- fdmdv2/fdmdv2-doc/man/man3/COMP.3 | 2 +- .../man3/C__bin_Projects_Radio_fdmdv2_src_.3 | 8 +- fdmdv2/fdmdv2-doc/man/man3/ComPortsDlg.3 | 2 +- fdmdv2/fdmdv2-doc/man/man3/DlgAbout.3 | 2 +- fdmdv2/fdmdv2-doc/man/man3/DlgAudio.3 | 2 +- fdmdv2/fdmdv2-doc/man/man3/DlgComPorts.3 | 2 +- fdmdv2/fdmdv2-doc/man/man3/DlgOptions.3 | 2 +- fdmdv2/fdmdv2-doc/man/man3/MainApp.3 | 12 +- fdmdv2/fdmdv2-doc/man/man3/MainFrame.3 | 17 +- fdmdv2/fdmdv2-doc/man/man3/OptionsDlg.3 | 2 +- fdmdv2/fdmdv2-doc/man/man3/PlotPanel.3 | 24 +- fdmdv2/fdmdv2-doc/man/man3/PlotScalar.3 | 2 +- fdmdv2/fdmdv2-doc/man/man3/PlotScatter.3 | 2 +- fdmdv2/fdmdv2-doc/man/man3/PlotSpectrum.3 | 2 +- fdmdv2/fdmdv2-doc/man/man3/PlotWaterfall.3 | 16 +- fdmdv2/fdmdv2-doc/man/man3/PortAudioWrap.3 | 48 +- fdmdv2/fdmdv2-doc/man/man3/TopFrame.3 | 2 +- fdmdv2/fdmdv2-doc/man/man3/paCallBackData.3 | 2 +- fdmdv2/fdmdv2-doc/rtf/refman.rtf | 1025 ++++++++--------- fdmdv2/src/fdmdv2_main.cpp | 499 ++++---- fdmdv2/src/fdmdv2_main.h | 36 +- fdmdv2/src/fdmdv2_pa_wrapper.cpp | 363 +++--- fdmdv2/src/fdmdv2_pa_wrapper.h | 104 +- fdmdv2/src/fdmdv2_plot.cpp | 95 +- fdmdv2/src/fdmdv2_plot.h | 61 +- fdmdv2/src/fdmdv2_plot_scalar.cpp | 39 +- fdmdv2/src/fdmdv2_plot_scatter.cpp | 18 +- fdmdv2/src/fdmdv2_plot_spectrum.cpp | 39 +- fdmdv2/src/fdmdv2_plot_waterfall.cpp | 319 +++-- fdmdv2/src/fdmdv2_plot_waterfall.h | 33 +- 129 files changed, 2385 insertions(+), 2391 deletions(-) diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk index 42ef6bb7..376a9c67 100644 --- a/fdmdv2/build/fdmdv2.mk +++ b/fdmdv2/build/fdmdv2.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=OFA-Staff -Date :=9/11/2012 +Date :=9/14/2012 CodeLitePath :="C:\bin\CodeLite" LinkerName :=g++ SharedObjectLinkerName :=g++ -shared -fPIC @@ -50,8 +50,8 @@ LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW/m AR := ar rcus CXX := g++ CC := gcc -CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"658\" $(Preprocessors) -CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"658\" $(Preprocessors) +CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"674\" $(Preprocessors) +CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"674\" $(Preprocessors) ## diff --git a/fdmdv2/build/fdmdv2.project b/fdmdv2/build/fdmdv2.project index c84814c0..41c2d74d 100644 --- a/fdmdv2/build/fdmdv2.project +++ b/fdmdv2/build/fdmdv2.project @@ -179,4 +179,6 @@ + + diff --git a/fdmdv2/fdmdv2-doc/html/annotated.html b/fdmdv2/fdmdv2-doc/html/annotated.html index 4adf81c6..03c66977 100644 --- a/fdmdv2/fdmdv2-doc/html/annotated.html +++ b/fdmdv2/fdmdv2-doc/html/annotated.html @@ -52,30 +52,29 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
oCAboutDlg
oCAudioDlg
oCAudioStream
oCCOMP
oCComPortsDlg
oCDlgAbout
oCDlgAudio
oCDlgComPorts
oCDlgOptions
oCMainApp
oCMainFrame
oCOptionsDlg
oCpaCallBackData
oCPlotPanel
oCPlotScalar
oCPlotScatter
oCPlotSpectrum
oCPlotWaterfall
oCPortAudioWrap
\CTopFrame
oCCOMP
oCComPortsDlg
oCDlgAbout
oCDlgAudio
oCDlgComPorts
oCDlgOptions
oCMainApp
oCMainFrame
oCOptionsDlg
oCpaCallBackData
oCPlotPanel
oCPlotScalar
oCPlotScatter
oCPlotSpectrum
oCPlotWaterfall
oCPortAudioWrap
\CTopFrame
diff --git a/fdmdv2/fdmdv2-doc/html/class_about_dlg-members.html b/fdmdv2/fdmdv2-doc/html/class_about_dlg-members.html index 21485c2c..45b5d8f0 100644 --- a/fdmdv2/fdmdv2-doc/html/class_about_dlg-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_about_dlg-members.html @@ -63,7 +63,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/class_about_dlg.html b/fdmdv2/fdmdv2-doc/html/class_about_dlg.html index c59cee41..f7e60474 100644 --- a/fdmdv2/fdmdv2-doc/html/class_about_dlg.html +++ b/fdmdv2/fdmdv2-doc/html/class_about_dlg.html @@ -127,7 +127,7 @@ wxButton * m_button9 diff --git a/fdmdv2/fdmdv2-doc/html/class_audio_dlg-members.html b/fdmdv2/fdmdv2-doc/html/class_audio_dlg-members.html index cf1dbedf..bc98782b 100644 --- a/fdmdv2/fdmdv2-doc/html/class_audio_dlg-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_audio_dlg-members.html @@ -98,7 +98,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/class_audio_dlg.html b/fdmdv2/fdmdv2-doc/html/class_audio_dlg.html index 316669b8..47c7b2c5 100644 --- a/fdmdv2/fdmdv2-doc/html/class_audio_dlg.html +++ b/fdmdv2/fdmdv2-doc/html/class_audio_dlg.html @@ -231,7 +231,7 @@ wxButton * m_sdbSizer3Canc 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 ba73d92c..edf183b4 100644 --- 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 @@ diff --git a/fdmdv2/fdmdv2-doc/html/class_com_ports_dlg.html b/fdmdv2/fdmdv2-doc/html/class_com_ports_dlg.html index 51bde42c..4d7d3a6b 100644 --- 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 * m_sdbSizer3Canc diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_about-members.html b/fdmdv2/fdmdv2-doc/html/class_dlg_about-members.html index 1f0bf6c7..34e8920a 100644 --- a/fdmdv2/fdmdv2-doc/html/class_dlg_about-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_dlg_about-members.html @@ -62,7 +62,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_about.html b/fdmdv2/fdmdv2-doc/html/class_dlg_about.html index dc542492..78ac2153 100644 --- a/fdmdv2/fdmdv2-doc/html/class_dlg_about.html +++ b/fdmdv2/fdmdv2-doc/html/class_dlg_about.html @@ -107,7 +107,7 @@ wxButton * m_button9 diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_audio-members.html b/fdmdv2/fdmdv2-doc/html/class_dlg_audio-members.html index 520a0eb8..cbbb1e12 100644 --- a/fdmdv2/fdmdv2-doc/html/class_dlg_audio-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_dlg_audio-members.html @@ -95,7 +95,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_audio.html b/fdmdv2/fdmdv2-doc/html/class_dlg_audio.html index ec3df70e..96fdd552 100644 --- a/fdmdv2/fdmdv2-doc/html/class_dlg_audio.html +++ b/fdmdv2/fdmdv2-doc/html/class_dlg_audio.html @@ -206,7 +206,7 @@ wxButton * m_sdbSizer3Canc 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 8dbdd13c..51328631 100644 --- 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 @@ diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_com_ports.html b/fdmdv2/fdmdv2-doc/html/class_dlg_com_ports.html index 142ccc3a..6c019a70 100644 --- 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 * m_sdbSizer3Canc diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_options-members.html b/fdmdv2/fdmdv2-doc/html/class_dlg_options-members.html index ae95079b..7d2d769f 100644 --- a/fdmdv2/fdmdv2-doc/html/class_dlg_options-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_dlg_options-members.html @@ -73,7 +73,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/class_dlg_options.html b/fdmdv2/fdmdv2-doc/html/class_dlg_options.html index 4edfcfbd..ddd03171 100644 --- a/fdmdv2/fdmdv2-doc/html/class_dlg_options.html +++ b/fdmdv2/fdmdv2-doc/html/class_dlg_options.html @@ -140,7 +140,7 @@ wxButton * m_sdbSizer4Canc diff --git a/fdmdv2/fdmdv2-doc/html/class_main_app-members.html b/fdmdv2/fdmdv2-doc/html/class_main_app-members.html index 0ced29dd..bc1c7957 100644 --- a/fdmdv2/fdmdv2-doc/html/class_main_app-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_main_app-members.html @@ -51,12 +51,14 @@

This is the complete list of members for MainApp, including all inherited members.

+ +
g_config (defined in MainApp)MainAppprotected
loadConfig() (defined in MainApp)MainApp
OnExit() (defined in MainApp)MainAppinlinevirtual
OnInit() (defined in MainApp)MainAppvirtual
diff --git a/fdmdv2/fdmdv2-doc/html/class_main_app.html b/fdmdv2/fdmdv2-doc/html/class_main_app.html index 66d9974f..5f67ed6e 100644 --- a/fdmdv2/fdmdv2-doc/html/class_main_app.html +++ b/fdmdv2/fdmdv2-doc/html/class_main_app.html @@ -46,6 +46,7 @@
MainApp Class Reference
@@ -70,6 +71,15 @@ virtual bool OnInit () virtual int OnExit ()   + +bool loadConfig () +  + + + +

+Protected Attributes

+wxConfig * g_config
 

The documentation for this class was generated from the following files:
  • C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_main.h
  • @@ -78,7 +88,7 @@ virtual int OnExit ()<
diff --git a/fdmdv2/fdmdv2-doc/html/class_main_frame-members.html b/fdmdv2/fdmdv2-doc/html/class_main_frame-members.html index 1c70b6a8..1e7f7f94 100644 --- a/fdmdv2/fdmdv2-doc/html/class_main_frame-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_main_frame-members.html @@ -53,75 +53,79 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -136,24 +140,25 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
abortRxStream() (defined in MainFrame)MainFrameprotected
abortTxStream() (defined in MainFrame)MainFrameprotected
edit (defined in TopFrame)TopFrameprotected
file (defined in TopFrame)TopFrameprotected
help (defined in TopFrame)TopFrameprotected
LoadUserImage(wxImage &image) (defined in MainFrame)MainFrameprotected
m_auiNbookCtrl (defined in TopFrame)TopFrame
m_btnTogTX (defined in TopFrame)TopFrameprotected
m_ckboxSQ (defined in TopFrame)TopFrameprotected
m_gaugeLevel (defined in TopFrame)TopFrameprotected
m_gaugeSNR (defined in TopFrame)TopFrameprotected
m_menubarMain (defined in TopFrame)TopFrameprotected
m_panelDefaultA (defined in MainFrame)MainFrame
m_panelScalar (defined in MainFrame)MainFrame
m_panelScatter (defined in MainFrame)MainFrame
m_panelSpectrum (defined in MainFrame)MainFrame
m_panelWaterfall (defined in MainFrame)MainFrame
m_RXCodec2 (defined in MainFrame)MainFrame
m_rxDevIn (defined in MainFrame)MainFrame
m_rxDevOut (defined in MainFrame)MainFrame
m_rxErr (defined in MainFrame)MainFrame
m_rxPa (defined in MainFrame)MainFrame
m_RxRunning (defined in MainFrame)MainFrame
m_sliderSQ (defined in TopFrame)TopFrameprotected
m_sound (defined in MainFrame)MainFrame
m_SquelchActive (defined in MainFrame)MainFrame
m_statusBar1 (defined in TopFrame)TopFrameprotected
m_textSNR (defined in TopFrame)TopFrameprotected
m_togBtnALC (defined in TopFrame)TopFrameprotected
m_togBtnAnalog (defined in TopFrame)TopFrameprotected
m_togBtnOnOff (defined in TopFrame)TopFrameprotected
m_togBtnSplit (defined in TopFrame)TopFrameprotected
m_togRxID (defined in TopFrame)TopFrameprotected
m_togTxID (defined in TopFrame)TopFrameprotected
m_TXCodec2 (defined in MainFrame)MainFrame
m_txDevIn (defined in MainFrame)MainFrame
m_txDevOut (defined in MainFrame)MainFrame
m_txErr (defined in MainFrame)MainFrame
m_txPa (defined in MainFrame)MainFrame
m_TxRunning (defined in MainFrame)MainFrame
m_txtCtrl (defined in TopFrame)TopFrameprotected
MainFrame(wxWindow *parent) (defined in MainFrame)MainFrame
OnCaptureRxStream(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCaptureTxStream(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCheckSQClick(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnClose(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnClose(wxCloseEvent &event) (defined in MainFrame)MainFrameprotected
OnCloseFrame(wxCloseEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCloseUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCmdSliderScroll(wxScrollEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCmdSliderScrollChanged(wxScrollEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCopy(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCopyUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCut(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCutUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnExit(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnExitClick(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnHelpAbout(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnHelpCheckUpdates(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnHelpCheckUpdatesUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnOpen(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnOpenUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnPaint(wxPaintEvent &event) (defined in MainFrame)MainFrameprotected
OnPaste(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnPasteUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnPlayAudioFile(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnSave(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnSaveUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnSize(wxSizeEvent &event) (defined in MainFrame)MainFrameprotected
OnSliderScrollBottom(wxScrollEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnSliderScrollTop(wxScrollEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
averageData(float mag_dB[]) (defined in MainFrame)MainFrameprotected
edit (defined in TopFrame)TopFrameprotected
file (defined in TopFrame)TopFrameprotected
help (defined in TopFrame)TopFrameprotected
LoadUserImage(wxImage &image) (defined in MainFrame)MainFrameprotected
m_auiNbookCtrl (defined in TopFrame)TopFrame
m_btnTogTX (defined in TopFrame)TopFrameprotected
m_ckboxSQ (defined in TopFrame)TopFrameprotected
m_gaugeLevel (defined in TopFrame)TopFrameprotected
m_gaugeSNR (defined in TopFrame)TopFrameprotected
m_menubarMain (defined in TopFrame)TopFrameprotected
m_panelDefaultA (defined in MainFrame)MainFrame
m_panelScalar (defined in MainFrame)MainFrame
m_panelScatter (defined in MainFrame)MainFrame
m_panelSpectrum (defined in MainFrame)MainFrame
m_panelWaterfall (defined in MainFrame)MainFrame
m_pFDMDV_state (defined in MainFrame)MainFrame
m_plotTimer (defined in MainFrame)MainFrame
m_RXCodec2 (defined in MainFrame)MainFrame
m_rxDevIn (defined in MainFrame)MainFrame
m_rxDevOut (defined in MainFrame)MainFrame
m_rxErr (defined in MainFrame)MainFrame
m_rxPa (defined in MainFrame)MainFrame
m_RxRunning (defined in MainFrame)MainFrame
m_sliderSQ (defined in TopFrame)TopFrameprotected
m_sound (defined in MainFrame)MainFrame
m_SquelchActive (defined in MainFrame)MainFrame
m_statusBar1 (defined in TopFrame)TopFrameprotected
m_textSNR (defined in TopFrame)TopFrameprotected
m_togBtnALC (defined in TopFrame)TopFrameprotected
m_togBtnAnalog (defined in TopFrame)TopFrameprotected
m_togBtnOnOff (defined in TopFrame)TopFrameprotected
m_togBtnSplit (defined in TopFrame)TopFrameprotected
m_togRxID (defined in TopFrame)TopFrameprotected
m_togTxID (defined in TopFrame)TopFrameprotected
m_TXCodec2 (defined in MainFrame)MainFrame
m_txDevIn (defined in MainFrame)MainFrame
m_txDevOut (defined in MainFrame)MainFrame
m_txErr (defined in MainFrame)MainFrame
m_txPa (defined in MainFrame)MainFrame
m_TxRunning (defined in MainFrame)MainFrame
m_txtCtrl (defined in TopFrame)TopFrameprotected
MainFrame(wxWindow *parent) (defined in MainFrame)MainFrame
OnCaptureRxStream(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCaptureTxStream(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCheckSQClick(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnClose(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnClose(wxCloseEvent &event) (defined in MainFrame)MainFrameprotected
OnCloseFrame(wxCloseEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCloseUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCmdSliderScroll(wxScrollEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCmdSliderScrollChanged(wxScrollEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCopy(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCopyUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCut(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnCutUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnExit(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnExitClick(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnHelpAbout(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnHelpCheckUpdates(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnHelpCheckUpdatesUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnOpen(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnOpenUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnPaint(wxPaintEvent &event) (defined in MainFrame)MainFrameprotected
OnPaste(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnPasteUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnPlayAudioFile(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnSave(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnSaveUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnSize(wxSizeEvent &event) (defined in MainFrame)MainFrameprotected
OnSliderScrollBottom(wxScrollEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnSliderScrollTop(wxScrollEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnTimer(wxTimerEvent &evt) (defined in MainFrame)MainFrameprotected
OnTogBtnALCClick(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnTogBtnAnalogClick(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnTogBtnOnOff(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnToolsOptions(wxCommandEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnToolsOptionsUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotectedvirtual
OnUpdateUI(wxUpdateUIEvent &event) (defined in MainFrame)MainFrameprotected
rxCallback(const void *inBuffer, void *outBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo *outTime, PaStreamCallbackFlags statusFlags, void *userData) (defined in MainFrame)MainFramestatic
startRxStream() (defined in MainFrame)MainFrameprotected
startTxStream() (defined in MainFrame)MainFrameprotected
stopRxStream() (defined in MainFrame)MainFrameprotected
stopTxStream() (defined in MainFrame)MainFrameprotected
tools (defined in TopFrame)TopFrameprotected
TopFrame(wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("FDMDV2"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(761, 500), long style=wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL) (defined in TopFrame)TopFrame
topFrame_OnClose(wxCloseEvent &event) (defined in TopFrame)TopFrameinlineprotectedvirtual
topFrame_OnPaint(wxPaintEvent &event) (defined in TopFrame)TopFrameinlineprotectedvirtual
topFrame_OnSize(wxSizeEvent &event) (defined in TopFrame)TopFrameinlineprotectedvirtual
topFrame_OnUpdateUI(wxUpdateUIEvent &event) (defined in TopFrame)TopFrameinlineprotectedvirtual
txCallback(const void *inBuffer, void *outBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo *outTime, PaStreamCallbackFlags statusFlags, void *userData) (defined in MainFrame)MainFramestatic
~MainFrame() (defined in MainFrame)MainFramevirtual
~TopFrame() (defined in TopFrame)TopFrame
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) (defined in MainFrame)MainFrame
rxCallback(const void *inBuffer, void *outBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo *outTime, PaStreamCallbackFlags statusFlags, void *userData) (defined in MainFrame)MainFramestatic
startRxStream() (defined in MainFrame)MainFrameprotected
startTxStream() (defined in MainFrame)MainFrameprotected
stopRxStream() (defined in MainFrame)MainFrameprotected
stopTxStream() (defined in MainFrame)MainFrameprotected
tools (defined in TopFrame)TopFrameprotected
TopFrame(wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("FDMDV2"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(761, 500), long style=wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL) (defined in TopFrame)TopFrame
topFrame_OnClose(wxCloseEvent &event) (defined in TopFrame)TopFrameinlineprotectedvirtual
topFrame_OnPaint(wxPaintEvent &event) (defined in TopFrame)TopFrameinlineprotectedvirtual
topFrame_OnSize(wxSizeEvent &event) (defined in TopFrame)TopFrameinlineprotectedvirtual
topFrame_OnUpdateUI(wxUpdateUIEvent &event) (defined in TopFrame)TopFrameinlineprotectedvirtual
txCallback(const void *inBuffer, void *outBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo *outTime, PaStreamCallbackFlags statusFlags, void *userData) (defined in MainFrame)MainFramestatic
~MainFrame() (defined in MainFrame)MainFramevirtual
~TopFrame() (defined in TopFrame)TopFrame
diff --git a/fdmdv2/fdmdv2-doc/html/class_main_frame.html b/fdmdv2/fdmdv2-doc/html/class_main_frame.html index 2534dd6d..81fcac7f 100644 --- 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  MainFrame (wxWindow *parent)   + +void 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) +  - Public Member Functions inherited from TopFrame  TopFrame (wxWindow *parent, wxWindowID id=wxID_ANY, const wxString &title=_("FDMDV2"), const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxSize(761, 500), long style=wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL) @@ -147,6 +150,12 @@ PaError m_txErr wxSound * m_sound   + +struct FDMDV * m_pFDMDV_state +  + +wxTimer m_plotTimer- Public Attributes inherited from TopFrame wxAuiNotebook * m_auiNbookCtrl @@ -160,6 +169,9 @@ virtual void OnCloseFrame< virtual void OnExitClick (wxCommandEvent &event)   + +void averageData (float mag_dB[]) +  void startTxStream ()   @@ -301,6 +313,9 @@ void OnSize (wxSizeEve void OnUpdateUI (wxUpdateUIEvent &event)   + +void OnTimer (wxTimerEvent &evt) +  wxString LoadUserImage (wxImage &image)   @@ -386,7 +401,7 @@ wxStatusBar * m_statusBar1 diff --git a/fdmdv2/fdmdv2-doc/html/class_options_dlg-members.html b/fdmdv2/fdmdv2-doc/html/class_options_dlg-members.html index 27ab1a57..884eb78b 100644 --- a/fdmdv2/fdmdv2-doc/html/class_options_dlg-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_options_dlg-members.html @@ -74,7 +74,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/class_options_dlg.html b/fdmdv2/fdmdv2-doc/html/class_options_dlg.html index bcc74c06..d6e52bf9 100644 --- a/fdmdv2/fdmdv2-doc/html/class_options_dlg.html +++ b/fdmdv2/fdmdv2-doc/html/class_options_dlg.html @@ -159,7 +159,7 @@ wxButton * m_sdbSizer4Canc diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_panel-members.html b/fdmdv2/fdmdv2-doc/html/class_plot_panel-members.html index 530504a2..ded8294e 100644 --- a/fdmdv2/fdmdv2-doc/html/class_plot_panel-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_plot_panel-members.html @@ -51,14 +51,14 @@

This is the complete list of members for PlotPanel, including all inherited members.

- - + + - + @@ -73,13 +73,13 @@ - - - - - - - + + + + + + + @@ -100,7 +100,7 @@
draw(wxAutoBufferedPaintDC &dc) (defined in PlotPanel)PlotPanelvirtual
drawGraticule(wxAutoBufferedPaintDC &dc) (defined in PlotPanel)PlotPanelvirtual
draw(wxAutoBufferedPaintDC &pdc) (defined in PlotPanel)PlotPanelvirtual
drawGraticule(wxAutoBufferedPaintDC &pdc) (defined in PlotPanel)PlotPanelvirtual
GetLabelSize() (defined in PlotPanel)PlotPanelvirtual
GetZoomFactor(double zf) (defined in PlotPanel)PlotPanelvirtual
m_bmp (defined in PlotPanel)PlotPanel
m_Bufsz (defined in PlotPanel)PlotPanel
m_clip (defined in PlotPanel)PlotPanelprotected
m_h (defined in PlotPanel)PlotPanelprotected
m_firstPass (defined in PlotPanel)PlotPanelprotected
m_label_size (defined in PlotPanel)PlotPanel
m_left (defined in PlotPanel)PlotPanelprotected
m_mouseDown (defined in PlotPanel)PlotPanelprotected
m_prev_x (defined in PlotPanel)PlotPanelprotected
m_prev_y (defined in PlotPanel)PlotPanelprotected
m_pTopFrame (defined in PlotPanel)PlotPanel
m_rectCtrl (defined in PlotPanel)PlotPanel
m_rectGrid (defined in PlotPanel)PlotPanel
m_rectPlot (defined in PlotPanel)PlotPanel
m_rubberBand (defined in PlotPanel)PlotPanelprotected
m_top (defined in PlotPanel)PlotPanelprotected
m_use_bitmap (defined in PlotPanel)PlotPanelprotected
m_w (defined in PlotPanel)PlotPanelprotected
m_rCtrl (defined in PlotPanel)PlotPanel
m_rCtrlPrev (defined in PlotPanel)PlotPanel
m_rGrid (defined in PlotPanel)PlotPanel
m_rPlot (defined in PlotPanel)PlotPanel
m_rubberBand (defined in PlotPanel)PlotPanelprotected
m_top (defined in PlotPanel)PlotPanelprotected
m_use_bitmap (defined in PlotPanel)PlotPanelprotected
m_x (defined in PlotPanel)PlotPanelprotected
m_y (defined in PlotPanel)PlotPanelprotected
m_zoomFactor (defined in PlotPanel)PlotPanelprotected
diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_panel.html b/fdmdv2/fdmdv2-doc/html/class_plot_panel.html index 3ac96de0..50ee321b 100644 --- a/fdmdv2/fdmdv2-doc/html/class_plot_panel.html +++ b/fdmdv2/fdmdv2-doc/html/class_plot_panel.html @@ -100,12 +100,12 @@ void OnPaint (wxPaintE void paintEvent (wxPaintEvent &evt)   - -virtual void draw (wxAutoBufferedPaintDC &dc) -  - -virtual void drawGraticule (wxAutoBufferedPaintDC &dc) -  + +virtual void draw (wxAutoBufferedPaintDC &pdc) +  + +virtual void drawGraticule (wxAutoBufferedPaintDC &pdc) +  virtual double SetZoomFactor (double zf)   @@ -133,15 +133,18 @@ wxPen m_penDotDash wxPen m_penSolid   - -wxRect m_rectCtrl -  - -wxRect m_rectGrid -  - -wxRect m_rectPlot -  + +wxRect m_rCtrlPrev +  + +wxRect m_rCtrl +  + +wxRect m_rGrid +  + +wxRect m_rPlot MainFramem_pTopFrame   @@ -172,12 +175,6 @@ int m_x int m_y   - -int m_w -  - -int m_h int m_left   @@ -208,6 +205,9 @@ bool m_rubberBand bool m_mouseDown   + +bool m_firstPass double m_zoomFactor   @@ -219,7 +219,7 @@ double m_zoomFactor diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_scalar-members.html b/fdmdv2/fdmdv2-doc/html/class_plot_scalar-members.html index a51b890f..5dd9d592 100644 --- a/fdmdv2/fdmdv2-doc/html/class_plot_scalar-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_plot_scalar-members.html @@ -54,13 +54,13 @@ add_new_sample(float sample) (defined in PlotScalar)PlotScalar clip(int y1) (defined in PlotScalar)PlotScalarprotected draw(wxAutoBufferedPaintDC &dc) (defined in PlotScalar)PlotScalarprotectedvirtual - drawGraticule(wxAutoBufferedPaintDC &dc) (defined in PlotPanel)PlotPanelvirtual + drawGraticule(wxAutoBufferedPaintDC &pdc) (defined in PlotPanel)PlotPanelvirtual GetLabelSize() (defined in PlotPanel)PlotPanelvirtual GetZoomFactor(double zf) (defined in PlotPanel)PlotPanelvirtual m_bmp (defined in PlotPanel)PlotPanel m_Bufsz (defined in PlotPanel)PlotPanel m_clip (defined in PlotPanel)PlotPanelprotected - m_h (defined in PlotPanel)PlotPanelprotected + m_firstPass (defined in PlotPanel)PlotPanelprotected m_index (defined in PlotScalar)PlotScalarprotected m_label_size (defined in PlotPanel)PlotPanel m_left (defined in PlotPanel)PlotPanelprotected @@ -78,14 +78,14 @@ m_prev_x (defined in PlotPanel)PlotPanelprotected m_prev_y (defined in PlotPanel)PlotPanelprotected m_pTopFrame (defined in PlotPanel)PlotPanel - m_rectCtrl (defined in PlotPanel)PlotPanel - m_rectGrid (defined in PlotPanel)PlotPanel - m_rectPlot (defined in PlotPanel)PlotPanel - m_rubberBand (defined in PlotPanel)PlotPanelprotected - m_step (defined in PlotScalar)PlotScalarprotected - m_top (defined in PlotPanel)PlotPanelprotected - m_use_bitmap (defined in PlotPanel)PlotPanelprotected - m_w (defined in PlotPanel)PlotPanelprotected + m_rCtrl (defined in PlotPanel)PlotPanel + m_rCtrlPrev (defined in PlotPanel)PlotPanel + m_rGrid (defined in PlotPanel)PlotPanel + m_rPlot (defined in PlotPanel)PlotPanel + m_rubberBand (defined in PlotPanel)PlotPanelprotected + m_step (defined in PlotScalar)PlotScalarprotected + m_top (defined in PlotPanel)PlotPanelprotected + m_use_bitmap (defined in PlotPanel)PlotPanelprotected m_x (defined in PlotPanel)PlotPanelprotected m_x_max (defined in PlotScalar)PlotScalarprotected m_y (defined in PlotPanel)PlotPanelprotected @@ -110,7 +110,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_scalar.html b/fdmdv2/fdmdv2-doc/html/class_plot_scalar.html index 53b19335..07e60f4f 100644 --- a/fdmdv2/fdmdv2-doc/html/class_plot_scalar.html +++ b/fdmdv2/fdmdv2-doc/html/class_plot_scalar.html @@ -107,9 +107,9 @@ void OnPaint (wxPaintE void paintEvent (wxPaintEvent &evt)   - -virtual void drawGraticule (wxAutoBufferedPaintDC &dc) -  + +virtual void drawGraticule (wxAutoBufferedPaintDC &pdc) +  virtual double SetZoomFactor (double zf)   @@ -168,12 +168,6 @@ int m_x int m_y   - -int m_w -  - -int m_h int m_left   @@ -204,6 +198,9 @@ bool m_rubberBand bool m_mouseDown   + +bool m_firstPass double m_zoomFactor   @@ -220,15 +217,18 @@ wxPen m_penDotDash wxPen m_penSolid   - -wxRect m_rectCtrl -  - -wxRect m_rectGrid -  - -wxRect m_rectPlot -  + +wxRect m_rCtrlPrev +  + +wxRect m_rCtrl +  + +wxRect m_rGrid +  + +wxRect m_rPlot MainFramem_pTopFrame   @@ -258,7 +258,7 @@ wxNativePixelData * m_pBmp diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_scatter-members.html b/fdmdv2/fdmdv2-doc/html/class_plot_scatter-members.html index dba8d501..a9f7b4b3 100644 --- a/fdmdv2/fdmdv2-doc/html/class_plot_scatter-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_plot_scatter-members.html @@ -53,13 +53,13 @@ - + - + @@ -76,13 +76,13 @@ - - - - - - - + + + + + + + @@ -105,7 +105,7 @@
add_new_samples(COMP samples[]) (defined in PlotScatter)PlotScatterprotected
draw(wxAutoBufferedPaintDC &dc) (defined in PlotScatter)PlotScatterprotectedvirtual
drawGraticule(wxAutoBufferedPaintDC &dc) (defined in PlotPanel)PlotPanelvirtual
drawGraticule(wxAutoBufferedPaintDC &pdc) (defined in PlotPanel)PlotPanelvirtual
GetLabelSize() (defined in PlotPanel)PlotPanelvirtual
GetZoomFactor(double zf) (defined in PlotPanel)PlotPanelvirtual
m_bmp (defined in PlotPanel)PlotPanel
m_Bufsz (defined in PlotPanel)PlotPanel
m_clip (defined in PlotPanel)PlotPanelprotected
m_h (defined in PlotPanel)PlotPanelprotected
m_firstPass (defined in PlotPanel)PlotPanelprotected
m_label_size (defined in PlotPanel)PlotPanel
m_left (defined in PlotPanel)PlotPanelprotected
m_mem (defined in PlotScatter)PlotScatterprotected
m_prev_x (defined in PlotPanel)PlotPanelprotected
m_prev_y (defined in PlotPanel)PlotPanelprotected
m_pTopFrame (defined in PlotPanel)PlotPanel
m_rectCtrl (defined in PlotPanel)PlotPanel
m_rectGrid (defined in PlotPanel)PlotPanel
m_rectPlot (defined in PlotPanel)PlotPanel
m_rubberBand (defined in PlotPanel)PlotPanelprotected
m_top (defined in PlotPanel)PlotPanelprotected
m_use_bitmap (defined in PlotPanel)PlotPanelprotected
m_w (defined in PlotPanel)PlotPanelprotected
m_rCtrl (defined in PlotPanel)PlotPanel
m_rCtrlPrev (defined in PlotPanel)PlotPanel
m_rGrid (defined in PlotPanel)PlotPanel
m_rPlot (defined in PlotPanel)PlotPanel
m_rubberBand (defined in PlotPanel)PlotPanelprotected
m_top (defined in PlotPanel)PlotPanelprotected
m_use_bitmap (defined in PlotPanel)PlotPanelprotected
m_x (defined in PlotPanel)PlotPanelprotected
m_y (defined in PlotPanel)PlotPanelprotected
m_zoomFactor (defined in PlotPanel)PlotPanelprotected
diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_scatter.html b/fdmdv2/fdmdv2-doc/html/class_plot_scatter.html index 0823b3df..e0874b4a 100644 --- a/fdmdv2/fdmdv2-doc/html/class_plot_scatter.html +++ b/fdmdv2/fdmdv2-doc/html/class_plot_scatter.html @@ -104,9 +104,9 @@ void OnPaint (wxPaintE void paintEvent (wxPaintEvent &evt)   - -virtual void drawGraticule (wxAutoBufferedPaintDC &dc) -  + +virtual void drawGraticule (wxAutoBufferedPaintDC &pdc) +  virtual double SetZoomFactor (double zf)   @@ -153,12 +153,6 @@ int m_x int m_y   - -int m_w -  - -int m_h int m_left   @@ -189,6 +183,9 @@ bool m_rubberBand bool m_mouseDown   + +bool m_firstPass double m_zoomFactor   @@ -205,15 +202,18 @@ wxPen m_penDotDash wxPen m_penSolid   - -wxRect m_rectCtrl -  - -wxRect m_rectGrid -  - -wxRect m_rectPlot -  + +wxRect m_rCtrlPrev +  + +wxRect m_rCtrl +  + +wxRect m_rGrid +  + +wxRect m_rPlot MainFramem_pTopFrame   @@ -243,7 +243,7 @@ wxNativePixelData * m_pBmp diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_spectrum-members.html b/fdmdv2/fdmdv2-doc/html/class_plot_spectrum-members.html index 2ff56229..bdb32a6c 100644 --- a/fdmdv2/fdmdv2-doc/html/class_plot_spectrum-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_plot_spectrum-members.html @@ -58,7 +58,7 @@ m_bmp (defined in PlotPanel)PlotPanel m_Bufsz (defined in PlotPanel)PlotPanel m_clip (defined in PlotPanel)PlotPanelprotected - m_h (defined in PlotPanel)PlotPanelprotected + m_firstPass (defined in PlotPanel)PlotPanelprotected m_label_size (defined in PlotPanel)PlotPanel m_left (defined in PlotPanel)PlotPanelprotected m_mouseDown (defined in PlotPanel)PlotPanelprotected @@ -73,13 +73,13 @@ m_prev_x (defined in PlotPanel)PlotPanelprotected m_prev_y (defined in PlotPanel)PlotPanelprotected m_pTopFrame (defined in PlotPanel)PlotPanel - m_rectCtrl (defined in PlotPanel)PlotPanel - m_rectGrid (defined in PlotPanel)PlotPanel - m_rectPlot (defined in PlotPanel)PlotPanel - m_rubberBand (defined in PlotPanel)PlotPanelprotected - m_top (defined in PlotPanel)PlotPanelprotected - m_use_bitmap (defined in PlotPanel)PlotPanelprotected - m_w (defined in PlotPanel)PlotPanelprotected + m_rCtrl (defined in PlotPanel)PlotPanel + m_rCtrlPrev (defined in PlotPanel)PlotPanel + m_rGrid (defined in PlotPanel)PlotPanel + m_rPlot (defined in PlotPanel)PlotPanel + m_rubberBand (defined in PlotPanel)PlotPanelprotected + m_top (defined in PlotPanel)PlotPanelprotected + m_use_bitmap (defined in PlotPanel)PlotPanelprotected m_x (defined in PlotPanel)PlotPanelprotected m_y (defined in PlotPanel)PlotPanelprotected m_zoomFactor (defined in PlotPanel)PlotPanelprotected @@ -102,7 +102,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_spectrum.html b/fdmdv2/fdmdv2-doc/html/class_plot_spectrum.html index dd7b1e47..6c53f00f 100644 --- a/fdmdv2/fdmdv2-doc/html/class_plot_spectrum.html +++ b/fdmdv2/fdmdv2-doc/html/class_plot_spectrum.html @@ -146,15 +146,18 @@ wxPen m_penDotDash wxPen m_penSolid   - -wxRect m_rectCtrl -  - -wxRect m_rectGrid -  - -wxRect m_rectPlot -  + +wxRect m_rCtrlPrev +  + +wxRect m_rCtrl +  + +wxRect m_rGrid +  + +wxRect m_rPlot MainFramem_pTopFrame   @@ -183,12 +186,6 @@ int m_x int m_y   - -int m_w -  - -int m_h int m_left   @@ -219,6 +216,9 @@ bool m_rubberBand bool m_mouseDown   + +bool m_firstPass double m_zoomFactor   @@ -230,7 +230,7 @@ double m_zoomFactor diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_waterfall-members.html b/fdmdv2/fdmdv2-doc/html/class_plot_waterfall-members.html index 348db6ea..4dd34e08 100644 --- a/fdmdv2/fdmdv2-doc/html/class_plot_waterfall-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_plot_waterfall-members.html @@ -51,7 +51,7 @@

This is the complete list of members for PlotWaterfall, including all inherited members.

- + @@ -59,11 +59,13 @@ - - + + + + @@ -76,13 +78,13 @@ - - - - - - - + + + + + + + @@ -94,20 +96,19 @@ - + - - - - - - - - + + + + + + +
draw(wxAutoBufferedPaintDC &dc) (defined in PlotWaterfall)PlotWaterfallprotectedvirtual
draw(wxAutoBufferedPaintDC &pdc) (defined in PlotWaterfall)PlotWaterfallprotectedvirtual
drawGraticule(wxAutoBufferedPaintDC &dc) (defined in PlotWaterfall)PlotWaterfallprotectedvirtual
GetLabelSize() (defined in PlotPanel)PlotPanelvirtual
GetZoomFactor(double zf) (defined in PlotPanel)PlotPanelvirtual
m_bmp (defined in PlotPanel)PlotPanel
m_Bufsz (defined in PlotPanel)PlotPanel
m_clip (defined in PlotPanel)PlotPanelprotected
m_greyscale (defined in PlotWaterfall)PlotWaterfallprotected
m_h (defined in PlotPanel)PlotPanelprotected
m_firstPass (defined in PlotPanel)PlotPanelprotected
m_greyscale (defined in PlotWaterfall)PlotWaterfallprotected
m_heatmap_lut (defined in PlotWaterfall)PlotWaterfallprotected
m_label_size (defined in PlotPanel)PlotPanel
m_left (defined in PlotPanel)PlotPanelprotected
m_line_color (defined in PlotWaterfall)PlotWaterfallprotected
m_mDC (defined in PlotWaterfall)PlotWaterfallprotected
m_mouseDown (defined in PlotPanel)PlotPanelprotected
m_newdata (defined in PlotPanel)PlotPanel
m_pBmp (defined in PlotPanel)PlotPanel
m_prev_x (defined in PlotPanel)PlotPanelprotected
m_prev_y (defined in PlotPanel)PlotPanelprotected
m_pTopFrame (defined in PlotPanel)PlotPanel
m_rectCtrl (defined in PlotPanel)PlotPanel
m_rectGrid (defined in PlotPanel)PlotPanel
m_rectPlot (defined in PlotPanel)PlotPanel
m_rubberBand (defined in PlotPanel)PlotPanelprotected
m_top (defined in PlotPanel)PlotPanelprotected
m_use_bitmap (defined in PlotPanel)PlotPanelprotected
m_w (defined in PlotPanel)PlotPanelprotected
m_rCtrl (defined in PlotPanel)PlotPanel
m_rCtrlPrev (defined in PlotPanel)PlotPanel
m_rGrid (defined in PlotPanel)PlotPanel
m_rPlot (defined in PlotPanel)PlotPanel
m_rubberBand (defined in PlotPanel)PlotPanelprotected
m_top (defined in PlotPanel)PlotPanelprotected
m_use_bitmap (defined in PlotPanel)PlotPanelprotected
m_x (defined in PlotPanel)PlotPanelprotected
m_y (defined in PlotPanel)PlotPanelprotected
m_zoomFactor (defined in PlotPanel)PlotPanelprotected
OnMouseWheelMoved(wxMouseEvent &event) (defined in PlotPanel)PlotPanel
OnPaint(wxPaintEvent &evt) (defined in PlotWaterfall)PlotWaterfallprotected
OnShow(wxShowEvent &event) (defined in PlotWaterfall)PlotWaterfallprotectedvirtual
OnSize(wxSizeEvent &event) (defined in PlotWaterfall)PlotWaterfallprotected
OnSize(wxSizeEvent &event) (defined in PlotPanel)PlotPanel
paintEvent(wxPaintEvent &evt) (defined in PlotPanel)PlotPanel
plotData(wxAutoBufferedPaintDC &dc) (defined in PlotWaterfall)PlotWaterfallprotected
PlotPanel(wxFrame *parent) (defined in PlotPanel)PlotPanel
plotPixelData(wxAutoBufferedPaintDC &dc) (defined in PlotWaterfall)PlotWaterfallprotected
PlotWaterfall(wxFrame *parent) (defined in PlotWaterfall)PlotWaterfall
SetLabelSize(double size) (defined in PlotPanel)PlotPanelvirtual
SetZoomFactor(double zf) (defined in PlotPanel)PlotPanelvirtual
~PlotPanel() (defined in PlotPanel)PlotPanel
~PlotWaterfall() (defined in PlotWaterfall)PlotWaterfall
PlotPanel(wxFrame *parent) (defined in PlotPanel)PlotPanel
plotPixelData(wxAutoBufferedPaintDC &dc) (defined in PlotWaterfall)PlotWaterfallprotected
PlotWaterfall(wxFrame *parent) (defined in PlotWaterfall)PlotWaterfall
SetLabelSize(double size) (defined in PlotPanel)PlotPanelvirtual
SetZoomFactor(double zf) (defined in PlotPanel)PlotPanelvirtual
~PlotPanel() (defined in PlotPanel)PlotPanel
~PlotWaterfall() (defined in PlotWaterfall)PlotWaterfall
diff --git a/fdmdv2/fdmdv2-doc/html/class_plot_waterfall.html b/fdmdv2/fdmdv2-doc/html/class_plot_waterfall.html index ab03fd08..37493c45 100644 --- a/fdmdv2/fdmdv2-doc/html/class_plot_waterfall.html +++ b/fdmdv2/fdmdv2-doc/html/class_plot_waterfall.html @@ -125,21 +125,15 @@ unsigned heatmap (floa void OnPaint (wxPaintEvent &evt)   - -void OnSize (wxSizeEvent &event) -  void OnShow (wxShowEvent &event)   void drawGraticule (wxAutoBufferedPaintDC &dc)   - -void draw (wxAutoBufferedPaintDC &dc) -  - -void plotData (wxAutoBufferedPaintDC &dc) -  + +void draw (wxAutoBufferedPaintDC &pdc) +  void plotPixelData (wxAutoBufferedPaintDC &dc)   @@ -152,6 +146,12 @@ unsigned m_heatmap_lut int m_greyscale   + +wxMemoryDC m_mDC +  + +int m_line_color- Protected Attributes inherited from PlotPanel int m_x @@ -159,12 +159,6 @@ int m_x int m_y   - -int m_w -  - -int m_h int m_left   @@ -195,6 +189,9 @@ bool m_rubberBand bool m_mouseDown   + +bool m_firstPass double m_zoomFactor   @@ -211,15 +208,18 @@ wxPen m_penDotDash wxPen m_penSolid   - -wxRect m_rectCtrl -  - -wxRect m_rectGrid -  - -wxRect m_rectPlot -  + +wxRect m_rCtrlPrev +  + +wxRect m_rCtrl +  + +wxRect m_rGrid +  + +wxRect m_rPlot MainFramem_pTopFrame   @@ -249,7 +249,7 @@ wxNativePixelData * m_pBmp 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 1cee9fdc..1472fcc1 100644 --- 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 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + @@ -93,12 +93,8 @@ - - - - - - + + @@ -111,7 +107,7 @@
abort() (defined in PortAudioWrap)PortAudioWrap
averageData(float mag_dB[]) (defined in PortAudioWrap)PortAudioWrap
getDefaultInputDevice() (defined in PortAudioWrap)PortAudioWrap
getDefaultOutputDevice() (defined in PortAudioWrap)PortAudioWrap
getDeviceInfo(PaDeviceIndex idx) (defined in PortAudioWrap)PortAudioWrap
getDeviceName(PaDeviceIndex dev) (defined in PortAudioWrap)PortAudioWrap
getFdmdvState() (defined in PortAudioWrap)PortAudioWrapinline
getFramesPerBuffer() const (defined in PortAudioWrap)PortAudioWrapinline
getInputBuffer() const (defined in PortAudioWrap)PortAudioWrapinline
getInputChannelCount() (defined in PortAudioWrap)PortAudioWrap
getInputDefaultLowLatency() (defined in PortAudioWrap)PortAudioWrap
getOutputBuffer() const (defined in PortAudioWrap)PortAudioWrapinline
getOutputChannelCount() (defined in PortAudioWrap)PortAudioWrap
getOutputDefaultLowLatency() (defined in PortAudioWrap)PortAudioWrap
getSamplerate() const (defined in PortAudioWrap)PortAudioWrapinline
getStatusFlags() const (defined in PortAudioWrap)PortAudioWrapinline
getStream() (defined in PortAudioWrap)PortAudioWrapinline
getUserData() (defined in PortAudioWrap)PortAudioWrapinline
isActive() const (defined in PortAudioWrap)PortAudioWrap
isOpen() const (defined in PortAudioWrap)PortAudioWrap
isStopped() const (defined in PortAudioWrap)PortAudioWrap
loadData() (defined in PortAudioWrap)PortAudioWrap
m_av_mag (defined in PortAudioWrap)PortAudioWrap
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) (defined in PortAudioWrap)PortAudioWrap
getDataAvail() (defined in PortAudioWrap)PortAudioWrapinline
getDefaultInputDevice() (defined in PortAudioWrap)PortAudioWrap
getDefaultOutputDevice() (defined in PortAudioWrap)PortAudioWrap
getDeviceInfo(PaDeviceIndex idx) (defined in PortAudioWrap)PortAudioWrap
getDeviceName(PaDeviceIndex dev) (defined in PortAudioWrap)PortAudioWrap
getFdmdvState() (defined in PortAudioWrap)PortAudioWrapinline
getFramesPerBuffer() const (defined in PortAudioWrap)PortAudioWrapinline
getInputBuffer() const (defined in PortAudioWrap)PortAudioWrapinline
getInputChannelCount() (defined in PortAudioWrap)PortAudioWrap
getInputDefaultLowLatency() (defined in PortAudioWrap)PortAudioWrap
getOutputBuffer() const (defined in PortAudioWrap)PortAudioWrapinline
getOutputChannelCount() (defined in PortAudioWrap)PortAudioWrap
getOutputDefaultLowLatency() (defined in PortAudioWrap)PortAudioWrap
getSamplerate() const (defined in PortAudioWrap)PortAudioWrapinline
getStatusFlags() const (defined in PortAudioWrap)PortAudioWrapinline
getStream() (defined in PortAudioWrap)PortAudioWrapinline
getUserData() (defined in PortAudioWrap)PortAudioWrapinline
isActive() const (defined in PortAudioWrap)PortAudioWrap
isOpen() const (defined in PortAudioWrap)PortAudioWrap
isStopped() const (defined in PortAudioWrap)PortAudioWrap
loadData() (defined in PortAudioWrap)PortAudioWrap
m_av_mag (defined in PortAudioWrap)PortAudioWrap
PortAudioWrap() (defined in PortAudioWrap)PortAudioWrap
setCallback(PaStreamCallback *streamCallback) (defined in PortAudioWrap)PortAudioWrap
setCallback(PaStreamCallback *m_pStreamCallback) (defined in PortAudioWrap)PortAudioWrap
setFdmdvState(FDMDV *fdmdv_state) (defined in PortAudioWrap)PortAudioWrapinline
setFramesPerBuffer(unsigned long size) (defined in PortAudioWrap)PortAudioWrap
setInputBuffer(const PaStreamParameters &inputBuffer) (defined in PortAudioWrap)PortAudioWrapinline
setOutputLatency(PaTime latency) (defined in PortAudioWrap)PortAudioWrap
setOutputSampleFormat(PaSampleFormat format) (defined in PortAudioWrap)PortAudioWrap
setSampleRate(unsigned long size) (defined in PortAudioWrap)PortAudioWrap
setSamplerate(int samplerate) (defined in PortAudioWrap)PortAudioWrapinline
setStatusFlags(const PaStreamCallbackFlags &statusFlags) (defined in PortAudioWrap)PortAudioWrapinline
setStream(PaStream *stream) (defined in PortAudioWrap)PortAudioWrapinline
setStreamCallback(PaStream *stream, PaStreamCallback *callback) (defined in PortAudioWrap)PortAudioWrapinline
setStreamFinishedCallback(PaStream *stream, PaStreamFinishedCallback *streamFinishedCallback) (defined in PortAudioWrap)PortAudioWrap
setStreamFinishedCallback(PaStreamFinishedCallback *streamFinishedCallback) (defined in PortAudioWrap)PortAudioWrapinline
setStreamCallback(PaStream *stream, PaStreamCallback *callback) (defined in PortAudioWrap)PortAudioWrapinline
setStreamFinishedCallback(PaStream *stream, PaStreamFinishedCallback *m_pStreamFinishedCallback) (defined in PortAudioWrap)PortAudioWrap
setStreamFlags(PaStreamFlags flags) (defined in PortAudioWrap)PortAudioWrap
setTimeInfo(PaStreamCallbackTimeInfo *timeInfo) (defined in PortAudioWrap)PortAudioWrapinline
setUserData(void *userData) (defined in PortAudioWrap)PortAudioWrapinline
diff --git a/fdmdv2/fdmdv2-doc/html/class_port_audio_wrap.html b/fdmdv2/fdmdv2-doc/html/class_port_audio_wrap.html index 43ec5bd0..4d22d486 100644 --- a/fdmdv2/fdmdv2-doc/html/class_port_audio_wrap.html +++ b/fdmdv2/fdmdv2-doc/html/class_port_audio_wrap.html @@ -55,9 +55,9 @@ - - + + @@ -76,18 +76,18 @@ PaError  - - + + - - - - + + + + @@ -130,51 +130,24 @@ PaError  - - - - - - - - - - - - - - - - - - @@ -184,18 +157,33 @@ const PaStreamParameters &  - - + + + + + + + + + + + + @@ -231,7 +219,7 @@ float 

Public Member Functions

-void 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)
 
+void averageData (float mag_dB[])
 
PaDeviceIndex getDefaultInputDevice ()
 
setSampleRate
PaError setStreamFlags (PaStreamFlags flags)
 
-PaError setCallback (PaStreamCallback *streamCallback)
 
+PaError setCallback (PaStreamCallback *m_pStreamCallback)
 
PaError setStreamCallback (PaStream *stream, PaStreamCallback *callback)
 
-PaError setStreamFinishedCallback (PaStream *stream, PaStreamFinishedCallback *streamFinishedCallback)
 
-PaError streamOpen ()
 
+PaError setStreamFinishedCallback (PaStream *stream, PaStreamFinishedCallback *m_pStreamFinishedCallback)
 
+void setInputBuffer (const PaStreamParameters &inputBuffer)
 
PaError setInputDevice (PaDeviceIndex dev)
 
setOutputSampleFor
PaError setOutputLatency (PaTime latency)
 
-PaError streamStart ()
 
-PaError streamClose ()
 
void setOutputHostApiStreamInfo (void *info=NULL)
 
PaTime getOutputDefaultLowLatency ()
 
-void averageData (float mag_dB[])
 
void setFdmdvState (FDMDV *fdmdv_state)
 
-void setInputBuffer (const PaStreamParameters &inputBuffer)
 
void setOutputBuffer (const PaStreamParameters &outputBuffer)
 
-void setSamplerate (int samplerate)
 
-void setStatusFlags (const PaStreamCallbackFlags &statusFlags)
 
-void setStream (PaStream *stream)
 
-void setStreamFinishedCallback (PaStreamFinishedCallback *streamFinishedCallback)
 
void setTimeInfo (PaStreamCallbackTimeInfo *timeInfo)
 
void setUserData (void *userData)
 
-FDMDV * getFdmdvState ()
 
unsigned long getFramesPerBuffer () const
 
const PaStreamParameters & getOutputBuffer () const
 
-int getSamplerate () const
 
const PaStreamCallbackFlags & getStatusFlags () const
 
+FDMDV * getFdmdvState ()
 
+int getSamplerate () const
 
PaStream * getStream ()
 
void * getUserData ()
 
+bool getDataAvail ()
 
+PaError streamStart ()
 
+PaError streamClose ()
 
+PaError streamOpen ()
 
void terminate ()
 
m_av_mag [FDMDV_ diff --git a/fdmdv2/fdmdv2-doc/html/class_top_frame-members.html b/fdmdv2/fdmdv2-doc/html/class_top_frame-members.html index 2249e4b6..33b7a33c 100644 --- a/fdmdv2/fdmdv2-doc/html/class_top_frame-members.html +++ b/fdmdv2/fdmdv2-doc/html/class_top_frame-members.html @@ -117,7 +117,7 @@
diff --git a/fdmdv2/fdmdv2-doc/html/class_top_frame.html b/fdmdv2/fdmdv2-doc/html/class_top_frame.html index beb89a02..1bb08888 100644 --- a/fdmdv2/fdmdv2-doc/html/class_top_frame.html +++ b/fdmdv2/fdmdv2-doc/html/class_top_frame.html @@ -276,7 +276,7 @@ wxStatusBar * m_statusBar1 diff --git a/fdmdv2/fdmdv2-doc/html/classes.html b/fdmdv2/fdmdv2-doc/html/classes.html index e1f14174..20be30ca 100644 --- a/fdmdv2/fdmdv2-doc/html/classes.html +++ b/fdmdv2/fdmdv2-doc/html/classes.html @@ -59,19 +59,18 @@ AboutDlg   MainApp   paCallBackData   
  T  
AudioDlg   DlgAbout   MainFrame   PlotPanel    -AudioStream   DlgAudio   
  O  
-PlotScalar   TopFrame   
  C  
-DlgComPorts   PlotScatter    -DlgOptions   OptionsDlg   PlotSpectrum    -COMP    +DlgAudio   
  O  
+PlotScalar   TopFrame    +DlgComPorts   PlotScatter    +COMP   DlgOptions   OptionsDlg   PlotSpectrum   
A | C | D | M | O | P | T
diff --git a/fdmdv2/fdmdv2-doc/html/comp_8h_source.html b/fdmdv2/fdmdv2-doc/html/comp_8h_source.html index 22fd3e80..670f7dda 100644 --- a/fdmdv2/fdmdv2-doc/html/comp_8h_source.html +++ b/fdmdv2/fdmdv2-doc/html/comp_8h_source.html @@ -91,7 +91,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/dlg__about_8h_source.html b/fdmdv2/fdmdv2-doc/html/dlg__about_8h_source.html index a80033e6..23491771 100644 --- a/fdmdv2/fdmdv2-doc/html/dlg__about_8h_source.html +++ b/fdmdv2/fdmdv2-doc/html/dlg__about_8h_source.html @@ -80,7 +80,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/dlg__audio_8h_source.html b/fdmdv2/fdmdv2-doc/html/dlg__audio_8h_source.html index 8648f7fa..c61812ac 100644 --- a/fdmdv2/fdmdv2-doc/html/dlg__audio_8h_source.html +++ b/fdmdv2/fdmdv2-doc/html/dlg__audio_8h_source.html @@ -98,7 +98,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/dlg__comports_8h_source.html b/fdmdv2/fdmdv2-doc/html/dlg__comports_8h_source.html index 5c3d2d6f..6611c186 100644 --- a/fdmdv2/fdmdv2-doc/html/dlg__comports_8h_source.html +++ b/fdmdv2/fdmdv2-doc/html/dlg__comports_8h_source.html @@ -79,7 +79,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/dlg__options_8h_source.html b/fdmdv2/fdmdv2-doc/html/dlg__options_8h_source.html index 159cf8be..1db6e003 100644 --- a/fdmdv2/fdmdv2-doc/html/dlg__options_8h_source.html +++ b/fdmdv2/fdmdv2-doc/html/dlg__options_8h_source.html @@ -82,7 +82,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/fdmdv2__defines_8h_source.html b/fdmdv2/fdmdv2-doc/html/fdmdv2__defines_8h_source.html index b6a80c23..ae142402 100644 --- a/fdmdv2/fdmdv2-doc/html/fdmdv2__defines_8h_source.html +++ b/fdmdv2/fdmdv2-doc/html/fdmdv2__defines_8h_source.html @@ -141,7 +141,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/fdmdv2__main_8h_source.html b/fdmdv2/fdmdv2-doc/html/fdmdv2__main_8h_source.html index 7c7f7826..080fa633 100644 --- a/fdmdv2/fdmdv2-doc/html/fdmdv2__main_8h_source.html +++ b/fdmdv2/fdmdv2-doc/html/fdmdv2__main_8h_source.html @@ -64,16 +64,16 @@
13 #include <wx/wx.h>
14 
15 #include "wx/file.h"
-
16 #include "wx/filename.h"
-
17 #include "wx/graphics.h"
-
18 #include "wx/mstream.h"
-
19 #include "wx/wfstream.h"
-
20 #include "wx/quantize.h"
-
21 #include "wx/scopedptr.h"
-
22 #include "wx/stopwatch.h"
-
23 #include "wx/versioninfo.h"
-
24 #include <wx/sound.h>
-
25 //#include <wx/thread.h>
+
16 #include "wx/config.h"
+
17 #include "wx/filename.h"
+
18 #include "wx/graphics.h"
+
19 #include "wx/mstream.h"
+
20 #include "wx/wfstream.h"
+
21 #include "wx/quantize.h"
+
22 #include "wx/scopedptr.h"
+
23 #include "wx/stopwatch.h"
+
24 #include "wx/versioninfo.h"
+
25 #include <wx/sound.h>
26 
27 #include "codec2.h"
28 #include "fdmdv.h"
@@ -92,158 +92,186 @@
41 #include "sndfile.h"
42 #include "portaudio.h"
43 
-
44 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
-
45 // Class MainApp
-
46 //
-
47 // @class $(Name)
-
48 // @author $(User)
-
49 // @date $(Date)
-
50 // @file $(CurrentFileName).$(CurrentFileExt)
-
51 // @brief
-
52 //
-
53 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
-
54 class MainApp : public wxApp
-
55 {
-
56  public:
-
57  virtual bool OnInit();
-
58  virtual int OnExit()
-
59  {
-
60  return 0;
-
61  }
-
62 
-
63  protected:
-
64 };
-
65 
-
66 // declare global static function wxGetApp()
-
67 DECLARE_APP(MainApp)
-
68 
-
69 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
-
70 // Class MainFrame
-
71 //
-
72 // @class $(Name)
-
73 // @author $(User)
-
74 // @date $(Date)
-
75 // @file $(CurrentFileName).$(CurrentFileExt)
-
76 // @brief
-
77 //
-
78 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
-
79 class MainFrame : public TopFrame
-
80 {
-
81  public:
-
82  MainFrame(wxWindow *parent);
-
83  virtual ~MainFrame();
-
84 
-
85  PlotPanel* m_panelDefaultA;
-
86  PlotSpectrum* m_panelSpectrum;
-
87  PlotWaterfall* m_panelWaterfall;
-
88  PlotScatter* m_panelScatter;
-
89  PlotScalar* m_panelScalar;
-
90  bool m_SquelchActive;
-
91  bool m_RxRunning;
-
92  bool m_TxRunning;
-
93  CODEC2 *m_RXCodec2;
-
94  CODEC2 *m_TXCodec2;
-
95  PortAudioWrap *m_rxPa;
-
96  PortAudioWrap *m_txPa;
-
97  PaDeviceIndex m_rxDevIn;
-
98  PaDeviceIndex m_rxDevOut;
-
99  PaDeviceIndex m_txDevIn;
-
100  PaDeviceIndex m_txDevOut;
-
101  PaError m_rxErr;
-
102  PaError m_txErr;
-
103  wxSound *m_sound;
-
104 
-
105  static int rxCallback(
-
106  const void *inBuffer,
-
107  void *outBuffer,
-
108  unsigned long framesPerBuffer,
-
109  const PaStreamCallbackTimeInfo *outTime,
-
110  PaStreamCallbackFlags statusFlags,
-
111  void *userData
-
112  );
-
113  static int txCallback(
-
114  const void *inBuffer,
-
115  void *outBuffer,
-
116  unsigned long framesPerBuffer,
-
117  const PaStreamCallbackTimeInfo *outTime,
-
118  PaStreamCallbackFlags statusFlags,
-
119  void *userData
-
120  );
-
121 
-
122  protected:
-
123  // protected event handlers
-
124  virtual void OnCloseFrame(wxCloseEvent& event);
-
125  virtual void OnExitClick(wxCommandEvent& event);
-
126 
-
127  void startTxStream();
-
128  void startRxStream();
-
129  void stopTxStream();
-
130  void stopRxStream();
-
131  void abortTxStream();
-
132  void abortRxStream();
-
133  void OnOpen( wxCommandEvent& event );
-
134  void OnOpenUpdateUI( wxUpdateUIEvent& event );
-
135  void OnSave( wxCommandEvent& event );
-
136  void OnSaveUpdateUI( wxUpdateUIEvent& event );
-
137  void OnClose( wxCommandEvent& event );
-
138  void OnCloseUpdateUI( wxUpdateUIEvent& event );
-
139  void OnExit( wxCommandEvent& event );
-
140  void OnCopy( wxCommandEvent& event );
-
141  void OnCopyUpdateUI( wxUpdateUIEvent& event );
-
142  void OnCut( wxCommandEvent& event );
-
143  void OnCutUpdateUI( wxUpdateUIEvent& event );
-
144  void OnPaste( wxCommandEvent& event );
-
145  void OnPasteUpdateUI( wxUpdateUIEvent& event );
-
146  void OnToolsAudio( wxCommandEvent& event );
-
147  void OnToolsAudioUI( wxUpdateUIEvent& event );
-
148  void OnToolsComCfg( wxCommandEvent& event );
-
149  void OnToolsComCfgUI( wxUpdateUIEvent& event );
-
150  void OnToolsOptions( wxCommandEvent& event );
-
151  void OnToolsOptionsUI( wxUpdateUIEvent& event );
-
152  void OnCaptureRxStream( wxCommandEvent& event );
-
153  void OnCaptureTxStream( wxCommandEvent& event );
-
154  void OnPlayAudioFile( wxCommandEvent& event );
-
155  void OnHelpCheckUpdates( wxCommandEvent& event );
-
156  void OnHelpCheckUpdatesUI( wxUpdateUIEvent& event );
-
157  void OnHelpAbout( wxCommandEvent& event );
-
158  void OnCmdSliderScroll( wxScrollEvent& event );
-
159  void OnSliderScrollBottom( wxScrollEvent& event );
-
160  void OnCmdSliderScrollChanged( wxScrollEvent& event );
-
161  void OnSliderScrollTop( wxScrollEvent& event );
-
162  void OnCheckSQClick( wxCommandEvent& event );
-
163  // Toggle Buttons
-
164  void OnTogBtnSplitClick(wxCommandEvent& event);
-
165  void OnTogBtnAnalogClick(wxCommandEvent& event);
-
166  void OnTogBtnALCClick(wxCommandEvent& event);
-
167  void OnTogBtnRxID( wxCommandEvent& event );
-
168  void OnTogBtnTxID( wxCommandEvent& event );
-
169  void OnTogBtnTXClick( wxCommandEvent& event );
-
170  void OnTogBtnOnOff( wxCommandEvent& event );
-
171  void OnPaint(wxPaintEvent& event);
-
172  void OnClose( wxCloseEvent& event );
-
173  void OnSize( wxSizeEvent& event );
-
174  void OnUpdateUI( wxUpdateUIEvent& event );
-
175 
-
176  wxString LoadUserImage(wxImage& image);
-
177 
-
178  private:
-
179  bool CreateSound(wxSound& snd) const;
-
180 
-
181  wxString m_soundFile;
-
182 #ifdef __WXMSW__
-
183  wxString m_soundRes;
-
184 #endif // __WXMSW__
-
185  bool m_useMemory;
-
186 
-
187  wxTextCtrl* m_tc;
-
188  int m_zoom;
-
189 };
-
190 
-
191 #endif //__FDMDV2_MAIN__
+
44 #define USE_TIMER 1
+
45 
+
46 enum {
+
47  ID_START = wxID_HIGHEST,
+
48  ID_TIMER_WATERFALL,
+
49  ID_TIMER_SPECTRUM,
+
50  ID_TIMER_SCATTER,
+
51  ID_TIMER_SCALAR
+
52  };
+
53 
+
54 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
+
55 // Class MainApp
+
56 //
+
57 // @class $(Name)
+
58 // @author $(User)
+
59 // @date $(Date)
+
60 // @file $(CurrentFileName).$(CurrentFileExt)
+
61 // @brief
+
62 //
+
63 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
+
64 class MainApp : public wxApp
+
65 {
+
66  public:
+
67  virtual bool OnInit();
+
68  virtual int OnExit()
+
69  {
+
70  return 0;
+
71  }
+
72  bool loadConfig();
+
73  protected:
+
74  wxConfig *g_config;
+
75 };
+
76 
+
77 // declare global static function wxGetApp()
+
78 DECLARE_APP(MainApp)
+
79 
+
80 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
+
81 // Class MainFrame
+
82 //
+
83 // @class $(Name)
+
84 // @author $(User)
+
85 // @date $(Date)
+
86 // @file $(CurrentFileName).$(CurrentFileExt)
+
87 // @brief
+
88 //
+
89 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
+
90 class MainFrame : public TopFrame
+
91 {
+
92  public:
+
93  MainFrame(wxWindow *parent);
+
94  virtual ~MainFrame();
+
95 
+
96  PlotPanel* m_panelDefaultA;
+
97  PlotSpectrum* m_panelSpectrum;
+
98  PlotWaterfall* m_panelWaterfall;
+
99  PlotScatter* m_panelScatter;
+
100  PlotScalar* m_panelScalar;
+
101  bool m_SquelchActive;
+
102  bool m_RxRunning;
+
103  bool m_TxRunning;
+
104  CODEC2 *m_RXCodec2;
+
105  CODEC2 *m_TXCodec2;
+
106  PortAudioWrap *m_rxPa;
+
107  PortAudioWrap *m_txPa;
+
108  PaDeviceIndex m_rxDevIn;
+
109  PaDeviceIndex m_rxDevOut;
+
110  PaDeviceIndex m_txDevIn;
+
111  PaDeviceIndex m_txDevOut;
+
112  PaError m_rxErr;
+
113  PaError m_txErr;
+
114  wxSound *m_sound;
+
115  struct FDMDV *m_pFDMDV_state;
+
116  wxTimer m_plotTimer;
+
117 
+
118  static int rxCallback(
+
119  const void *inBuffer,
+
120  void *outBuffer,
+
121  unsigned long framesPerBuffer,
+
122  const PaStreamCallbackTimeInfo *outTime,
+
123  PaStreamCallbackFlags statusFlags,
+
124  void *userData
+
125  );
+
126  static int txCallback(
+
127  const void *inBuffer,
+
128  void *outBuffer,
+
129  unsigned long framesPerBuffer,
+
130  const PaStreamCallbackTimeInfo *outTime,
+
131  PaStreamCallbackFlags statusFlags,
+
132  void *userData
+
133  );
+
134 
+
135  void per_frame_rx_processing(
+
136  short output_buf[], // output buf of decoded speech samples
+
137  int *n_output_buf, // how many samples currently in output_buf[]
+
138  int codec_bits[], // current frame of bits for decoder
+
139  short input_buf[], // input buf of modem samples input to demod
+
140  int *n_input_buf, // how many samples currently in input_buf[]
+
141  int *nin, // amount of samples demod needs for next call
+
142  int *state, // used to collect codec_bits[] halves
+
143  struct CODEC2 *c2 // Codec 2 states
+
144  );
+
145 
+
146  protected:
+
147  // protected event handlers
+
148  virtual void OnCloseFrame(wxCloseEvent& event);
+
149  virtual void OnExitClick(wxCommandEvent& event);
+
150 
+
151  void averageData(float mag_dB[]);
+
152  void startTxStream();
+
153  void startRxStream();
+
154  void stopTxStream();
+
155  void stopRxStream();
+
156  void abortTxStream();
+
157  void abortRxStream();
+
158 
+
159  void OnOpen( wxCommandEvent& event );
+
160  void OnOpenUpdateUI( wxUpdateUIEvent& event );
+
161  void OnSave( wxCommandEvent& event );
+
162  void OnSaveUpdateUI( wxUpdateUIEvent& event );
+
163  void OnClose( wxCommandEvent& event );
+
164  void OnCloseUpdateUI( wxUpdateUIEvent& event );
+
165  void OnExit( wxCommandEvent& event );
+
166  void OnCopy( wxCommandEvent& event );
+
167  void OnCopyUpdateUI( wxUpdateUIEvent& event );
+
168  void OnCut( wxCommandEvent& event );
+
169  void OnCutUpdateUI( wxUpdateUIEvent& event );
+
170  void OnPaste( wxCommandEvent& event );
+
171  void OnPasteUpdateUI( wxUpdateUIEvent& event );
+
172  void OnToolsAudio( wxCommandEvent& event );
+
173  void OnToolsAudioUI( wxUpdateUIEvent& event );
+
174  void OnToolsComCfg( wxCommandEvent& event );
+
175  void OnToolsComCfgUI( wxUpdateUIEvent& event );
+
176  void OnToolsOptions( wxCommandEvent& event );
+
177  void OnToolsOptionsUI( wxUpdateUIEvent& event );
+
178  void OnCaptureRxStream( wxCommandEvent& event );
+
179  void OnCaptureTxStream( wxCommandEvent& event );
+
180  void OnPlayAudioFile( wxCommandEvent& event );
+
181  void OnHelpCheckUpdates( wxCommandEvent& event );
+
182  void OnHelpCheckUpdatesUI( wxUpdateUIEvent& event );
+
183  void OnHelpAbout( wxCommandEvent& event );
+
184  void OnCmdSliderScroll( wxScrollEvent& event );
+
185  void OnSliderScrollBottom( wxScrollEvent& event );
+
186  void OnCmdSliderScrollChanged( wxScrollEvent& event );
+
187  void OnSliderScrollTop( wxScrollEvent& event );
+
188  void OnCheckSQClick( wxCommandEvent& event );
+
189 
+
190  // Toggle Buttons
+
191  void OnTogBtnSplitClick(wxCommandEvent& event);
+
192  void OnTogBtnAnalogClick(wxCommandEvent& event);
+
193  void OnTogBtnALCClick(wxCommandEvent& event);
+
194  void OnTogBtnRxID( wxCommandEvent& event );
+
195  void OnTogBtnTxID( wxCommandEvent& event );
+
196  void OnTogBtnTXClick( wxCommandEvent& event );
+
197  void OnTogBtnOnOff( wxCommandEvent& event );
+
198 
+
199  //System Events
+
200  void OnPaint(wxPaintEvent& event);
+
201  void OnClose( wxCloseEvent& event );
+
202  void OnSize( wxSizeEvent& event );
+
203  void OnUpdateUI( wxUpdateUIEvent& event );
+
204  void OnTimer(wxTimerEvent &evt);
+
205 
+
206  wxString LoadUserImage(wxImage& image);
+
207 
+
208  private:
+
209  bool CreateSound(wxSound& snd) const;
+
210  wxString m_soundFile;
+
211 #ifdef __WXMSW__
+
212  wxString m_soundRes;
+
213 #endif // __WXMSW__
+
214  bool m_useMemory;
+
215  wxTextCtrl* m_tc;
+
216  int m_zoom;
+
217 };
+
218 
+
219 #endif //__FDMDV2_MAIN__
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 8040b9a2..e4e64203 100644 --- 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 @@
47  float m_av_mag[FDMDV_NSPEC];
48 
49  private:
-
50  PaStream *stream;
-
51  PaStreamParameters inputBuffer;
-
52  PaStreamParameters outputBuffer;
-
53  void *userData;
-
54  int samplerate;
-
55  unsigned long framesPerBuffer;
-
56  PaStreamCallbackFlags statusFlags;
-
57  PaStreamCallback *streamCallback;
-
58  PaStreamFinishedCallback *streamFinishedCallback;
-
59  const PaStreamCallbackTimeInfo *timeInfo;
-
60  struct FDMDV *fdmdv_state;
-
61 
-
62  public:
-
63  void per_frame_rx_processing(
-
64  short output_buf[], /* output buf of decoded speech samples */
-
65  int *n_output_buf, /* how many samples currently in output_buf[] */
-
66  int codec_bits[], /* current frame of bits for decoder */
-
67  short input_buf[], /* input buf of modem samples input to demod */
-
68  int *n_input_buf, /* how many samples currently in input_buf[] */
-
69  int *nin, /* amount of samples demod needs for next call */
-
70  int *state, /* used to collect codec_bits[] halves */
-
71  struct CODEC2 *c2 /* Codec 2 states */
-
72  );
+
50  PaStream *m_pStream;
+
51  void *m_pUserData;
+
52  PaStreamCallback *m_pStreamCallback;
+
53  PaStreamFinishedCallback *m_pStreamFinishedCallback;
+
54  const PaStreamCallbackTimeInfo *m_pTimeInfo;
+
55  struct FDMDV *m_pFDMDV_state;
+
56  PaStreamParameters m_inputBuffer;
+
57  PaStreamParameters m_outputBuffer;
+
58  int m_samplerate;
+
59  unsigned long m_framesPerBuffer;
+
60  PaStreamCallbackFlags m_statusFlags;
+
61  bool m_newdata;
+
62 
+
63  public:
+
64 
+
65  void averageData(float mag_dB[]);
+
66 
+
67  PaDeviceIndex getDefaultInputDevice();
+
68  PaDeviceIndex getDefaultOutputDevice();
+
69  PaStreamParameters *getDeviceInfo(PaDeviceIndex idx);
+
70 
+
71  PaError setFramesPerBuffer(unsigned long size);
+
72  PaError setSampleRate(unsigned long size);
73 
-
74  /*
-
75  static int Callback(
-
76  const void *inBuffer,
-
77  void *outBuffer,
-
78  unsigned long framesPerBuffer,
-
79  const PaStreamCallbackTimeInfo *outTime,
-
80  PaStreamCallbackFlags statusFlags,
-
81  void *userData
-
82  );
-
83  static int txCallback(
-
84  const void *inBuffer,
-
85  void *outBuffer,
-
86  unsigned long framesPerBuffer,
-
87  const PaStreamCallbackTimeInfo *outTime,
-
88  PaStreamCallbackFlags statusFlags,
-
89  void *userData
-
90  );
-
91  */
-
92 
-
93  PaDeviceIndex getDefaultInputDevice();
-
94  PaDeviceIndex getDefaultOutputDevice();
-
95  PaStreamParameters *getDeviceInfo(PaDeviceIndex idx);
-
96 
-
97  PaError setFramesPerBuffer(unsigned long size);
-
98  PaError setSampleRate(unsigned long size);
-
99  PaError setStreamFlags(PaStreamFlags flags);
-
100  PaError setCallback(PaStreamCallback *streamCallback);
-
101  PaError setStreamCallback(PaStream *stream, PaStreamCallback* callback) { streamCallback = callback; return 0;}
-
102  PaError setStreamFinishedCallback(PaStream *stream, PaStreamFinishedCallback* streamFinishedCallback);
-
103  PaError streamOpen();
-
104 
-
105  PaError setInputDevice(PaDeviceIndex dev);
-
106  PaError setInputChannelCount(int count);
-
107  int getInputChannelCount();
-
108  PaError setInputSampleFormat(PaSampleFormat format);
-
109  PaError setInputSampleRate(PaSampleFormat format);
-
110  PaError setInputLatency(PaTime latency);
-
111  void setInputHostApiStreamInfo(void *info = NULL);
-
112  PaTime getInputDefaultLowLatency();
-
113  const char *getDeviceName(PaDeviceIndex dev);
-
114 
-
115  PaError setOutputDevice(PaDeviceIndex dev);
-
116  PaError setOutputChannelCount(int count);
-
117  const int getOutputChannelCount();
-
118  PaError setOutputSampleFormat(PaSampleFormat format);
-
119  PaError setOutputLatency(PaTime latency);
-
120  PaError streamStart();
-
121  PaError streamClose();
-
122  void setOutputHostApiStreamInfo(void *info = NULL);
-
123  PaTime getOutputDefaultLowLatency();
-
124  void averageData(float mag_dB[]);
-
125 
-
126  void setFdmdvState(FDMDV* fdmdv_state) {this->fdmdv_state = fdmdv_state;}
-
127 // void setFramesPerBuffer(unsigned long framesPerBuffer) {this->framesPerBuffer = framesPerBuffer;}
-
128  void setInputBuffer(const PaStreamParameters& inputBuffer) {this->inputBuffer = inputBuffer;}
-
129 // void setAvMag(float av_mag) {this->m_av_mag = av_mag;}
-
130  void setOutputBuffer(const PaStreamParameters& outputBuffer) {this->outputBuffer = outputBuffer;}
-
131  void setSamplerate(int samplerate) {this->samplerate = samplerate;}
-
132  void setStatusFlags(const PaStreamCallbackFlags& statusFlags) {this->statusFlags = statusFlags;}
-
133  void setStream(PaStream* stream) {this->stream = stream;}
-
134 // void setStreamCallback(PaStreamCallback* streamCallback) {this->streamCallback = streamCallback;}
-
135  void setStreamFinishedCallback(PaStreamFinishedCallback* streamFinishedCallback) {this->streamFinishedCallback = streamFinishedCallback;}
-
136  void setTimeInfo(PaStreamCallbackTimeInfo* timeInfo) {this->timeInfo = timeInfo;}
-
137  void setUserData(void* userData) {this->userData = userData;}
-
138  FDMDV* getFdmdvState() {return fdmdv_state;}
-
139  unsigned long getFramesPerBuffer() const {return framesPerBuffer;}
-
140  const PaStreamParameters& getInputBuffer() const {return inputBuffer;}
-
141 // const float *getAvMag(int idx) const {return (float *)&m_av_mag[idx];}
-
142  const PaStreamParameters& getOutputBuffer() const {return outputBuffer;}
-
143  int getSamplerate() const {return samplerate;}
-
144  const PaStreamCallbackFlags& getStatusFlags() const {return statusFlags;}
-
145  PaStream* getStream() {return stream;}
-
146 // PaStreamCallback* getStreamCallback() {return streamCallback;}
-
147 // PaStreamFinishedCallback* getStreamFinishedCallback() {return streamFinishedCallback;}
-
148 // PaStreamCallbackTimeInfo* getTimeInfo() {return timeInfo;}
-
149  void *getUserData() {return userData;}
-
150 
-
151  void terminate();
-
152  void stop();
-
153  void abort();
-
154  bool isOpen() const;
-
155  bool isStopped() const;
-
156  bool isActive() const;
-
157  void loadData();
-
158 };
+
74  PaError setStreamFlags(PaStreamFlags flags);
+
75  PaError setCallback(PaStreamCallback *m_pStreamCallback);
+
76  PaError setStreamCallback(PaStream *stream, PaStreamCallback* callback) { m_pStreamCallback = callback; return 0;}
+
77  PaError setStreamFinishedCallback(PaStream *stream, PaStreamFinishedCallback* m_pStreamFinishedCallback);
+
78 
+
79  void setInputBuffer(const PaStreamParameters& inputBuffer) {this->m_inputBuffer = inputBuffer;}
+
80  PaError setInputDevice(PaDeviceIndex dev);
+
81  PaError setInputChannelCount(int count);
+
82  int getInputChannelCount();
+
83  PaError setInputSampleFormat(PaSampleFormat format);
+
84  PaError setInputSampleRate(PaSampleFormat format);
+
85  PaError setInputLatency(PaTime latency);
+
86  void setInputHostApiStreamInfo(void *info = NULL);
+
87  PaTime getInputDefaultLowLatency();
+
88  const char *getDeviceName(PaDeviceIndex dev);
+
89 
+
90  PaError setOutputDevice(PaDeviceIndex dev);
+
91  PaError setOutputChannelCount(int count);
+
92  const int getOutputChannelCount();
+
93  PaError setOutputSampleFormat(PaSampleFormat format);
+
94  PaError setOutputLatency(PaTime latency);
+
95  void setOutputHostApiStreamInfo(void *info = NULL);
+
96  PaTime getOutputDefaultLowLatency();
+
97 
+
98  void setFdmdvState(FDMDV* fdmdv_state) {this->m_pFDMDV_state = fdmdv_state;}
+
99  void setOutputBuffer(const PaStreamParameters& outputBuffer) {this->m_outputBuffer = outputBuffer;}
+
100  void setTimeInfo(PaStreamCallbackTimeInfo* timeInfo) {this->m_pTimeInfo = timeInfo;}
+
101  void setUserData(void* userData) {this->m_pUserData = userData;}
+
102  unsigned long getFramesPerBuffer() const {return m_framesPerBuffer;}
+
103  const PaStreamParameters& getInputBuffer() const {return m_inputBuffer;}
+
104  const PaStreamParameters& getOutputBuffer() const {return m_outputBuffer;}
+
105  const PaStreamCallbackFlags& getStatusFlags() const {return m_statusFlags;}
+
106 
+
107  FDMDV* getFdmdvState() {return m_pFDMDV_state;}
+
108  int getSamplerate() const {return m_samplerate;}
+
109  PaStream* getStream() {return m_pStream;}
+
110  void *getUserData() {return m_pUserData;}
+
111  bool getDataAvail() {return m_newdata;}
+
112  PaError streamStart();
+
113  PaError streamClose();
+
114  PaError streamOpen();
+
115  void terminate();
+
116  void stop();
+
117  void abort();
+
118  bool isOpen() const;
+
119  bool isStopped() const;
+
120  bool isActive() const;
+
121  void loadData();
+
122 };
diff --git a/fdmdv2/fdmdv2-doc/html/fdmdv2__plot_8h_source.html b/fdmdv2/fdmdv2-doc/html/fdmdv2__plot_8h_source.html index 2c4f7f0b..aad237b3 100644 --- a/fdmdv2/fdmdv2-doc/html/fdmdv2__plot_8h_source.html +++ b/fdmdv2/fdmdv2-doc/html/fdmdv2__plot_8h_source.html @@ -67,9 +67,9 @@
16 #include <wx/image.h>
17 #include <wx/dcbuffer.h>
18 
-
19 #define MAX_ZOOM 7
-
20 #define MAX_BMP_X (400 * MAX_ZOOM)
-
21 #define MAX_BMP_Y (400 * MAX_ZOOM)
+
19 #define MAX_ZOOM 7
+
20 #define MAX_BMP_X (400 * MAX_ZOOM)
+
21 #define MAX_BMP_Y (400 * MAX_ZOOM)
22 
23 #define wxUSE_FILEDLG 1
24 #define wxUSE_LIBPNG 1
@@ -83,119 +83,124 @@
32 #define XLEFT_TEXT_OFFSET 8
33 #define YBOTTOM_OFFSET 25
34 #define GRID_INCREMENT 50
-
35 #define GREY_COLOR wxColor(0x80, 0x80, 0x80)
-
36 #define BLACK_COLOR wxColor(0x00, 0x00, 0x00)
-
37 
-
38 #define BLUE_COLOR wxColor(0x00, 0x00, 0xFF)
-
39 #define LIGHT_BLUE_COLOR wxColor(0x80, 0x80, 0xFF)
-
40 
-
41 #define RED_COLOR wxColor(0xFF, 0x5E, 0x5E)
-
42 #define LIGHT_RED_COLOR wxColor(0xFF, 0xE0, 0xE0)
-
43 #define DARK_RED_COLOR wxColor(0xFF, 0x00, 0x00)
-
44 #define PINK_COLOR wxColor(0xFF, 0x80, 0xFF)
-
45 
-
46 #define LIGHT_GREEN_COLOR wxColor(0xE3, 0xFF, 0xE0)
-
47 #define GREEN_COLOR wxColor(0x95, 0xFF, 0x8A)
-
48 #define DARK_GREEN_COLOR wxColor(0x20, 0xFF, 0x08)
-
49 #define VERY_GREEN_COLOR wxColor(0x00, 0xFF, 0x00)
-
50 
-
51 #define YELLOW_COLOR wxColor(0xFF, 0xFF, 0x5E)
-
52 #define LIGHT_YELLOW_COLOR wxColor(0xFF, 0xFF, 0xB5)
-
53 #define DARK_YELLOW_COLOR wxColor(0xFF, 0xFF, 0x08)
-
54 
-
55 /*
-
56  wxNullBrush
-
57  wxBLACK_BRUSH
-
58  wxBLUE_BRUSH
-
59  wxCYAN_BRUSH
-
60  wxGREEN_BRUSH
-
61  wxYELLOW_BRUSH
-
62  wxGREY_BRUSH
-
63  wxLIGHT_GREY_BRUSH
-
64  wxMEDIUM_GREY_BRUSH
-
65  wxRED_BRUSH
-
66  wxTRANSPARENT_BRUSH
-
67  wxWHITE_BRUSH
-
68 */
-
69 
-
70 class MainFrame;
-
71 
-
72 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
-
73 // Class PlotPanel
-
74 //
-
75 // @class $(Name)
-
76 // @author $(User)
-
77 // @date $(Date)
-
78 // @file $(CurrentFileName).$(CurrentFileExt)
-
79 // @brief
-
80 //
-
81 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
-
82 class PlotPanel : public wxPanel
-
83 {
-
84  public:
-
85  PlotPanel(wxFrame* parent);
-
86  ~PlotPanel();
-
87  wxPen m_penShortDash;
-
88  wxPen m_penDotDash;
-
89  wxPen m_penSolid;
-
90  wxRect m_rectCtrl;
-
91  wxRect m_rectGrid;
-
92  wxRect m_rectPlot;
-
93  MainFrame *m_pTopFrame;
-
94  wxAuiNotebook *m_pNoteBook;
-
95  double m_label_size;
-
96  wxSize m_Bufsz;
-
97  bool m_newdata;
-
98  wxBitmap *m_bmp;
-
99  wxNativePixelData *m_pBmp;
-
100 
-
101  // some useful events
-
102  void OnMouseMove(wxMouseEvent& event);
-
103  void OnMouseDown(wxMouseEvent& event);
-
104  void OnMouseUp(wxMouseEvent& event);
-
105  void OnMouseWheelMoved(wxMouseEvent& event);
-
106  void OnClose(wxCloseEvent& event ){ event.Skip(); }
-
107  void OnSize( wxSizeEvent& event );
-
108  void OnErase(wxEraseEvent& event);
-
109  void OnPaint(wxPaintEvent& event);
-
110  //void OnUpdateUI( wxUpdateUIEvent& event ){ event.Skip(); }
-
111 
-
112  void paintEvent(wxPaintEvent & evt);
-
113  virtual void draw(wxAutoBufferedPaintDC& dc);
-
114  virtual void drawGraticule(wxAutoBufferedPaintDC& dc);
-
115  virtual double SetZoomFactor(double zf);
-
116  virtual double GetZoomFactor(double zf);
-
117  virtual void OnShow(wxShowEvent& event);
-
118  virtual double GetLabelSize();
-
119  virtual void SetLabelSize(double size);
-
120 
-
121  protected:
-
122  int m_x;
-
123  int m_y;
-
124  int m_w;
-
125  int m_h;
-
126  int m_left;
-
127  int m_top;
-
128  int m_prev_w;
-
129  int m_prev_h;
-
130  int m_prev_x;
-
131  int m_prev_y;
-
132  bool m_use_bitmap;
-
133  bool m_clip;
-
134  bool m_rubberBand;
-
135  bool m_mouseDown;
-
136  double m_zoomFactor;
-
137 // int m_gridLeftOffset;
-
138 // int m_gridRightOffset;
-
139 // int m_gridTopOffset;
-
140 // int m_gridBottomOffset;
-
141  DECLARE_EVENT_TABLE()
-
142 };
-
143 #endif //__FDMDV2_PLOT__
+
35 
+
36 #define BLACK_COLOR wxColor(0x00, 0x00, 0x00)
+
37 #define GREY_COLOR wxColor(0x80, 0x80, 0x80)
+
38 #define DARK_GREY_COLOR wxColor(0x60, 0x60, 0x60)
+
39 #define MEDIUM_GREY_COLOR wxColor(0xC0, 0xC0, 0xC0)
+
40 #define LIGHT_GREY_COLOR wxColor(0xE0, 0xE0, 0xE0)
+
41 #define VERY_LTGREY_COLOR wxColor(0xF8, 0xF8, 0xF8)
+
42 #define WHITE_COLOR wxColor(0xFF, 0xFF, 0xFF)
+
43 
+
44 #define BLUE_COLOR wxColor(0x00, 0x00, 0xFF)
+
45 #define LIGHT_BLUE_COLOR wxColor(0x80, 0x80, 0xFF)
+
46 
+
47 #define RED_COLOR wxColor(0xFF, 0x5E, 0x5E)
+
48 #define LIGHT_RED_COLOR wxColor(0xFF, 0xE0, 0xE0)
+
49 #define DARK_RED_COLOR wxColor(0xFF, 0x00, 0x00)
+
50 #define PINK_COLOR wxColor(0xFF, 0x80, 0xFF)
+
51 
+
52 #define LIGHT_GREEN_COLOR wxColor(0xE3, 0xFF, 0xE0)
+
53 #define GREEN_COLOR wxColor(0x95, 0xFF, 0x8A)
+
54 #define DARK_GREEN_COLOR wxColor(0x20, 0xFF, 0x08)
+
55 #define VERY_GREEN_COLOR wxColor(0x00, 0xFF, 0x00)
+
56 
+
57 #define YELLOW_COLOR wxColor(0xFF, 0xFF, 0x5E)
+
58 #define LIGHT_YELLOW_COLOR wxColor(0xFF, 0xFF, 0xB5)
+
59 #define DARK_YELLOW_COLOR wxColor(0xFF, 0xFF, 0x08)
+
60 
+
61 
+
62 /*
+
63  wxNullBrush
+
64  wxBLACK_BRUSH
+
65  wxBLUE_BRUSH
+
66  wxCYAN_BRUSH
+
67  wxGREEN_BRUSH
+
68  wxYELLOW_BRUSH
+
69  wxGREY_BRUSH
+
70  wxLIGHT_GREY_BRUSH
+
71  wxMEDIUM_GREY_BRUSH
+
72  wxRED_BRUSH
+
73  wxTRANSPARENT_BRUSH
+
74  wxWHITE_BRUSH
+
75 */
+
76 
+
77 class MainFrame;
+
78 
+
79 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
+
80 // Class PlotPanel
+
81 //
+
82 // @class $(Name)
+
83 // @author $(User)
+
84 // @date $(Date)
+
85 // @file $(CurrentFileName).$(CurrentFileExt)
+
86 // @brief
+
87 //
+
88 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
+
89 class PlotPanel : public wxPanel
+
90 {
+
91  public:
+
92  PlotPanel(wxFrame* parent);
+
93  ~PlotPanel();
+
94  wxPen m_penShortDash;
+
95  wxPen m_penDotDash;
+
96  wxPen m_penSolid;
+
97  wxRect m_rCtrlPrev;
+
98  wxRect m_rCtrl;
+
99  wxRect m_rGrid;
+
100  wxRect m_rPlot;
+
101  MainFrame *m_pTopFrame;
+
102  wxAuiNotebook *m_pNoteBook;
+
103  double m_label_size;
+
104  wxSize m_Bufsz;
+
105  bool m_newdata;
+
106  wxBitmap *m_bmp;
+
107  wxNativePixelData *m_pBmp;
+
108 
+
109  // some useful events
+
110  void OnMouseMove(wxMouseEvent& event);
+
111  void OnMouseDown(wxMouseEvent& event);
+
112  void OnMouseUp(wxMouseEvent& event);
+
113  void OnMouseWheelMoved(wxMouseEvent& event);
+
114  void OnClose(wxCloseEvent& event ){ event.Skip(); }
+
115  void OnSize( wxSizeEvent& event );
+
116  void OnErase(wxEraseEvent& event);
+
117  void OnPaint(wxPaintEvent& event);
+
118  //void OnUpdateUI( wxUpdateUIEvent& event ){ event.Skip(); }
+
119 
+
120  void paintEvent(wxPaintEvent & evt);
+
121  virtual void draw(wxAutoBufferedPaintDC& pdc);
+
122  virtual void drawGraticule(wxAutoBufferedPaintDC& pdc);
+
123  virtual double SetZoomFactor(double zf);
+
124  virtual double GetZoomFactor(double zf);
+
125  virtual void OnShow(wxShowEvent& event);
+
126  virtual double GetLabelSize();
+
127  virtual void SetLabelSize(double size);
+
128 
+
129  protected:
+
130  int m_x;
+
131  int m_y;
+
132 // int m_w;
+
133 // int m_h;
+
134  int m_left;
+
135  int m_top;
+
136  int m_prev_w;
+
137  int m_prev_h;
+
138  int m_prev_x;
+
139  int m_prev_y;
+
140  bool m_use_bitmap;
+
141  bool m_clip;
+
142  bool m_rubberBand;
+
143  bool m_mouseDown;
+
144  bool m_firstPass;
+
145  double m_zoomFactor;
+
146  DECLARE_EVENT_TABLE()
+
147 };
+
148 #endif //__FDMDV2_PLOT__
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 d6a54c36..b9b969fb 100644 --- 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 @@ 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 4452e693..0b0758aa 100644 --- 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 @@ 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 f68f5db8..3686b31b 100644 --- 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 @@ 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 ff40160f..e986bad7 100644 --- 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 @@
40 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
41 class PlotWaterfall : public PlotPanel
42 {
-
43 public:
-
44  PlotWaterfall(wxFrame* parent);
-
45  ~PlotWaterfall();
+
43  public:
+
44  PlotWaterfall(wxFrame* parent);
+
45  ~PlotWaterfall();
46 
-
47 protected:
-
48 // unsigned *m_pixel_buf;
-
49  unsigned m_heatmap_lut[256];
-
50  int m_greyscale;
-
51 
-
52  unsigned heatmap(float val, float min, float max);
+
47  protected:
+
48  // unsigned *m_pixel_buf;
+
49  unsigned m_heatmap_lut[256];
+
50  int m_greyscale;
+
51  wxMemoryDC m_mDC;
+
52  int m_line_color;
53 
-
54  void OnPaint(wxPaintEvent & evt);
-
55  void OnSize(wxSizeEvent& event);
-
56  void OnShow(wxShowEvent& event);
-
57  void drawGraticule(wxAutoBufferedPaintDC& dc);
-
58  void draw(wxAutoBufferedPaintDC& dc);
-
59  void plotData(wxAutoBufferedPaintDC& dc);
-
60  void plotPixelData(wxAutoBufferedPaintDC& dc);
-
61  DECLARE_EVENT_TABLE()
-
62 };
-
63 
-
64 #endif //__FDMDV2_PLOT_WATERFALL__
+
54  unsigned heatmap(float val, float min, float max);
+
55 
+
56  void OnPaint(wxPaintEvent & evt);
+
57  //void OnSize(wxSizeEvent& event);
+
58  void OnShow(wxShowEvent& event);
+
59  void drawGraticule(wxAutoBufferedPaintDC& dc);
+
60  void draw(wxAutoBufferedPaintDC& pdc);
+
61  void plotPixelData(wxAutoBufferedPaintDC& dc);
+
62  DECLARE_EVENT_TABLE()
+
63 };
+
64 
+
65 #endif //__FDMDV2_PLOT_WATERFALL__
diff --git a/fdmdv2/fdmdv2-doc/html/files.html b/fdmdv2/fdmdv2-doc/html/files.html index f96c29a7..d0653b03 100644 --- a/fdmdv2/fdmdv2-doc/html/files.html +++ b/fdmdv2/fdmdv2-doc/html/files.html @@ -48,27 +48,26 @@
Here is a list of all documented files with brief descriptions:
[detail level 12]
- - - - - - - - - - - - - - - + + + + + + + + + + + + + +
\-src
 o*audiostream.h
 o*comp.h
 o*dlg_about.h
 o*dlg_audio.h
 o*dlg_comports.h
 o*dlg_options.h
 o*fdmdv2_defines.h
 o*fdmdv2_main.h
 o*fdmdv2_pa_wrapper.h
 o*fdmdv2_plot.h
 o*fdmdv2_plot_scalar.h
 o*fdmdv2_plot_scatter.h
 o*fdmdv2_plot_spectrum.h
 o*fdmdv2_plot_waterfall.h
 \*topFrame.h
 o*comp.h
 o*dlg_about.h
 o*dlg_audio.h
 o*dlg_comports.h
 o*dlg_options.h
 o*fdmdv2_defines.h
 o*fdmdv2_main.h
 o*fdmdv2_pa_wrapper.h
 o*fdmdv2_plot.h
 o*fdmdv2_plot_scalar.h
 o*fdmdv2_plot_scatter.h
 o*fdmdv2_plot_spectrum.h
 o*fdmdv2_plot_waterfall.h
 \*topFrame.h
diff --git a/fdmdv2/fdmdv2-doc/html/functions.html b/fdmdv2/fdmdv2-doc/html/functions.html index 81efee28..26fd9558 100644 --- a/fdmdv2/fdmdv2-doc/html/functions.html +++ b/fdmdv2/fdmdv2-doc/html/functions.html @@ -67,7 +67,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/functions_func.html b/fdmdv2/fdmdv2-doc/html/functions_func.html index fbf3a019..969d309f 100644 --- a/fdmdv2/fdmdv2-doc/html/functions_func.html +++ b/fdmdv2/fdmdv2-doc/html/functions_func.html @@ -67,7 +67,7 @@ diff --git a/fdmdv2/fdmdv2-doc/html/graph_legend.html b/fdmdv2/fdmdv2-doc/html/graph_legend.html index 14995260..67927b94 100644 --- 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 diff --git a/fdmdv2/fdmdv2-doc/html/hierarchy.html b/fdmdv2/fdmdv2-doc/html/hierarchy.html index 95ed6f3d..142f298f 100644 --- a/fdmdv2/fdmdv2-doc/html/hierarchy.html +++ b/fdmdv2/fdmdv2-doc/html/hierarchy.html @@ -52,36 +52,35 @@

Go to the graphical class hierarchy

This inheritance list is sorted roughly, but not completely, alphabetically: diff --git a/fdmdv2/fdmdv2-doc/html/index.hhc b/fdmdv2/fdmdv2-doc/html/index.hhc index 3a510bb4..8519420e 100644 --- a/fdmdv2/fdmdv2-doc/html/index.hhc +++ b/fdmdv2/fdmdv2-doc/html/index.hhc @@ -28,12 +28,6 @@
  • -
  • -
      -
    • -
    • -
    • -
    • @@ -136,8 +130,10 @@
    • +
    • +