mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-17 02:57:35 -05:00
#1336 Resolves issue with color setting changes not inheriting the correct translucency which causes the channel overlays in the spectral display to be solid color instead of semi-transparent. (#1337)
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
@@ -1,26 +1,26 @@
|
|||||||
/*******************************************************************************
|
/*
|
||||||
* SDR Trunk
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014 Dennis Sheirer
|
* Copyright (C) 2014-2022 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
*
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
******************************************************************************/
|
* ****************************************************************************
|
||||||
|
*/
|
||||||
package io.github.dsheirer.settings;
|
package io.github.dsheirer.settings;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
||||||
|
import java.awt.Color;
|
||||||
import java.awt.*;
|
|
||||||
|
|
||||||
public class ColorSetting extends Setting
|
public class ColorSetting extends Setting
|
||||||
{
|
{
|
||||||
@@ -91,7 +91,7 @@ public class ColorSetting extends Setting
|
|||||||
return new Color(temp.getRed(),
|
return new Color(temp.getRed(),
|
||||||
temp.getGreen(),
|
temp.getGreen(),
|
||||||
temp.getBlue(),
|
temp.getBlue(),
|
||||||
mAlpha);
|
getColorSettingName().getTranslucency());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setColor(Color color)
|
public void setColor(Color color)
|
||||||
@@ -111,84 +111,81 @@ public class ColorSetting extends Setting
|
|||||||
|
|
||||||
public enum ColorSettingName
|
public enum ColorSettingName
|
||||||
{
|
{
|
||||||
CHANNEL_CONFIG(getTranslucent(Color.LIGHT_GRAY, CONFIG_TRANSLUCENCY),
|
CHANNEL_CONFIG(Color.LIGHT_GRAY, CONFIG_TRANSLUCENCY, "Channel", "Channel Color"),
|
||||||
"Channel", "Channel Color"),
|
CHANNEL_CONFIG_PROCESSING(Color.GREEN, CONFIG_TRANSLUCENCY, "Channel Processing", "Processing Channel Color"),
|
||||||
CHANNEL_CONFIG_PROCESSING(getTranslucent(Color.GREEN, CONFIG_TRANSLUCENCY),
|
CHANNEL_CONFIG_SELECTED(Color.BLUE, CONFIG_TRANSLUCENCY, "Channel Selected", "Selected Channel Color"),
|
||||||
"Channel Processing", "Processing Channel Color"),
|
CHANNEL_STATE_BACKGROUND(Color.BLACK, NO_TRANSLUCENCY, "Background", "Channel State Background"),
|
||||||
CHANNEL_CONFIG_SELECTED(getTranslucent(Color.BLUE, CONFIG_TRANSLUCENCY),
|
CHANNEL_STATE_GRADIENT_TOP_CALL(Color.BLACK, NO_TRANSLUCENCY, "Call Gradient Top", "Channel Call State Gradient Top"),
|
||||||
"Channel Selected", "Selected Channel Color"),
|
CHANNEL_STATE_GRADIENT_MIDDLE_CALL(Color.BLUE, NO_TRANSLUCENCY, "Call Gradient Middle", "Channel Call State Gradient Middle"),
|
||||||
|
CHANNEL_STATE_GRADIENT_TOP_CONTROL(Color.BLACK, NO_TRANSLUCENCY, "Control Gradient Top", "Channel Control State Gradient Top"),
|
||||||
CHANNEL_STATE_BACKGROUND(Color.BLACK, "Background",
|
CHANNEL_STATE_GRADIENT_MIDDLE_CONTROL(new Color(0xC64F00), NO_TRANSLUCENCY, "Control Gradient Middle", "Channel Control State Gradient Middle"),
|
||||||
"Channel State Background"),
|
CHANNEL_STATE_GRADIENT_TOP_DATA(Color.BLACK, NO_TRANSLUCENCY, "Data Gradient Top", "Channel Data State Gradient Top"),
|
||||||
CHANNEL_STATE_GRADIENT_TOP_CALL(Color.BLACK,
|
CHANNEL_STATE_GRADIENT_MIDDLE_DATA(new Color(0xCC00CC), NO_TRANSLUCENCY, "Data Gradient Middle", "Channel Data State Gradient Middle"),
|
||||||
"Call Gradient Top", "Channel Call State Gradient Top"),
|
CHANNEL_STATE_GRADIENT_TOP_FADE(Color.BLACK, NO_TRANSLUCENCY, "Fade Gradient Top", "Channel Fade State Gradient Top"),
|
||||||
CHANNEL_STATE_GRADIENT_MIDDLE_CALL(Color.BLUE,
|
CHANNEL_STATE_GRADIENT_MIDDLE_FADE(Color.DARK_GRAY, NO_TRANSLUCENCY, "Fade Gradient Middle", "Channel Fade State Gradient Middle"),
|
||||||
"Call Gradient Middle", "Channel Call State Gradient Middle"),
|
CHANNEL_STATE_GRADIENT_TOP_IDLE(Color.BLACK, NO_TRANSLUCENCY, "Idle Gradient Top", "Channel Idle State Gradient Top"),
|
||||||
CHANNEL_STATE_GRADIENT_TOP_CONTROL(Color.BLACK,
|
CHANNEL_STATE_GRADIENT_MIDDLE_IDLE(Color.DARK_GRAY, NO_TRANSLUCENCY, "Idle Gradient Middle", "Channel Idle State Gradient Middle"),
|
||||||
"Control Gradient Top", "Channel Control State Gradient Top"),
|
CHANNEL_STATE_GRADIENT_TOP_NO_TUNER(Color.RED, NO_TRANSLUCENCY, "No Tuner Gradient Top", "Channel No Tuner State Gradient Top"),
|
||||||
CHANNEL_STATE_GRADIENT_MIDDLE_CONTROL(new Color(0xC64F00),
|
CHANNEL_STATE_GRADIENT_MIDDLE_NO_TUNER(new Color(0x990000), NO_TRANSLUCENCY, "No Tuner Gradient Middle", "Channel No Tuner State Gradient Middle"),
|
||||||
"Control Gradient Middle", "Channel Control State Gradient Middle"),
|
CHANNEL_STATE_LABEL_DETAILS(Color.LIGHT_GRAY, NO_TRANSLUCENCY, "Details", "Details Label Color"),
|
||||||
CHANNEL_STATE_GRADIENT_TOP_DATA(Color.BLACK,
|
CHANNEL_STATE_LABEL_DECODER(Color.GREEN, NO_TRANSLUCENCY, "Decoder", "Decoder Label Color"),
|
||||||
"Data Gradient Top", "Channel Data State Gradient Top"),
|
CHANNEL_STATE_LABEL_AUX_DECODER(Color.YELLOW, NO_TRANSLUCENCY, "Aux Decoder", "Aux Decoder Label Color"),
|
||||||
CHANNEL_STATE_GRADIENT_MIDDLE_DATA(new Color(0xCC00CC),
|
CHANNEL_STATE_SELECTED_CHANNEL(Color.YELLOW, NO_TRANSLUCENCY, "Selected Channel Indicator", "Selected Channel Indicator Color"),
|
||||||
"Data Gradient Middle", "Channel Data State Gradient Middle"),
|
SPECTRUM_BACKGROUND(Color.BLACK, NO_TRANSLUCENCY, "Background", "Spectrum Background Color"),
|
||||||
CHANNEL_STATE_GRADIENT_TOP_FADE(Color.BLACK,
|
SPECTRUM_CURSOR(Color.ORANGE, NO_TRANSLUCENCY, "Cursor", "Spectrum Cursor Color"),
|
||||||
"Fade Gradient Top", "Channel Fade State Gradient Top"),
|
SPECTRUM_GRADIENT_BOTTOM(Color.GREEN, SPECTRUM_TRANSLUCENCY, "Gradient Bottom", "Spectrum Gradient Bottom Color"),
|
||||||
CHANNEL_STATE_GRADIENT_MIDDLE_FADE(Color.DARK_GRAY,
|
SPECTRUM_GRADIENT_TOP(Color.WHITE, SPECTRUM_TRANSLUCENCY, "Gradient Top", "Spectrum Gradient Top Color"),
|
||||||
"Fade Gradient Middle", "Channel Fade State Gradient Middle"),
|
SPECTRUM_LINE(Color.LIGHT_GRAY, SPECTRUM_TRANSLUCENCY, "Line", "Spectrum Lines and Text Color"),
|
||||||
CHANNEL_STATE_GRADIENT_TOP_IDLE(Color.BLACK,
|
UNKNOWN(Color.RED, NO_TRANSLUCENCY,"Unknown", "Unknown Setting Color");
|
||||||
"Idle Gradient Top", "Channel Idle State Gradient Top"),
|
|
||||||
CHANNEL_STATE_GRADIENT_MIDDLE_IDLE(Color.DARK_GRAY,
|
|
||||||
"Idle Gradient Middle", "Channel Idle State Gradient Middle"),
|
|
||||||
CHANNEL_STATE_GRADIENT_TOP_NO_TUNER(Color.RED,
|
|
||||||
"No Tuner Gradient Top", "Channel No Tuner State Gradient Top"),
|
|
||||||
CHANNEL_STATE_GRADIENT_MIDDLE_NO_TUNER(new Color(0x990000),
|
|
||||||
"No Tuner Gradient Middle", "Channel No Tuner State Gradient Middle"),
|
|
||||||
CHANNEL_STATE_LABEL_DETAILS(Color.LIGHT_GRAY,
|
|
||||||
"Details", "Details Label Color"),
|
|
||||||
CHANNEL_STATE_LABEL_DECODER(Color.GREEN,
|
|
||||||
"Decoder", "Decoder Label Color"),
|
|
||||||
CHANNEL_STATE_LABEL_AUX_DECODER(Color.YELLOW,
|
|
||||||
"Aux Decoder", "Aux Decoder Label Color"),
|
|
||||||
CHANNEL_STATE_SELECTED_CHANNEL(Color.YELLOW,
|
|
||||||
"Selected Channel Indicator", "Selected Channel Indicator Color"),
|
|
||||||
|
|
||||||
SPECTRUM_BACKGROUND(Color.BLACK,
|
|
||||||
"Background", "Spectrum Background Color"),
|
|
||||||
SPECTRUM_CURSOR(Color.ORANGE,
|
|
||||||
"Cursor", "Spectrum Cursor Color"),
|
|
||||||
SPECTRUM_GRADIENT_BOTTOM(getTranslucent(Color.GREEN, SPECTRUM_TRANSLUCENCY),
|
|
||||||
"Gradient Bottom", "Spectrum Gradient Bottom Color"),
|
|
||||||
SPECTRUM_GRADIENT_TOP(getTranslucent(Color.WHITE, SPECTRUM_TRANSLUCENCY),
|
|
||||||
"Gradient Top", "Spectrum Gradient Top Color"),
|
|
||||||
SPECTRUM_LINE(getTranslucent(Color.LIGHT_GRAY, SPECTRUM_TRANSLUCENCY),
|
|
||||||
"Line", "Spectrum Lines and Text Color"),
|
|
||||||
|
|
||||||
UNKNOWN(Color.RED, "Unknown", "Unknown Setting Color");
|
|
||||||
|
|
||||||
private Color mDefaultColor;
|
private Color mDefaultColor;
|
||||||
|
private int mTranslucency;
|
||||||
private String mLabel;
|
private String mLabel;
|
||||||
private String mDialogTitle;
|
private String mDialogTitle;
|
||||||
|
|
||||||
private ColorSettingName(Color defaultColor,
|
/**
|
||||||
String label,
|
* Enumeration of color names used in user interface, primarily in the spectral displays.
|
||||||
String dialogTitle)
|
* @param defaultColor to use and for resets.
|
||||||
|
* @param translucency value for the color.
|
||||||
|
* @param label for menu items
|
||||||
|
* @param dialogTitle for selecting in the color chooser.
|
||||||
|
*/
|
||||||
|
ColorSettingName(Color defaultColor, int translucency, String label, String dialogTitle)
|
||||||
{
|
{
|
||||||
mDefaultColor = defaultColor;
|
mDefaultColor = defaultColor;
|
||||||
|
mTranslucency = translucency;
|
||||||
mLabel = label;
|
mLabel = label;
|
||||||
mDialogTitle = dialogTitle;
|
mDialogTitle = dialogTitle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default color to use when resetting to default.
|
||||||
|
*/
|
||||||
public Color getDefaultColor()
|
public Color getDefaultColor()
|
||||||
{
|
{
|
||||||
return mDefaultColor;
|
return mDefaultColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Translucency to apply to the color
|
||||||
|
*/
|
||||||
|
public int getTranslucency()
|
||||||
|
{
|
||||||
|
return mTranslucency;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Label for the setting
|
||||||
|
*/
|
||||||
public String getLabel()
|
public String getLabel()
|
||||||
{
|
{
|
||||||
return mLabel;
|
return mLabel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Title to use in dialogs
|
||||||
|
* @return title
|
||||||
|
*/
|
||||||
public String getDialogTitle()
|
public String getDialogTitle()
|
||||||
{
|
{
|
||||||
return mDialogTitle;
|
return mDialogTitle;
|
||||||
|
|||||||
Reference in New Issue
Block a user