mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-06-30 14:17:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix + work on scanner

Browse Source
This commit is contained in:
AlexandreRouma
2022-07-15 17:17:53 +02:00
parent 8b7afd88f9
commit 5bf5a10a12
79 changed files with 234 additions and 18146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/gui/widgets/waterfall.cpp
View File

@ -91,6 +91,7 @@ namespace ImGui {
}
void WaterFall::drawFFT() {
std::lock_guard<std::recursive_mutex> lck(latestFFTMtx);
// Calculate scaling factor
float startLine = floorf(fftMax / vRange) * vRange;
float vertRange = fftMax - fftMin;
@ -182,7 +183,11 @@ namespace ImGui {
waterfallUpdate = false;
updateWaterfallTexture();
}
window->DrawList->AddImage((void*)(intptr_t)textureId, wfMin, wfMax);
{
std::lock_guard<std::mutex> lck(texMtx);
window->DrawList->AddImage((void*)(intptr_t)textureId, wfMin, wfMax);
}
ImVec2 mPos = ImGui::GetMousePos();
if (IS_IN_AREA(mPos, wfMin, wfMax) && !gui::mainWindow.lockWaterfallControls && !inputHandled) {
@ -675,6 +680,7 @@ namespace ImGui {
}
void WaterFall::updateWaterfallTexture() {
std::lock_guard<std::mutex> lck(texMtx);
glBindTexture(GL_TEXTURE_2D, textureId);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@ -687,6 +693,7 @@ namespace ImGui {
}
void WaterFall::onResize() {
std::lock_guard<std::recursive_mutex> lck(latestFFTMtx);
// return if widget is too small
if (widgetSize.x < 100 || widgetSize.y < 100) {
return;
@ -849,6 +856,7 @@ namespace ImGui {
void WaterFall::pushFFT() {
if (rawFFTs == NULL) { return; }
std::lock_guard<std::recursive_mutex> lck(latestFFTMtx);
double offsetRatio = viewOffset / (wholeBandwidth / 2.0);
int drawDataSize = (viewBandwidth / wholeBandwidth) * rawFFTSize;
int drawDataStart = (((double)rawFFTSize / 2.0) * (offsetRatio + 1)) - (drawDataSize / 2);
@ -928,6 +936,7 @@ namespace ImGui {
}
void WaterFall::autoRange() {
std::lock_guard<std::recursive_mutex> lck(latestFFTMtx);
float min = INFINITY;
float max = -INFINITY;
for (int i = 0; i < dataWidth; i++) {
@ -1116,6 +1125,20 @@ namespace ImGui {
fftHoldSpeed = speed;
}
float* WaterFall::acquireLatestFFT(int& width) {
latestFFTMtx.lock();
if (!latestFFT) {
latestFFTMtx.unlock();
return NULL;
}
width = dataWidth;
return latestFFT;
}
void WaterFall::releaseLatestFFT() {
latestFFTMtx.unlock();
}
void WaterfallVFO::setOffset(double offset) {
generalOffset = offset;
if (reference == REF_CENTER) {

5
core/src/gui/widgets/waterfall.h
View File

@ -179,6 +179,9 @@ namespace ImGui {
void setFFTHold(bool hold);
void setFFTHoldSpeed(float speed);
float* acquireLatestFFT(int& width);
void releaseLatestFFT();
bool centerFreqMoved = false;
bool vfoFreqChanged = false;
bool bandplanEnabled = false;
@ -275,6 +278,8 @@ namespace ImGui {
GLuint textureId;
std::recursive_mutex buf_mtx;
std::recursive_mutex latestFFTMtx;
std::mutex texMtx;
float vRange;