diff --git a/wfmain.cpp b/wfmain.cpp index ea97ea2..dc4cdd0 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -1455,7 +1455,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->passband.setNamedColor(settings->value("passband", p->passband.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()); @@ -2764,7 +2764,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->passband = QColor("#2effffff"); p->meterLevel = QColor("#148CD2").darker(); p->meterAverage = QColor("#3FB7CD"); @@ -7063,13 +7063,13 @@ void wfmain::on_colorSetBtnPassband_clicked() { int pos = ui->colorPresetCombo->currentIndex(); QColor* c = &(colorPreset[pos].passband); - setColorButtonOperations(c, ui->colorEditPassband, ui->colorSwatchTuningLine); + setColorButtonOperations(c, ui->colorEditPassband, ui->colorSwatchPassband); } void wfmain::on_colorEditPassband_editingFinished() { int pos = ui->colorPresetCombo->currentIndex(); QColor* c = &(colorPreset[pos].passband); - setColorLineEditOperations(c, ui->colorEditPassband, ui->colorSwatchTuningLine); + setColorLineEditOperations(c, ui->colorEditPassband, ui->colorSwatchPassband); } // Meter Level: diff --git a/wfmain.ui b/wfmain.ui index f935c2b..62de972 100644 --- a/wfmain.ui +++ b/wfmain.ui @@ -6,8 +6,8 @@ 0 0 - 1119 - 896 + 1075 + 660 @@ -3343,8 +3343,8 @@ 0 0 - 897 - 547 + 853 + 311 @@ -5007,7 +5007,7 @@ 0 0 - 1119 + 1075 21 diff --git a/wfview.vcxproj.user b/wfview.vcxproj.user index b8cb75f..58abce7 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-26T11:09:20.6823982Z + 2022-09-28T16:29:42.1921277Z - 2022-09-26T11:09:20.9493996Z + 2022-09-28T16:29:42.4500038Z \ No newline at end of file