mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2025-06-27 12:57:50 +02:00
Finished soapy module + added file source + added RTL_TCP source (windows only rn)
This commit is contained in:
@ -186,6 +186,8 @@ int sdrpp_main() {
|
||||
ImGui_ImplGlfw_NewFrame();
|
||||
ImGui::NewFrame();
|
||||
|
||||
//ImGui::ShowDemoWindow();
|
||||
|
||||
if (_maximized != maximized) {
|
||||
_maximized = maximized;
|
||||
core::configManager.aquire();
|
||||
|
@ -48,7 +48,8 @@ namespace dsp {
|
||||
}
|
||||
|
||||
void setFrequency(float frequency) {
|
||||
_phasorSpeed = (2 * 3.1415926535) / (_sampleRate / frequency);
|
||||
_frequency = frequency;
|
||||
_phasorSpeed = (2 * 3.1415926535 * frequency) / _sampleRate;
|
||||
}
|
||||
|
||||
void setBlockSize(int blockSize) {
|
||||
|
@ -123,6 +123,8 @@ void windowInit() {
|
||||
fftHeight = core::configManager.conf["fftHeight"];
|
||||
gui::waterfall.setFFTHeight(fftHeight);
|
||||
|
||||
gui::menu.order = core::configManager.conf["menuOrder"].get<std::vector<std::string>>();
|
||||
|
||||
core::configManager.release();
|
||||
}
|
||||
|
||||
@ -411,8 +413,7 @@ void drawWindow() {
|
||||
ImGui::SetCursorPosX((ImGui::GetWindowSize().x / 2.0f) - (ImGui::CalcTextSize("Zoom").x / 2.0f));
|
||||
ImGui::Text("Zoom");
|
||||
ImGui::SetCursorPosX((ImGui::GetWindowSize().x / 2.0f) - 10);
|
||||
// TODO: use global sample rate value from DSP instead of 8000000
|
||||
ImGui::VSliderFloat("##_7_", ImVec2(20.0f, 150.0f), &bw.val, 8000000, 1000.0f, "");
|
||||
ImGui::VSliderFloat("##_7_", ImVec2(20.0f, 150.0f), &bw.val, gui::waterfall.getBandwidth(), 1000.0f, "");
|
||||
|
||||
ImGui::NewLine();
|
||||
|
||||
|
@ -17,7 +17,6 @@
|
||||
#include <gui/frequency_select.h>
|
||||
#include <fftw3.h>
|
||||
#include <signal_path/dsp.h>
|
||||
#include <io/soapy.h>
|
||||
#include <gui/icons.h>
|
||||
#include <gui/bandplan.h>
|
||||
#include <watcher.h>
|
||||
|
@ -27,6 +27,7 @@ void Menu::draw() {
|
||||
item = items[name];
|
||||
if (ImGui::CollapsingHeader(name.c_str(), ImGuiTreeNodeFlags_DefaultOpen)) {
|
||||
item.drawHandler(item.ctx);
|
||||
ImGui::Spacing();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -134,6 +134,5 @@ namespace audiomenu {
|
||||
}
|
||||
ImGui::Spacing();
|
||||
}
|
||||
ImGui::Spacing();
|
||||
}
|
||||
};
|
@ -47,6 +47,5 @@ namespace bandplanmenu {
|
||||
bandplan::BandPlan_t plan = bandplan::bandplans[bandplan::bandplanNames[bandplanId]];
|
||||
ImGui::Text("Country: %s (%s)", plan.countryName.c_str(), plan.countryCode.c_str());
|
||||
ImGui::Text("Author: %s", plan.authorName.c_str());
|
||||
ImGui::Spacing();
|
||||
}
|
||||
};
|
@ -18,6 +18,5 @@ namespace displaymenu {
|
||||
core::configManager.conf["showWaterfall"] = showWaterfall;
|
||||
core::configManager.release(true);
|
||||
}
|
||||
ImGui::Spacing();
|
||||
}
|
||||
}
|
@ -2,7 +2,6 @@
|
||||
#include <signal_path/dsp.h>
|
||||
#include <signal_path/vfo_manager.h>
|
||||
#include <signal_path/source.h>
|
||||
#include <io/soapy.h>
|
||||
#include <module.h>
|
||||
|
||||
namespace sigpath {
|
||||
|
Reference in New Issue
Block a user