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

Performance fix for Vincenzo's patch

This commit is contained in:
Chris Esposito 2022-01-23 17:48:51 +11:00
parent b5e4c4296f
commit 1169684399
4 changed files with 60 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Desktop_Interface/asyncdft.cpp
View File

@ -132,7 +132,6 @@ std::unique_ptr<short[]> AsyncDFT::getWindow()
return readData; return readData;
} }
QVector<double> AsyncDFT::normalizeDFT(double e_maximum, QVector<double> dft) QVector<double> AsyncDFT::normalizeDFT(double e_maximum, QVector<double> dft)
{ {
double u_maximum; double u_maximum;

19
Desktop_Interface/isobuffer.cpp
View File

@ -37,6 +37,7 @@ isoBuffer::isoBuffer(QWidget* parent, int bufferLen, isoDriver* caller, unsigned
, m_sampleRate_bit(bufferLen/21.0/375*VALID_DATA_PER_375*8) , m_sampleRate_bit(bufferLen/21.0/375*VALID_DATA_PER_375*8)
, m_virtualParent(caller) , m_virtualParent(caller)
{ {
async_dft = new AsyncDFT();
m_buffer = m_bufferPtr.get(); m_buffer = m_bufferPtr.get();
} }
@ -56,7 +57,9 @@ void isoBuffer::insertIntoBuffer(short item)
{ {
m_back = 0; m_back = 0;
} }
async_dft.addSample(item);
if (m_asyncDftActive)
async_dft->addSample(item);
checkTriggered(); checkTriggered();
} }
@ -169,6 +172,16 @@ void isoBuffer::gainBuffer(int gain_log)
} }
} }
void isoBuffer::enableDftWrite(bool enable)
{
if ((enable == true) && (m_asyncDftActive == false))
{
delete async_dft;
async_dft = new AsyncDFT();
}
m_asyncDftActive = enable;
}
void isoBuffer::outputSampleToFile(double averageSample) void isoBuffer::outputSampleToFile(double averageSample)
{ {
@ -350,7 +363,7 @@ void isoBuffer::serialManage(double baudRate, UartParity parity, bool hexDisplay
m_isDecoding = true; m_isDecoding = true;
} }
m_decoder->m_baudRate = baudRate; m_decoder->m_baudRate = baudRate;
m_decoder->setParityMode(parity); m_decoder->setParityMode(parity);
m_decoder->setHexDisplay(hexDisplay); m_decoder->setHexDisplay(hexDisplay);
m_decoder->serialDecode(); m_decoder->serialDecode();
@ -399,7 +412,7 @@ double isoBuffer::getDelayedTriggerPoint(double delay)
{ {
if (m_triggerPositionList.size() == 0) if (m_triggerPositionList.size() == 0)
return 0; return 0;
const uint32_t delaySamples = delay * m_samplesPerSecond; const uint32_t delaySamples = delay * m_samplesPerSecond;
auto isValid = [=](uint32_t index)->bool auto isValid = [=](uint32_t index)->bool

6
Desktop_Interface/isobuffer.h
View File

@ -57,6 +57,8 @@ public:
void clearBuffer(); void clearBuffer();
void gainBuffer(int gain_log); void gainBuffer(int gain_log);
void enableDftWrite(bool enable);
// Advanced buffer operations // Advanced buffer operations
private: private:
template<typename T, typename Function> template<typename T, typename Function>
@ -119,7 +121,7 @@ public:
uartStyleDecoder* m_decoder = NULL; uartStyleDecoder* m_decoder = NULL;
bool m_isDecoding = true; bool m_isDecoding = true;
//DFT //DFT
AsyncDFT async_dft; AsyncDFT* async_dft;
private: private:
// File I/O // File I/O
bool m_fileIOEnabled = false; bool m_fileIOEnabled = false;
@ -132,6 +134,8 @@ private:
unsigned int m_currentColumn = 0; unsigned int m_currentColumn = 0;
uint32_t m_lastTriggerDetlaT = 0; uint32_t m_lastTriggerDetlaT = 0;
bool m_asyncDftActive = false;
isoDriver* m_virtualParent; isoDriver* m_virtualParent;
void addTriggerPosition(uint32_t position); void addTriggerPosition(uint32_t position);

61
Desktop_Interface/isodriver.cpp
View File

@ -628,6 +628,9 @@ void isoDriver::frameActionGeneric(char CH1_mode, char CH2_mode)
return; return;
} }
internalBuffer375_CH1->enableDftWrite(spectrum);
internalBuffer375_CH2->enableDftWrite(spectrum);
// internalBuffer750->enableDftWrite(spectrum);
//qDebug() << "made it to frameActionGeneric"; //qDebug() << "made it to frameActionGeneric";
if(!paused_CH1 && CH1_mode == - 1){ if(!paused_CH1 && CH1_mode == - 1){
@ -688,7 +691,7 @@ void isoDriver::frameActionGeneric(char CH1_mode, char CH2_mode)
* the buffer each time. * the buffer each time.
* @TODO improve this limitation. * @TODO improve this limitation.
*/ */
double const_displ_window = ((double)internalBuffer375_CH1->async_dft.n_samples)/(internalBuffer375_CH1->m_samplesPerSecond); double const_displ_window = ((double)internalBuffer375_CH1->async_dft->n_samples)/(internalBuffer375_CH1->m_samplesPerSecond);
double const_displ_delay = 0; double const_displ_delay = 0;
display.delay = const_displ_delay; display.delay = const_displ_delay;
display.window = const_displ_window; display.window = const_displ_window;
@ -697,28 +700,38 @@ void isoDriver::frameActionGeneric(char CH1_mode, char CH2_mode)
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);
} }
/*Convert data also for spectrum CH1 and CH2*/ /*Convert data also for spectrum CH1 and CH2*/
std::unique_ptr<short[]> dt_samples1 = internalBuffer375_CH1->async_dft.getWindow(); std::unique_ptr<short[]> dt_samples1;
std::unique_ptr<short[]> dt_samples2 = internalBuffer375_CH2->async_dft.getWindow(); std::unique_ptr<short[]> dt_samples2;
QVector<double> converted_dt_samples1, converted_dt_samples2;
QVector<double> x(GRAPH_SAMPLES), CH1(GRAPH_SAMPLES), CH2(GRAPH_SAMPLES);
if (spectrum)
{
dt_samples1 = internalBuffer375_CH1->async_dft->getWindow();
dt_samples2 = internalBuffer375_CH2->async_dft->getWindow();
converted_dt_samples1.resize(internalBuffer375_CH1->async_dft->n_samples),
converted_dt_samples2.resize(internalBuffer375_CH2->async_dft->n_samples);
}
QVector<double> x(GRAPH_SAMPLES), CH1(GRAPH_SAMPLES), CH2(GRAPH_SAMPLES),
converted_dt_samples1(internalBuffer375_CH1->async_dft.n_samples),
converted_dt_samples2(internalBuffer375_CH2->async_dft.n_samples);
if (CH1_mode == 1){ if (CH1_mode == 1){
analogConvert(readData375_CH1.get(), &CH1, 128, AC_CH1, 1); analogConvert(readData375_CH1.get(), &CH1, 128, AC_CH1, 1);
analogConvert(dt_samples1.get(), &converted_dt_samples1, 128, AC_CH1, 1);
for (int i=0; i < CH1.size(); i++) for (int i=0; i < CH1.size(); i++)
{ {
CH1[i] /= m_attenuation_CH1; CH1[i] /= m_attenuation_CH1;
CH1[i] += m_offset_CH1; CH1[i] += m_offset_CH1;
} }
for (int i=0; i < converted_dt_samples1.size(); i++)
if (spectrum)
{ {
converted_dt_samples1[i] /= m_attenuation_CH1; analogConvert(dt_samples1.get(), &converted_dt_samples1, 128, AC_CH1, 1);
converted_dt_samples1[i] += m_offset_CH1; for (int i=0; i < converted_dt_samples1.size(); i++)
{
converted_dt_samples1[i] /= m_attenuation_CH1;
converted_dt_samples1[i] += m_offset_CH1;
}
} }
xmin = (currentVmin < xmin) ? currentVmin : xmin; xmin = (currentVmin < xmin) ? currentVmin : xmin;
xmax = (currentVmax > xmax) ? currentVmax : xmax; xmax = (currentVmax > xmax) ? currentVmax : xmax;
broadcastStats(0); broadcastStats(0);
@ -729,17 +742,21 @@ void isoDriver::frameActionGeneric(char CH1_mode, char CH2_mode)
if (CH2_mode == 1){ if (CH2_mode == 1){
analogConvert(readData375_CH2.get(), &CH2, 128, AC_CH2, 2); analogConvert(readData375_CH2.get(), &CH2, 128, AC_CH2, 2);
analogConvert(dt_samples2.get(), &converted_dt_samples2, 128, AC_CH2, 2);
for (int i=0; i < GRAPH_SAMPLES; i++) for (int i=0; i < GRAPH_SAMPLES; i++)
{ {
CH2[i] /= m_attenuation_CH2; CH2[i] /= m_attenuation_CH2;
CH2[i] += m_offset_CH2; CH2[i] += m_offset_CH2;
} }
for (int i=0; i < converted_dt_samples2.size(); i++)
if (spectrum)
{ {
converted_dt_samples2[i] /= m_attenuation_CH1; analogConvert(dt_samples2.get(), &converted_dt_samples2, 128, AC_CH2, 2);
converted_dt_samples2[i] += m_offset_CH1; for (int i=0; i < converted_dt_samples2.size(); i++)
{
converted_dt_samples2[i] /= m_attenuation_CH1;
converted_dt_samples2[i] += m_offset_CH1;
}
} }
ymin = (currentVmin < ymin) ? currentVmin : ymin; ymin = (currentVmin < ymin) ? currentVmin : ymin;
ymax = (currentVmax > ymax) ? currentVmax : ymax; ymax = (currentVmax > ymax) ? currentVmax : ymax;
@ -778,24 +795,24 @@ void isoDriver::frameActionGeneric(char CH1_mode, char CH2_mode)
if (spectrum) { /*If frequency spectrum mode*/ if (spectrum) { /*If frequency spectrum mode*/
try { try {
/*Creating DFT amplitudes*/ /*Creating DFT amplitudes*/
QVector<double> amplitude1 = internalBuffer375_CH1->async_dft.getPowerSpectrum(converted_dt_samples1); QVector<double> amplitude1 = internalBuffer375_CH1->async_dft->getPowerSpectrum(converted_dt_samples1);
/*Getting array of frequencies for display purposes*/ /*Getting array of frequencies for display purposes*/
QVector<double> f = internalBuffer375_CH1->async_dft.getFrequenciyWindow(internalBuffer375_CH1->m_samplesPerSecond); QVector<double> f = internalBuffer375_CH1->async_dft->getFrequenciyWindow(internalBuffer375_CH1->m_samplesPerSecond);
/*Max amplitude for display purposes*/ /*Max amplitude for display purposes*/
double max1 = internalBuffer375_CH1->async_dft.maximum; double max1 = internalBuffer375_CH1->async_dft->maximum;
double max2 = -1; double max2 = -1;
if(CH2_mode) { if(CH2_mode) {
QVector<double> amplitude2 = internalBuffer375_CH2->async_dft.getPowerSpectrum(converted_dt_samples2); QVector<double> amplitude2 = internalBuffer375_CH2->async_dft->getPowerSpectrum(converted_dt_samples2);
max2 = internalBuffer375_CH2->async_dft.maximum; max2 = internalBuffer375_CH2->async_dft->maximum;
/*Normalization with respect to amplitude1*/ /*Normalization with respect to amplitude1*/
amplitude2 = internalBuffer375_CH2->async_dft.normalizeDFT(max1, amplitude2); amplitude2 = internalBuffer375_CH2->async_dft->normalizeDFT(max1, amplitude2);
axes->graph(1)->setData(f,amplitude2); axes->graph(1)->setData(f,amplitude2);
} }
/*Decision for normalization & display purposes*/ /*Decision for normalization & display purposes*/
amplitude1 = internalBuffer375_CH1->async_dft.normalizeDFT(max2, amplitude1); amplitude1 = internalBuffer375_CH1->async_dft->normalizeDFT(max2, amplitude1);
axes->graph(0)->setData(f, amplitude1); axes->graph(0)->setData(f, amplitude1);
axes->xAxis->setRange(m_spectrumMinX, m_spectrumMaxX); axes->xAxis->setRange(m_spectrumMinX, m_spectrumMaxX);
/*Setting maximum/minimum y-axis 0%-100%*/ /*Setting maximum/minimum y-axis 0%-100%*/