diff --git a/colorprefs.h b/colorprefs.h
index 7db11fc..48a61d2 100644
--- a/colorprefs.h
+++ b/colorprefs.h
@@ -18,6 +18,7 @@ struct colorPrefsType{
QColor underlayFill;
QColor plotBackground;
QColor tuningLine;
+ QColor passband;
// Waterfall:
QColor wfBackground;
diff --git a/wfmain.cpp b/wfmain.cpp
index f46499e..0d8ae4f 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -1453,6 +1453,7 @@ void wfmain::loadSettings()
p->underlayFill.setNamedColor(settings->value("underlayFill", p->underlayFill.name(QColor::HexArgb)).toString());
p->plotBackground.setNamedColor(settings->value("plotBackground", p->plotBackground.name(QColor::HexArgb)).toString());
p->tuningLine.setNamedColor(settings->value("tuningLine", p->tuningLine.name(QColor::HexArgb)).toString());
+ p->passband.setNamedColor(settings->value("passband", p->tuningLine.name(QColor::HexArgb)).toString());
p->wfBackground.setNamedColor(settings->value("wfBackground", p->wfBackground.name(QColor::HexArgb)).toString());
p->wfGrid.setNamedColor(settings->value("wfGrid", p->wfGrid.name(QColor::HexArgb)).toString());
p->wfAxis.setNamedColor(settings->value("wfAxis", p->wfAxis.name(QColor::HexArgb)).toString());
@@ -2073,6 +2074,7 @@ void wfmain::saveSettings()
settings->setValue("underlayFill", p->underlayFill.name(QColor::HexArgb));
settings->setValue("plotBackground", p->plotBackground.name(QColor::HexArgb));
settings->setValue("tuningLine", p->tuningLine.name(QColor::HexArgb));
+ settings->setValue("passband", p->passband.name(QColor::HexArgb));
settings->setValue("wfBackground", p->wfBackground.name(QColor::HexArgb));
settings->setValue("wfGrid", p->wfGrid.name(QColor::HexArgb));
settings->setValue("wfAxis", p->wfAxis.name(QColor::HexArgb));
@@ -2728,6 +2730,7 @@ void wfmain::setDefaultColors(int presetNumber)
p->underlayFill = QColor(20+200/4.0*1,70*(1.6-1/4.0), 150, 150);
p->plotBackground = QColor(Qt::black);
p->tuningLine = QColor(Qt::blue);
+ p->passband = QColor(Qt::blue);
p->meterLevel = QColor("#148CD2").darker();
p->meterAverage = QColor("#3FB7CD");
@@ -2759,6 +2762,7 @@ void wfmain::setDefaultColors(int presetNumber)
p->underlayLine = QColor("#9633ff55");
p->underlayFill = QColor(20+200/4.0*1,70*(1.6-1/4.0), 150, 150);
p->tuningLine = QColor("#ff55ffff");
+ p->passband = QColor("#ff55ffcc");
p->meterLevel = QColor("#148CD2").darker();
p->meterAverage = QColor("#3FB7CD");
@@ -2786,6 +2790,7 @@ void wfmain::setDefaultColors(int presetNumber)
p->spectrumLine = QColor(Qt::black);
p->underlayLine = QColor(Qt::blue);
p->tuningLine = QColor(Qt::darkBlue);
+ p->passband = QColor(Qt::blue);
p->meterAverage = QColor("#3FB7CD");
p->meterPeakLevel = QColor("#3CA0DB");
@@ -6612,8 +6617,8 @@ void wfmain::useColorPreset(colorPrefsType *cp)
plot->yAxis->setTickPen(cp->axisColor);
freqIndicatorLine->setPen(QPen(cp->tuningLine));
- //passbandIndicator->setPen(QPen(cp->tuningLine));
- //passbandIndicator->setBrush(QBrush(cp->tuningLine));
+ passbandIndicator->setPen(QPen(cp->passband));
+ passbandIndicator->setBrush(QBrush(cp->passband));
plot->graph(0)->setPen(QPen(cp->spectrumLine));
plot->graph(0)->setBrush(QBrush(cp->spectrumFill));
@@ -6741,6 +6746,7 @@ void wfmain::loadColorPresetToUIandPlots(int presetNumber)
setEditAndLedFromColor(p.underlayFill, ui->colorEditUnderlayFill, ui->colorSwatchUnderlayFill);
setEditAndLedFromColor(p.plotBackground, ui->colorEditPlotBackground, ui->colorSwatchPlotBackground);
setEditAndLedFromColor(p.tuningLine, ui->colorEditTuningLine, ui->colorSwatchTuningLine);
+ setEditAndLedFromColor(p.passband, ui->colorEditPassband, ui->colorSwatchPassband);
setEditAndLedFromColor(p.meterLevel, ui->colorEditMeterLevel, ui->colorSwatchMeterLevel);
setEditAndLedFromColor(p.meterAverage, ui->colorEditMeterAvg, ui->colorSwatchMeterAverage);
@@ -6974,16 +6980,30 @@ void wfmain::on_colorEditWfText_editingFinished()
void wfmain::on_colorSetBtnTuningLine_clicked()
{
int pos = ui->colorPresetCombo->currentIndex();
- QColor *c = &(colorPreset[pos].tuningLine);
+ QColor* c = &(colorPreset[pos].tuningLine);
setColorButtonOperations(c, ui->colorEditTuningLine, ui->colorSwatchTuningLine);
}
void wfmain::on_colorEditTuningLine_editingFinished()
{
int pos = ui->colorPresetCombo->currentIndex();
- QColor *c = &(colorPreset[pos].tuningLine);
+ QColor* c = &(colorPreset[pos].tuningLine);
setColorLineEditOperations(c, ui->colorEditTuningLine, ui->colorSwatchTuningLine);
}
+// Passband:
+void wfmain::on_colorSetBtnPassband_clicked()
+{
+ int pos = ui->colorPresetCombo->currentIndex();
+ QColor* c = &(colorPreset[pos].passband);
+ setColorButtonOperations(c, ui->colorEditPassband, ui->colorSwatchTuningLine);
+}
+void wfmain::on_colorEditPassband_editingFinished()
+{
+ int pos = ui->colorPresetCombo->currentIndex();
+ QColor* c = &(colorPreset[pos].passband);
+ setColorLineEditOperations(c, ui->colorEditPassband, ui->colorSwatchTuningLine);
+}
+
// Meter Level:
void wfmain::on_colorSetBtnMeterLevel_clicked()
{
@@ -7093,6 +7113,7 @@ void wfmain::on_colorSavePresetBtn_clicked()
settings->setValue("underlayFill", p->underlayFill.name(QColor::HexArgb));
settings->setValue("plotBackground", p->plotBackground.name(QColor::HexArgb));
settings->setValue("tuningLine", p->tuningLine.name(QColor::HexArgb));
+ settings->setValue("passband", p->passband.name(QColor::HexArgb));
settings->setValue("wfBackground", p->wfBackground.name(QColor::HexArgb));
settings->setValue("wfGrid", p->wfGrid.name(QColor::HexArgb));
settings->setValue("wfAxis", p->wfAxis.name(QColor::HexArgb));
diff --git a/wfmain.h b/wfmain.h
index 2517afe..b0e74ed 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -610,6 +610,10 @@ private slots:
void on_colorEditTuningLine_editingFinished();
+ void on_colorSetBtnPassband_clicked();
+
+ void on_colorEditPassband_editingFinished();
+
void on_colorSetBtnMeterLevel_clicked();
void on_colorEditMeterLevel_editingFinished();
diff --git a/wfmain.ui b/wfmain.ui
index 705a71f..357c15a 100644
--- a/wfmain.ui
+++ b/wfmain.ui
@@ -6,8 +6,8 @@
0
0
- 1032
- 582
+ 1147
+ 636
@@ -18,7 +18,7 @@
-
- 0
+ 3
@@ -2223,7 +2223,7 @@
-
- 3
+ 1
@@ -3343,388 +3343,12 @@
0
0
- 204
- 582
+ 908
+ 362
- -
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
- Waterfall Grid
-
-
-
- -
-
-
- -
-
-
- Spectrum Fill
-
-
-
- -
-
-
- Underlay Fill
-
-
-
- -
-
-
- -
-
-
- Meter Average
-
-
-
- -
-
-
- Meter High Scale
-
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
- -
-
-
- Waterfall Back
-
-
-
- -
-
-
- Plot Background
-
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- Color text format is #AARRGGBB, where AA is the "alpha" channel, and value "00" is totally transparent, and "ff" is totally opaque.
-
-
- #AARRGGBB
-
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
- Waterfall Text
-
-
-
- -
-
-
- -
-
-
- Axis
-
-
-
- -
-
-
- -
-
-
- -
-
-
- Waterfall Axis
-
-
-
- -
-
-
- -
-
-
- Grid
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- Tuning Line
-
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
- Text
-
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
- -
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
- Meter Peak Level
-
-
-
- -
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
+
-
Qt::Horizontal
@@ -3737,69 +3361,485 @@
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
-
- 90
- 16777215
-
-
-
- #AARRGGBB
-
-
-
- -
-
-
- Spectrum Line
-
-
-
- -
-
-
- -
-
-
- Meter Text
-
-
-
- -
-
-
- Underlay Line
-
-
-
- -
-
-
- Meter Scale
-
-
-
- -
-
-
- Meter Level
-
-
+
-
+
+
-
+
+
+ Axis
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ Meter Text
+
+
+
+ -
+
+
+ Meter Scale
+
+
+
+ -
+
+
+ Underlay Fill
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ Waterfall Grid
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ Underlay Line
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ Grid
+
+
+
+ -
+
+
+ Meter High Scale
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ Color text format is #AARRGGBB, where AA is the "alpha" channel, and value "00" is totally transparent, and "ff" is totally opaque.
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ Tuning Line
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ Meter Level
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ Plot Background
+
+
+
+ -
+
+
+ Waterfall Axis
+
+
+
+ -
+
+
+ Spectrum Fill
+
+
+
+ -
+
+
+ Spectrum Line
+
+
+
+ -
+
+
+ Text
+
+
+
+ -
+
+
+ Passband
+
+
+
+ -
+
+
+ Waterfall Text
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ Meter Peak Level
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ Meter Average
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+
+ 90
+ 16777215
+
+
+
+ #AARRGGBB
+
+
+
+ -
+
+
+ Waterfall Back
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
@@ -4808,7 +4848,7 @@
0
0
- 1032
+ 1147
21
diff --git a/wfview.vcxproj.user b/wfview.vcxproj.user
index 71025e6..cb86757 100644
--- a/wfview.vcxproj.user
+++ b/wfview.vcxproj.user
@@ -7,9 +7,9 @@
PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH)
- 2022-09-18T13:19:41.5782674Z
+ 2022-09-26T10:48:44.8024404Z
- 2022-09-18T13:19:41.9056515Z
+ 2022-09-26T10:48:45.0730287Z
\ No newline at end of file