mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix passband colorswatch

knobtest
Phil Taylor 2022-09-28 17:34:15 +01:00
rodzic 0bb57a859d
commit bbc2613942
3 zmienionych plików z 11 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
wfmain.cpp
Wyświetl plik

@ -1455,7 +1455,7 @@ void wfmain::loadSettings()
p->underlayFill.setNamedColor(settings->value("underlayFill", p->underlayFill.name(QColor::HexArgb)).toString()); 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->plotBackground.setNamedColor(settings->value("plotBackground", p->plotBackground.name(QColor::HexArgb)).toString());
p->tuningLine.setNamedColor(settings->value("tuningLine", p->tuningLine.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->wfBackground.setNamedColor(settings->value("wfBackground", p->wfBackground.name(QColor::HexArgb)).toString());
p->wfGrid.setNamedColor(settings->value("wfGrid", p->wfGrid.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()); 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->underlayLine = QColor("#9633ff55");
p->underlayFill = QColor(20+200/4.0*1,70*(1.6-1/4.0), 150, 150); p->underlayFill = QColor(20+200/4.0*1,70*(1.6-1/4.0), 150, 150);
p->tuningLine = QColor("#ff55ffff"); p->tuningLine = QColor("#ff55ffff");
p->passband = QColor("#ff55ffcc"); p->passband = QColor("#2effffff");
p->meterLevel = QColor("#148CD2").darker(); p->meterLevel = QColor("#148CD2").darker();
p->meterAverage = QColor("#3FB7CD"); p->meterAverage = QColor("#3FB7CD");
@ -7063,13 +7063,13 @@ void wfmain::on_colorSetBtnPassband_clicked()
{ {
int pos = ui->colorPresetCombo->currentIndex(); int pos = ui->colorPresetCombo->currentIndex();
QColor* c = &(colorPreset[pos].passband); QColor* c = &(colorPreset[pos].passband);
setColorButtonOperations(c, ui->colorEditPassband, ui->colorSwatchTuningLine); setColorButtonOperations(c, ui->colorEditPassband, ui->colorSwatchPassband);
} }
void wfmain::on_colorEditPassband_editingFinished() void wfmain::on_colorEditPassband_editingFinished()
{ {
int pos = ui->colorPresetCombo->currentIndex(); int pos = ui->colorPresetCombo->currentIndex();
QColor* c = &(colorPreset[pos].passband); QColor* c = &(colorPreset[pos].passband);
setColorLineEditOperations(c, ui->colorEditPassband, ui->colorSwatchTuningLine); setColorLineEditOperations(c, ui->colorEditPassband, ui->colorSwatchPassband);
} }
// Meter Level: // Meter Level:

10
wfmain.ui
Wyświetl plik

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1119</width> <width>1075</width>
<height>896</height> <height>660</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -3343,8 +3343,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>897</width> <width>853</width>
<height>547</height> <height>311</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
@ -5007,7 +5007,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1119</width> <width>1075</width>
<height>21</height> <height>21</height>
</rect> </rect>
</property> </property>

4
wfview.vcxproj.user
Wyświetl plik

@ -7,9 +7,9 @@
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH)</LocalDebuggerEnvironment> <LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<QtLastBackgroundBuild>2022-09-26T11:09:20.6823982Z</QtLastBackgroundBuild> <QtLastBackgroundBuild>2022-09-28T16:29:42.1921277Z</QtLastBackgroundBuild>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<QtLastBackgroundBuild>2022-09-26T11:09:20.9493996Z</QtLastBackgroundBuild> <QtLastBackgroundBuild>2022-09-28T16:29:42.4500038Z</QtLastBackgroundBuild>
</PropertyGroup> </PropertyGroup>
</Project> </Project>