comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-26 21:58:37 -05:00
Code Issues Projects Releases Wiki Activity

demod frequency input

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-05-10 01:39:10 -04:00
parent dc71da1dcd
commit 4f9c623fec
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CubicSDR.cpp
View File

@ -273,9 +273,7 @@ int CubicSDR::getPPM() {
void CubicSDR::showFrequencyInput() {
FrequencyDialog fdialog(appframe, -1, _("Set Frequency"), wxPoint(-100,-100), wxSize(320, 75 ));
if ( fdialog.ShowModal() != wxID_OK ) {
} else {
}
FrequencyDialog fdialog(appframe, -1, demodMgr.getActiveDemodulator()?_("Set Demodulator Frequency"):_("Set Frequency"), demodMgr.getActiveDemodulator(), wxPoint(-100,-100), wxSize(320, 75 ));
fdialog.ShowModal();
}

29
src/FrequencyDialog.cpp
View File

@ -9,9 +9,16 @@ wxBEGIN_EVENT_TABLE(FrequencyDialog, wxDialog)
EVT_CHAR_HOOK(FrequencyDialog::OnChar)
wxEND_EVENT_TABLE()
FrequencyDialog::FrequencyDialog(wxWindow * parent, wxWindowID id, const wxString & title, const wxPoint & position, const wxSize & size, long style) :
FrequencyDialog::FrequencyDialog(wxWindow * parent, wxWindowID id, const wxString & title, DemodulatorInstance *demod, const wxPoint & position, const wxSize & size, long style) :
wxDialog(parent, id, title, position, size, style) {
wxString freqStr = frequencyToStr(wxGetApp().getFrequency());
wxString freqStr;
activeDemod = demod;
if (activeDemod) {
freqStr = frequencyToStr(activeDemod->getFrequency());
} else {
freqStr = frequencyToStr(wxGetApp().getFrequency());
}
dialogText = new wxTextCtrl(this, wxID_FREQ_INPUT, freqStr, wxPoint(6, 1), wxSize(size.GetWidth() - 20, size.GetHeight() - 70), wxTE_PROCESS_ENTER);
dialogText->SetFont(wxFont(20, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
@ -56,7 +63,7 @@ std::string FrequencyDialog::frequencyToStr(long long freq) {
}
long long FrequencyDialog::strToFrequency(std::string freqStr) {
std::string filterStr = filterChars(freqStr,std::string("0123456789.MKGmkg"));
std::string filterStr = filterChars(freqStr, std::string("0123456789.MKGmkg"));
int numLen = filterStr.find_first_not_of("0123456789.");
@ -64,7 +71,7 @@ long long FrequencyDialog::strToFrequency(std::string freqStr) {
numLen = freqStr.length();
}
std::string numPartStr = freqStr.substr(0,numLen);
std::string numPartStr = freqStr.substr(0, numLen);
std::string suffixStr = freqStr.substr(numLen);
std::stringstream numPartStream;
@ -86,7 +93,7 @@ long long FrequencyDialog::strToFrequency(std::string freqStr) {
freqTemp *= 1.0e6;
}
return (long long)freqTemp;
return (long long) freqTemp;
}
void FrequencyDialog::OnChar(wxKeyEvent& event) {
@ -98,8 +105,14 @@ void FrequencyDialog::OnChar(wxKeyEvent& event) {
case WXK_NUMPAD_ENTER:
// Do Stuff
freq = strToFrequency(dialogText->GetValue().ToStdString());
wxGetApp().setFrequency(freq);
std::cout << freq << std::endl;
if (activeDemod) {
activeDemod->setTracking(true);
activeDemod->setFollow(true);
activeDemod->setFrequency(freq);
activeDemod->updateLabel(freq);
} else {
wxGetApp().setFrequency(freq);
}
Close();
break;
case WXK_ESCAPE:
@ -123,7 +136,5 @@ void FrequencyDialog::OnChar(wxKeyEvent& event) {
event.Skip();
} else if (c == WXK_RIGHT || c == WXK_LEFT || event.ControlDown()) {
event.Skip();
} else {
std::cout << (int) c << std::endl;
}
}

4
src/FrequencyDialog.h
View File

@ -4,6 +4,7 @@
#include "wx/textctrl.h"
#include "wx/string.h"
#include "wx/button.h"
#include "DemodulatorInstance.h"
#define wxID_FREQ_INPUT 3001
@ -12,6 +13,7 @@ class FrequencyDialog: public wxDialog
public:
FrequencyDialog ( wxWindow * parent, wxWindowID id, const wxString & title,
DemodulatorInstance *demod = NULL,
const wxPoint & pos = wxDefaultPosition,
const wxSize & size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE );
@ -22,7 +24,7 @@ public:
std::string frequencyToStr(long long freq);
private:
DemodulatorInstance *activeDemod;
void OnEnter ( wxCommandEvent &event );
void OnChar ( wxKeyEvent &event );
std::string& filterChars(std::string& s, const std::string& allowed);