mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui : adding fixed frequency spectrum 

Signed-off-by: Vincenzo Petrolo <vincenzo@kernel-space.org>
This commit is contained in:
Vincenzo Petrolo 2021-05-10 12:28:39 +02:00
parent f20ff3268a
commit b3346ca691
No known key found for this signature in database
GPG Key ID: 9D48955FE2C26971
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Desktop_Interface/isodriver.cpp
View File

@ -638,10 +638,10 @@ QVector<double> isoDriver::getDFTAmplitude(QVector<double> input)
QVector<double> isoDriver::getFrequencies() QVector<double> isoDriver::getFrequencies()
{ {
QVector<double> f(N/2+1,0); QVector<double> f(N/2+1);
for (int i = 0; i < (N+1)/2; i++) { for (int i = 0; i < (N+1)/2; i++) {
f[i] += i; f[i] = i;
} }
return f; return f;
} }
@ -698,11 +698,26 @@ void isoDriver::frameActionGeneric(char CH1_mode, char CH2_mode)
if(singleShotEnabled && (triggerDelay != 0)) if(singleShotEnabled && (triggerDelay != 0))
singleShotTriggered(1); singleShotTriggered(1);
if (!spectrum) {
readData375_CH1 = internalBuffer375_CH1->readBuffer(display.window,GRAPH_SAMPLES,CH1_mode==2, display.delay + triggerDelay); readData375_CH1 = internalBuffer375_CH1->readBuffer(display.window,GRAPH_SAMPLES,CH1_mode==2, display.delay + triggerDelay);
if(CH2_mode) readData375_CH2 = internalBuffer375_CH2->readBuffer(display.window,GRAPH_SAMPLES,CH2_mode==2, display.delay + triggerDelay); if(CH2_mode) readData375_CH2 = internalBuffer375_CH2->readBuffer(display.window,GRAPH_SAMPLES,CH2_mode==2, display.delay + triggerDelay);
if(CH1_mode == -1) readData750 = internalBuffer750->readBuffer(display.window,GRAPH_SAMPLES,false, display.delay + triggerDelay); if(CH1_mode == -1) readData750 = internalBuffer750->readBuffer(display.window,GRAPH_SAMPLES,false, display.delay + triggerDelay);
if(CH1_mode == -2) readDataFile = internalBufferFile->readBuffer(display.window,GRAPH_SAMPLES,false, display.delay); if(CH1_mode == -2) readDataFile = internalBufferFile->readBuffer(display.window,GRAPH_SAMPLES,false, display.delay);
} else {
/*Don't allow moving frequency spectrum right or left
* by overwriting display window and delay before reading
* the buffer each time.
* @TODO improve this limitation.
*/
double const_displ_window = 1;
double const_displ_delay = 0;
display.delay = const_displ_delay;
display.window = const_displ_window;
readData375_CH1 = internalBuffer375_CH1->readBuffer(const_displ_window,GRAPH_SAMPLES,CH1_mode==2, const_displ_delay);
if(CH2_mode) readData375_CH2 = internalBuffer375_CH2->readBuffer(const_displ_window,GRAPH_SAMPLES,CH2_mode==2,const_displ_delay);
if(CH1_mode == -1) readData750 = internalBuffer750->readBuffer(const_displ_window,GRAPH_SAMPLES,false, const_displ_delay);
if(CH1_mode == -2) readDataFile = internalBufferFile->readBuffer(const_displ_window,GRAPH_SAMPLES,false, const_displ_delay);
}
QVector<double> x(GRAPH_SAMPLES), CH1(GRAPH_SAMPLES), CH2(GRAPH_SAMPLES); QVector<double> x(GRAPH_SAMPLES), CH1(GRAPH_SAMPLES), CH2(GRAPH_SAMPLES);
@ -768,9 +783,8 @@ void isoDriver::frameActionGeneric(char CH1_mode, char CH2_mode)
amplitude = getDFTAmplitude(CH2); amplitude = getDFTAmplitude(CH2);
axes->graph(1)->setData(f,amplitude); axes->graph(1)->setData(f,amplitude);
} }
/*N number of sam*/ axes->xAxis->setRange(f.length(), 0);
axes->xAxis->setRange(0, f.length()); axes->yAxis->setRange(100,0);
axes->yAxis->setRange(100, 0);
} else { } else {
axes->graph(0)->setData(x,CH1); axes->graph(0)->setData(x,CH1);
if(CH2_mode) axes->graph(1)->setData(x,CH2); if(CH2_mode) axes->graph(1)->setData(x,CH2);

4
Desktop_Interface/mainwindow.cpp
View File

@ -2515,4 +2515,8 @@ void MainWindow::on_actionHide_Widget_LogicAnalyzer_triggered(bool checked)
void MainWindow::on_actionFrequency_Spectrum_triggered(bool checked) void MainWindow::on_actionFrequency_Spectrum_triggered(bool checked)
{ {
ui->controller_iso->spectrum = checked; ui->controller_iso->spectrum = checked;
if (checked == true)
MAX_WINDOW_SIZE = 1<<17;
else
MAX_WINDOW_SIZE = 10;
} }