Merge branch 'AlexandreRouma:master' into sdrplay-lowif

This commit is contained in:
arkhnchul
2021-08-31 20:48:46 +03:00
committed by GitHub
32 changed files with 169 additions and 220 deletions

View File

@ -744,8 +744,7 @@ private:
if (_this->selectedName != "") {
ImGui::PushItemWidth(menuWidth - ImGui::CalcTextSize("LNA Gain").x - 10);
ImGui::Text("LNA Gain");
ImGui::SameLine();
ImGui::LeftLabel("LNA Gain");
float pos = ImGui::GetCursorPosX();
if (ImGui::SliderInt(CONCAT("##sdrplay_lna_gain", _this->name), &_this->lnaGain, _this->lnaSteps - 1, 0, "")) {
if (_this->running) {
@ -758,8 +757,7 @@ private:
}
if (_this->agc > 0) { style::beginDisabled(); }
ImGui::Text("IF Gain");
ImGui::SameLine();
ImGui::LeftLabel("IF Gain");
ImGui::SetCursorPosX(pos);
if (ImGui::SliderInt(CONCAT("##sdrplay_gain", _this->name), &_this->gain, 59, 20, "")) {
if (_this->running) {
@ -773,8 +771,7 @@ private:
ImGui::PopItemWidth();
if (_this->agc > 0) { style::endDisabled(); }
ImGui::Text("AGC");
ImGui::SameLine();
ImGui::LeftLabel("AGC");
ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX());
if (ImGui::Combo(CONCAT("##sdrplay_agc", _this->name), &_this->agc, agcModesTxt)) {
if (_this->running) {
@ -852,8 +849,7 @@ private:
}
void RSP2Menu(float menuWidth) {
ImGui::Text("Antenna");
ImGui::SameLine();
ImGui::LeftLabel("Antenna");
ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX());
if (ImGui::Combo(CONCAT("##sdrplay_rsp2_ant", name), &rsp2_antennaPort, rsp2_antennaPortsTxt)) {
if (running) {
@ -887,8 +883,7 @@ private:
}
void RSPduoMenu(float menuWidth) {
ImGui::Text("Antenna");
ImGui::SameLine();
ImGui::LeftLabel("Antenna");
ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX());
if (ImGui::Combo(CONCAT("##sdrplay_rspduo_ant", name), &rspduo_antennaPort, rspduo_antennaPortsTxt)) {
@ -938,8 +933,7 @@ private:
}
void RSPdxMenu(float menuWidth) {
ImGui::Text("Antenna");
ImGui::SameLine();
ImGui::LeftLabel("Antenna");
ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX());
if (ImGui::Combo(CONCAT("##sdrplay_rspdx_ant", name), &rspdx_antennaPort, rspdx_antennaPortsTxt)) {
if (running) {