comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-09 10:17:58 -04:00
Code Issues Projects Releases Wiki Activity

Zoom follows and pins mouse frequency

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-01-02 19:35:34 -05:00
parent 6a03aae303
commit ef5462d13c
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/demod/DemodulatorThread.cpp
View File

@ -119,7 +119,7 @@ void DemodulatorThread::threadMain() {
freqdem_reset(fdem); freqdem_reset(fdem);
} }
int out_size = ceil((double) (bufSize) * inp->resample_ratio) + 32; int out_size = ceil((double) (bufSize) * inp->resample_ratio) + 512;
if (agc_data.size() != out_size) { if (agc_data.size() != out_size) {
if (agc_data.capacity() < out_size) { if (agc_data.capacity() < out_size) {
@ -144,7 +144,7 @@ void DemodulatorThread::threadMain() {
demod_output.resize(num_written); demod_output.resize(num_written);
} }
int audio_out_size = ceil((double) (num_written) * audio_resample_ratio) + 32; int audio_out_size = ceil((double) (num_written) * audio_resample_ratio) + 512;
agc_crcf_execute_block(agc, &resampled_data[0], num_written, &agc_data[0]); agc_crcf_execute_block(agc, &resampled_data[0], num_written, &agc_data[0]);

1
src/visual/SpectrumCanvas.cpp
View File

@ -232,7 +232,6 @@ void SpectrumCanvas::mouseMoved(wxMouseEvent& event) {
if (abs(freq-freqEdge) > (SRATE/2)) { if (abs(freq-freqEdge) > (SRATE/2)) {
freqChange = -(((int)center_freq>freq)?(freqEdge-freq-(SRATE/2)):(freqEdge-freq+(SRATE/2))); freqChange = -(((int)center_freq>freq)?(freqEdge-freq-(SRATE/2)):(freqEdge-freq+(SRATE/2)));
std::cout << "change: " << freqChange;
} else { } else {
freqChange = 0; freqChange = 0;
} }

34
src/visual/WaterfallCanvas.cpp
View File

@ -313,6 +313,8 @@ void WaterfallCanvas::setData(DemodulatorThreadIQData *input) {
unsigned int bw; unsigned int bw;
if (zoom) { if (zoom) {
int freq = wxGetApp().getFrequency();
if (zoom > 0) { if (zoom > 0) {
center_freq = GetCenterFrequency(); center_freq = GetCenterFrequency();
bw = GetBandwidth(); bw = GetBandwidth();
@ -320,6 +322,13 @@ void WaterfallCanvas::setData(DemodulatorThreadIQData *input) {
if (bw < 80000) { if (bw < 80000) {
bw = 80000; bw = 80000;
} }
if (mTracker.mouseInView()) {
int mfreqA = GetFrequencyAt(mTracker.getMouseX());
SetBandwidth(bw);
int mfreqB = GetFrequencyAt(mTracker.getMouseX());
center_freq += mfreqA - mfreqB;
}
SetView(center_freq, bw); SetView(center_freq, bw);
if (spectrumCanvas) { if (spectrumCanvas) {
spectrumCanvas->SetView(center_freq, bw); spectrumCanvas->SetView(center_freq, bw);
@ -335,6 +344,14 @@ void WaterfallCanvas::setData(DemodulatorThreadIQData *input) {
spectrumCanvas->DisableView(); spectrumCanvas->DisableView();
} }
} else { } else {
if (mTracker.mouseInView()) {
int freq = wxGetApp().getFrequency();
int mfreqA = GetFrequencyAt(mTracker.getMouseX());
SetBandwidth(bw);
int mfreqB = GetFrequencyAt(mTracker.getMouseX());
center_freq += mfreqA - mfreqB;
}
SetView(GetCenterFrequency(), bw); SetView(GetCenterFrequency(), bw);
if (spectrumCanvas) { if (spectrumCanvas) {
spectrumCanvas->SetView(center_freq, bw); spectrumCanvas->SetView(center_freq, bw);
@ -342,6 +359,12 @@ void WaterfallCanvas::setData(DemodulatorThreadIQData *input) {
} }
} }
} }
if (center_freq < freq && (center_freq - bandwidth / 2) < (freq - SRATE / 2)) {
center_freq = (freq - SRATE / 2) + bandwidth / 2;
}
if (center_freq > freq && (center_freq + bandwidth / 2) > (freq + SRATE / 2)) {
center_freq = (freq + SRATE / 2) - bandwidth / 2;
}
} }
std::vector<liquid_float_complex> *data = &input->data; std::vector<liquid_float_complex> *data = &input->data;
@ -695,6 +718,10 @@ void WaterfallCanvas::mouseReleased(wxMouseEvent& event) {
if (DemodulatorInstance *last = wxGetApp().getDemodMgr().getLastActiveDemodulator()) { if (DemodulatorInstance *last = wxGetApp().getDemodMgr().getLastActiveDemodulator()) {
demod->getParams().bandwidth = last->getParams().bandwidth; demod->getParams().bandwidth = last->getParams().bandwidth;
demod->setDemodulatorType(last->getDemodulatorType());
demod->setSquelchLevel(last->getSquelchLevel());
demod->setSquelchEnabled(last->isSquelchEnabled());
demod->setStereo(last->isStereo());
} }
demod->run(); demod->run();
@ -755,7 +782,12 @@ void WaterfallCanvas::mouseReleased(wxMouseEvent& event) {
demod = wxGetApp().getDemodMgr().newThread(); demod = wxGetApp().getDemodMgr().newThread();
demod->getParams().frequency = freq; demod->getParams().frequency = freq;
demod->getParams().bandwidth = bw; demod->getParams().bandwidth = bw;
if (DemodulatorInstance *last = wxGetApp().getDemodMgr().getLastActiveDemodulator()) {
demod->setDemodulatorType(last->getDemodulatorType());
demod->setSquelchLevel(last->getSquelchLevel());
demod->setSquelchEnabled(last->isSquelchEnabled());
demod->setStereo(last->isStereo());
}
demod->run(); demod->run();
wxGetApp().bindDemodulator(demod); wxGetApp().bindDemodulator(demod);