From b064a3ecde9b215fea5acece3acc5cfff4b6ff53 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Mon, 27 Jun 2022 19:20:19 +0000 Subject: [PATCH] - added entry slider for AWG git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@1097 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- Source/ControlComponent.cpp | 22 ++++++++++++++++++++-- Source/ControlComponent.h | 1 + 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Source/ControlComponent.cpp b/Source/ControlComponent.cpp index 73e70d5..49c4379 100644 --- a/Source/ControlComponent.cpp +++ b/Source/ControlComponent.cpp @@ -617,11 +617,19 @@ ControlComponent::ControlComponent (ReceiverInterface *pReceiverControlListener, m_buttonResetStatistic->addListener (this); addAndMakeVisible (m_sliderCarrierPhase = new Slider ("CarrierPhaseSlider")); + m_sliderCarrierPhase->setTooltip (TRANS("Carrier Phase Offset")); m_sliderCarrierPhase->setRange (-3.14159, 3.14159, 0.001); m_sliderCarrierPhase->setSliderStyle (Slider::RotaryVerticalDrag); m_sliderCarrierPhase->setTextBoxStyle (Slider::TextBoxLeft, false, 80, 20); m_sliderCarrierPhase->addListener (this); + addAndMakeVisible (m_sliderAwgn_dB = new Slider ("AwgnSlider")); + m_sliderAwgn_dB->setTooltip (TRANS("Additive Gaussian Noise")); + m_sliderAwgn_dB->setRange (-100, 0, 5); + m_sliderAwgn_dB->setSliderStyle (Slider::RotaryVerticalDrag); + m_sliderAwgn_dB->setTextBoxStyle (Slider::TextBoxLeft, false, 80, 20); + m_sliderAwgn_dB->addListener (this); + addAndMakeVisible (m_buttonResetCPR = new TextButton ("CPR Reset button")); m_buttonResetCPR->setButtonText (TRANS("Reset")); m_buttonResetCPR->addListener (this); @@ -816,6 +824,7 @@ ControlComponent::~ControlComponent() m_labelFrameByteCount = nullptr; m_buttonResetStatistic = nullptr; m_sliderCarrierPhase = nullptr; + m_sliderAwgn_dB = nullptr; m_buttonResetCPR = nullptr; m_buttonResetStr = nullptr; comboBoxCmaMode = nullptr; @@ -1233,6 +1242,7 @@ void ControlComponent::resized() m_labelFrameByteCount->setBounds (544, 408, 90, 24); m_buttonResetStatistic->setBounds (720, 408, 64, 24); m_sliderCarrierPhase->setBounds (568, 480, 150, 24); + m_sliderAwgn_dB->setBounds (568, 520, 150, 24); m_buttonResetCPR->setBounds (192, 232, 64, 24); m_buttonResetStr->setBounds (456, 232, 64, 24); comboBoxCmaMode->setBounds (96, 296, 72, 24); @@ -1439,11 +1449,15 @@ void ControlComponent::sliderValueChanged (Slider* sliderThatWasMoved) if (sliderThatWasMoved == m_sliderCarrierPhase) { - //[UserSliderCode_m_sliderCarrierPhase] -- add your slider handling code here.. m_params.CPR_phase = (float)sliderThatWasMoved->getValue(); m_pReceiverControlListener->setParams(m_params); - //[/UserSliderCode_m_sliderCarrierPhase] } + else if (sliderThatWasMoved == m_sliderAwgn_dB) + { + m_params.awgn_dB = (float)sliderThatWasMoved->getValue(); + m_pReceiverControlListener->setParams(m_params); + } + //[UsersliderValueChanged_Post] //[/UsersliderValueChanged_Post] @@ -1667,6 +1681,10 @@ void ControlComponent::changeListenerCallback(juce::ChangeBroadcaster* source) m_labelSnrSymbolPhase->setText(String(m_status.snrSymbolPhase_dB, 2), juce::NotificationType::dontSendNotification); m_labelEbN0->setText(String(m_status.EB_N0, 2), juce::NotificationType::dontSendNotification); + // Sliders + m_sliderAwgn_dB->setValue(m_params.awgn_dB); + m_sliderCarrierPhase->setValue(m_params.CPR_phase); + if (m_params.strState == str_state_acquisition) { m_labelStrState->setText("Acquisition", juce::NotificationType::dontSendNotification); diff --git a/Source/ControlComponent.h b/Source/ControlComponent.h index ebc0ae7..cd1fc3d 100644 --- a/Source/ControlComponent.h +++ b/Source/ControlComponent.h @@ -157,6 +157,7 @@ private: ScopedPointer