mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-20 04:27:48 -05:00
Co-authored-by: denny <dennis.sheirer@gmail.com>
This commit is contained in:
@@ -241,6 +241,18 @@ public class NoiseSquelchView extends VBox implements Listener<NoiseSquelchState
|
|||||||
updateTimer();
|
updateTimer();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cancels the chart update timer.
|
||||||
|
*/
|
||||||
|
private synchronized void cancelTimer()
|
||||||
|
{
|
||||||
|
if(mTimerFuture != null)
|
||||||
|
{
|
||||||
|
mTimerFuture.cancel(true);
|
||||||
|
mTimerFuture = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Updates the timer to process incoming decoder states and update the XY chart values.
|
* Updates the timer to process incoming decoder states and update the XY chart values.
|
||||||
*/
|
*/
|
||||||
@@ -253,9 +265,7 @@ public class NoiseSquelchView extends VBox implements Listener<NoiseSquelchState
|
|||||||
}
|
}
|
||||||
else if((!mShowing || mController == null) && mTimerFuture != null)
|
else if((!mShowing || mController == null) && mTimerFuture != null)
|
||||||
{
|
{
|
||||||
mTimerFuture.cancel(true);
|
cancelTimer();
|
||||||
mTimerFuture = null;
|
|
||||||
clearChartAndControls();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -320,47 +330,50 @@ public class NoiseSquelchView extends VBox implements Listener<NoiseSquelchState
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clears any displayed chart data and disables the noise and hysteresis sliders and buttons.
|
* Resets/clears chart and controls.
|
||||||
*/
|
*/
|
||||||
private void clearChartAndControls()
|
private void reset()
|
||||||
{
|
{
|
||||||
Platform.runLater(() -> {
|
//Clear the squelch state history
|
||||||
synchronized(mSquelchStateHistory)
|
synchronized(mSquelchStateHistory)
|
||||||
{
|
{
|
||||||
mSquelchStateHistory.clear();
|
mSquelchStateHistory.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
updateChart();
|
//Clear the chart axis
|
||||||
|
getActivityChart().setDisable(true);
|
||||||
|
for(int x = 0; x < HISTORY_BUFFER_SIZE; x++)
|
||||||
|
{
|
||||||
|
mNoiseSeries.getData().get(x).setYValue(0);
|
||||||
|
mNoiseOpenThresholdSeries.getData().get(x).setYValue(0);
|
||||||
|
mNoiseCloseThresholdSeries.getData().get(x).setYValue(0);
|
||||||
|
mHysteresisSeries.getData().get(x).setYValue(0);
|
||||||
|
mHysteresisOpenThresholdSeries.getData().get(x).setYValue(0);
|
||||||
|
mHysteresisCloseThresholdSeries.getData().get(x).setYValue(0);
|
||||||
|
}
|
||||||
|
|
||||||
//Hysteresis controls
|
//Hysteresis controls
|
||||||
getOpenHysteresisSlider().setDisable(true);
|
getOpenHysteresisSlider().setDisable(true);
|
||||||
getOpenHysteresisSlider().setValue(0);
|
getOpenHysteresisSlider().setValue(0);
|
||||||
getCloseHysteresisSlider().setDisable(true);
|
getCloseHysteresisSlider().setDisable(true);
|
||||||
getCloseHysteresisSlider().setValue(0);
|
getCloseHysteresisSlider().setValue(0);
|
||||||
getHysteresisValueLabel().setDisable(true);
|
getHysteresisValueLabel().setDisable(true);
|
||||||
|
getHysteresisValueLabel().setText(NOT_AVAILABLE);
|
||||||
|
|
||||||
//Noise controls
|
//Noise controls
|
||||||
getOpenNoiseSlider().setDisable(true);
|
getOpenNoiseSlider().setDisable(true);
|
||||||
getOpenNoiseSlider().setValue(0);
|
getOpenNoiseSlider().setValue(0);
|
||||||
getCloseNoiseSlider().setValue(0);
|
getCloseNoiseSlider().setValue(0);
|
||||||
getCloseNoiseSlider().setDisable(true);
|
getCloseNoiseSlider().setDisable(true);
|
||||||
getNoiseValueLabel().setDisable(true);
|
getNoiseValueLabel().setDisable(true);
|
||||||
|
getNoiseValueLabel().setText(NOT_AVAILABLE);
|
||||||
|
|
||||||
getActivityChart().setDisable(true);
|
getResetButton().setDisable(true);
|
||||||
getSquelchOverrideButton().setDisable(true);
|
getSquelchOverrideButton().setDisable(true);
|
||||||
getSquelchStateLabel().setDisable(true);
|
getSquelchStateLabel().setDisable(true);
|
||||||
getSquelchStateLabel().setText(NOT_AVAILABLE);
|
getSquelchStateLabel().setText(NOT_AVAILABLE);
|
||||||
getResetButton().setDisable(true);
|
|
||||||
|
|
||||||
mControlsUpdated = false;
|
mControlsUpdated = false;
|
||||||
|
|
||||||
//Setting the slider values triggers a delayed label update. Submit a separate delayed update onto the
|
|
||||||
// UI thread queue to clear the labels after the slider value triggered label updates are processed.
|
|
||||||
Platform.runLater(() -> {
|
|
||||||
getHysteresisValueLabel().setText(NOT_AVAILABLE);
|
|
||||||
getNoiseValueLabel().setText(NOT_AVAILABLE);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -474,9 +487,10 @@ public class NoiseSquelchView extends VBox implements Listener<NoiseSquelchState
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the noise squelch controller for this view. If the controller is non-null, registers this view to receive
|
* Sets the noise squelch controller for this view. Unregisters the previous controller, clears the display and
|
||||||
* state events from the controller. If a previous controller is already registered then it is unregistered before
|
* registers the new controller on the JavaFX UI thread if it is non-null.
|
||||||
* registering on the new controller.
|
*
|
||||||
|
* Note: this method is invoked by the Swing UI thread in response to user action.
|
||||||
*
|
*
|
||||||
* @param controller to set (non-null) or clear (null).
|
* @param controller to set (non-null) or clear (null).
|
||||||
*/
|
*/
|
||||||
@@ -484,29 +498,36 @@ public class NoiseSquelchView extends VBox implements Listener<NoiseSquelchState
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
cancelTimer();
|
||||||
|
|
||||||
|
//Unregister from previous controller.
|
||||||
if(mController != null)
|
if(mController != null)
|
||||||
{
|
{
|
||||||
mController.setNoiseSquelchStateListener(null);
|
mController.setNoiseSquelchStateListener(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
mController = controller;
|
//Nullify the controller so the reset doesn't trigger any save actions.
|
||||||
|
mController = null;
|
||||||
|
|
||||||
if(mController != null)
|
//Since this is invoked on the Swing UI thread, transfer control to the JavaFX UI thread since we're
|
||||||
{
|
//accessing the JavaFX controls.
|
||||||
mControlsUpdated = false;
|
Platform.runLater(() -> {
|
||||||
mController.setNoiseSquelchStateListener(this);
|
reset();
|
||||||
}
|
|
||||||
else
|
mController = controller;
|
||||||
{
|
|
||||||
clearChartAndControls();
|
if(mController != null)
|
||||||
}
|
{
|
||||||
|
mController.setNoiseSquelchStateListener(NoiseSquelchView.this);
|
||||||
|
}
|
||||||
|
|
||||||
|
updateTimer();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
catch(Exception e)
|
catch(Exception e)
|
||||||
{
|
{
|
||||||
LOGGER.error("Error updating noise squelch controller", e);
|
LOGGER.error("Error updating noise squelch controller", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
updateTimer();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user