From e5123dd8bf81652722ca57b01caceda812e46aae Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Sun, 6 Dec 2020 20:02:22 +0100 Subject: [PATCH] Fixed UI bug in radio --- core/src/gui/main_window.cpp | 1 - radio/src/am_demod.h | 2 +- radio/src/cw_demod.h | 2 +- radio/src/dsb_demod.h | 2 +- radio/src/fm_demod.h | 4 ++-- radio/src/lsb_demod.h | 2 +- radio/src/raw_demod.h | 2 +- radio/src/usb_demod.h | 2 +- radio/src/wfm_demod.h | 5 +++-- root_dev/config.json | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/src/gui/main_window.cpp b/core/src/gui/main_window.cpp index 397ce562..c2f43049 100644 --- a/core/src/gui/main_window.cpp +++ b/core/src/gui/main_window.cpp @@ -123,7 +123,6 @@ void windowInit() { // TODO for 0.2.5 // Add "select folder" option for the file source - // Fix SSB demod // FIX AUDIO ISSUE ON BOTH LINUX AND SOMETIMES WINDOWS (probly the ring buffer, though double buffering could help) // Add default main config to avoid having to ship one // Have a good directory system on both linux and windows diff --git a/radio/src/am_demod.h b/radio/src/am_demod.h index 10ff1e11..23eec0b2 100644 --- a/radio/src/am_demod.h +++ b/radio/src/am_demod.h @@ -101,9 +101,9 @@ public: setBandwidth(bw); } - ImGui::SetNextItemWidth(menuWidth - ImGui::CalcTextSize("Snap Interval").x - 8); ImGui::Text("Snap Interval"); ImGui::SameLine(); + ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX()); if (ImGui::InputFloat(("##_radio_am_snap_" + uiPrefix).c_str(), &snapInterval, 1, 100, 0)) { setSnapInterval(snapInterval); } diff --git a/radio/src/cw_demod.h b/radio/src/cw_demod.h index 0b76a61c..d982169d 100644 --- a/radio/src/cw_demod.h +++ b/radio/src/cw_demod.h @@ -111,9 +111,9 @@ public: setBandwidth(bw); } - ImGui::SetNextItemWidth(menuWidth - ImGui::CalcTextSize("Snap Interval").x - 8); ImGui::Text("Snap Interval"); ImGui::SameLine(); + ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX()); if (ImGui::InputFloat(("##_radio_cw_snap_" + uiPrefix).c_str(), &snapInterval, 1, 100, 0)) { setSnapInterval(snapInterval); } diff --git a/radio/src/dsb_demod.h b/radio/src/dsb_demod.h index e4157e86..848e1a0a 100644 --- a/radio/src/dsb_demod.h +++ b/radio/src/dsb_demod.h @@ -101,9 +101,9 @@ public: setBandwidth(bw); } - ImGui::SetNextItemWidth(menuWidth - ImGui::CalcTextSize("Snap Interval").x - 8); ImGui::Text("Snap Interval"); ImGui::SameLine(); + ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX()); if (ImGui::InputFloat(("##_radio_dsb_snap_" + uiPrefix).c_str(), &snapInterval, 1, 100, 0)) { setSnapInterval(snapInterval); } diff --git a/radio/src/fm_demod.h b/radio/src/fm_demod.h index f078eb91..d4dd4756 100644 --- a/radio/src/fm_demod.h +++ b/radio/src/fm_demod.h @@ -96,10 +96,10 @@ public: bw = std::clamp(bw, bwMin, bwMax); setBandwidth(bw); } - - ImGui::SetNextItemWidth(menuWidth - ImGui::CalcTextSize("Snap Interval").x - 8); + ImGui::Text("Snap Interval"); ImGui::SameLine(); + ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX()); if (ImGui::InputFloat(("##_radio_fm_snap_" + uiPrefix).c_str(), &snapInterval, 1, 100, 0)) { setSnapInterval(snapInterval); } diff --git a/radio/src/lsb_demod.h b/radio/src/lsb_demod.h index 6b181897..bcb8bb78 100644 --- a/radio/src/lsb_demod.h +++ b/radio/src/lsb_demod.h @@ -101,9 +101,9 @@ public: setBandwidth(bw); } - ImGui::SetNextItemWidth(menuWidth - ImGui::CalcTextSize("Snap Interval").x - 8); ImGui::Text("Snap Interval"); ImGui::SameLine(); + ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX()); if (ImGui::InputFloat(("##_radio_lsb_snap_" + uiPrefix).c_str(), &snapInterval, 1, 100, 0)) { setSnapInterval(snapInterval); } diff --git a/radio/src/raw_demod.h b/radio/src/raw_demod.h index 42dcc448..c9ebb923 100644 --- a/radio/src/raw_demod.h +++ b/radio/src/raw_demod.h @@ -70,9 +70,9 @@ public: void showMenu() { float menuWidth = ImGui::GetContentRegionAvailWidth(); - ImGui::SetNextItemWidth(menuWidth - ImGui::CalcTextSize("Snap Interval").x - 8); ImGui::Text("Snap Interval"); ImGui::SameLine(); + ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX()); if (ImGui::InputFloat(("##_radio_raw_snap_" + uiPrefix).c_str(), &snapInterval, 1, 100, 0)) { setSnapInterval(snapInterval); } diff --git a/radio/src/usb_demod.h b/radio/src/usb_demod.h index 12af6350..266cb10a 100644 --- a/radio/src/usb_demod.h +++ b/radio/src/usb_demod.h @@ -101,9 +101,9 @@ public: setBandwidth(bw); } - ImGui::SetNextItemWidth(menuWidth - ImGui::CalcTextSize("Snap Interval").x - 8); ImGui::Text("Snap Interval"); ImGui::SameLine(); + ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX()); if (ImGui::InputFloat(("##_radio_usb_snap_" + uiPrefix).c_str(), &snapInterval, 1, 100, 0)) { setSnapInterval(snapInterval); } diff --git a/radio/src/wfm_demod.h b/radio/src/wfm_demod.h index c20b421b..6d478e00 100644 --- a/radio/src/wfm_demod.h +++ b/radio/src/wfm_demod.h @@ -104,16 +104,17 @@ public: setBandwidth(bw); } - ImGui::SetNextItemWidth(menuWidth - ImGui::CalcTextSize("Snap Interval").x - 8); ImGui::Text("Snap Interval"); ImGui::SameLine(); + ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX()); if (ImGui::InputFloat(("##_radio_wfm_snap_" + uiPrefix).c_str(), &snapInterval, 1, 100, 0)) { setSnapInterval(snapInterval); } - ImGui::SetNextItemWidth(menuWidth - ImGui::CalcTextSize("De-emphasis").x - 8); + ImGui::Text("De-emphasis"); ImGui::SameLine(); + ImGui::SetNextItemWidth(menuWidth - ImGui::GetCursorPosX()); if (ImGui::Combo(("##_radio_wfm_deemp_" + uiPrefix).c_str(), &deempId, deempModes)) { setDeempIndex(deempId); } diff --git a/root_dev/config.json b/root_dev/config.json index e7991a42..294bddb6 100644 --- a/root_dev/config.json +++ b/root_dev/config.json @@ -19,7 +19,7 @@ "bandPlan": "General", "bandPlanEnabled": true, "fftHeight": 296, - "frequency": 95000000, + "frequency": 99000000, "max": 0.0, "maximized": false, "menuOrder": [ @@ -42,7 +42,7 @@ "Radio": { "muted": false, "sink": "Audio", - "volume": 0.831632673740387 + "volume": 0.6887755393981934 }, "Radio 1": { "muted": true,