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

Small cleanup.

monitor
Elliott Liggett 2022-08-22 20:44:58 -07:00
rodzic fa0752518d
commit 2a456b2adb
2 zmienionych plików z 0 dodań i 94 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

62
wfmain.cpp
Wyświetl plik

@ -985,12 +985,6 @@ void wfmain::setInitialTiming()
delayedCommand->setSingleShot(false);
connect(delayedCommand, SIGNAL(timeout()), this, SLOT(sendRadioCommandLoop()));
// TODO: Remove this:
// periodicPollingTimer = new QTimer(this);
// periodicPollingTimer->setInterval(10);
// periodicPollingTimer->setSingleShot(false);
//connect(periodicPollingTimer, SIGNAL(timeout()), this, SLOT(sendRadioCommandLoop()));
pttTimer = new QTimer(this);
pttTimer->setInterval(180*1000); // 3 minute max transmit time in ms
pttTimer->setSingleShot(true);
@ -2659,60 +2653,6 @@ void wfmain::setDefaultColors()
pLight->wfText = QColor(Qt::black);
}
void wfmain::setPlotTheme(QCustomPlot *plot, bool isDark)
{
// TODO: Remove this function
/*
if(isDark)
{
plot->setBackground(prefs.colorScheme.Dark_PlotBackground);
//plot->setBackground(QColor(0,0,0,255));
plot->xAxis->grid()->setPen(prefs.colorScheme.Dark_PlotAxisPen);
plot->yAxis->grid()->setPen(prefs.colorScheme.Dark_PlotAxisPen);
plot->legend->setTextColor(prefs.colorScheme.Dark_PlotLegendTextColor);
plot->legend->setBorderPen(prefs.colorScheme.Dark_PlotLegendBorderPen);
plot->legend->setBrush(prefs.colorScheme.Dark_PlotLegendBrush);
plot->xAxis->setTickLabelColor(prefs.colorScheme.Dark_PlotTickLabel);
plot->xAxis->setLabelColor(prefs.colorScheme.Dark_PlotTickLabel);
plot->yAxis->setTickLabelColor(prefs.colorScheme.Dark_PlotTickLabel);
plot->yAxis->setLabelColor(prefs.colorScheme.Dark_PlotTickLabel);
plot->xAxis->setBasePen(prefs.colorScheme.Dark_PlotBasePen);
plot->xAxis->setTickPen(prefs.colorScheme.Dark_PlotTickPen);
plot->yAxis->setBasePen(prefs.colorScheme.Dark_PlotBasePen);
plot->yAxis->setTickPen(prefs.colorScheme.Dark_PlotTickPen);
plot->graph(0)->setPen(prefs.colorScheme.Dark_PeakPlotLine);
freqIndicatorLine->setPen(prefs.colorScheme.Dark_TuningLine);
} else {
//color = ui->groupBox->palette().color(QPalette::Button);
plot->setBackground(prefs.colorScheme.Light_PlotBackground);
plot->xAxis->grid()->setPen(prefs.colorScheme.Light_PlotAxisPen);
plot->yAxis->grid()->setPen(prefs.colorScheme.Light_PlotAxisPen);
plot->legend->setTextColor(prefs.colorScheme.Light_PlotLegendTextColor);
plot->legend->setBorderPen(prefs.colorScheme.Light_PlotLegendBorderPen);
plot->legend->setBrush(prefs.colorScheme.Light_PlotLegendBrush);
plot->xAxis->setTickLabelColor(prefs.colorScheme.Light_PlotTickLabel);
plot->xAxis->setLabelColor(prefs.colorScheme.Light_PlotTickLabel);
plot->yAxis->setTickLabelColor(prefs.colorScheme.Light_PlotTickLabel);
plot->yAxis->setLabelColor(prefs.colorScheme.Light_PlotTickLabel);
plot->xAxis->setBasePen(prefs.colorScheme.Light_PlotBasePen);
plot->xAxis->setTickPen(prefs.colorScheme.Light_PlotTickPen);
plot->yAxis->setBasePen(prefs.colorScheme.Light_PlotBasePen);
plot->yAxis->setTickPen(prefs.colorScheme.Light_PlotTickLabel);
plot->graph(0)->setPen(prefs.colorScheme.Light_PeakPlotLine);
freqIndicatorLine->setPen(prefs.colorScheme.Light_TuningLine);
}
*/
}
void wfmain::doCmd(commandtype cmddata)
{
cmds cmd = cmddata.cmd;
@ -2837,10 +2777,8 @@ void wfmain::doCmd(commandtype cmddata)
doCmd(cmd);
break;
}
}
void wfmain::doCmd(cmds cmd)
{
// Use this function to take action upon a command.

32
wfmain.h
Wyświetl plik

@ -642,10 +642,7 @@ private:
QCustomPlot *plot; // line plot
QCustomPlot *wf; // waterfall image
QCPItemLine * freqIndicatorLine;
//commHandler *comm;
void setAppTheme(bool isCustom);
// TODO: Remove this function
void setPlotTheme(QCustomPlot *plot, bool isDark);
void prepareWf();
void prepareWf(unsigned int wfLength);
void preparePlasma();
@ -836,32 +833,6 @@ private:
freqMemory mem;
// TODO: Remove colorScheme in favor of colorPreset
struct colors {
QColor Dark_PlotBackground;
QColor Dark_PlotAxisPen;
QColor Dark_PlotLegendTextColor;
QColor Dark_PlotLegendBorderPen;
QColor Dark_PlotLegendBrush;
QColor Dark_PlotTickLabel;
QColor Dark_PlotBasePen;
QColor Dark_PlotTickPen;
QColor Dark_PeakPlotLine;
QColor Dark_TuningLine;
QColor Light_PlotBackground;
QColor Light_PlotAxisPen;
QColor Light_PlotLegendTextColor;
QColor Light_PlotLegendBorderPen;
QColor Light_PlotLegendBrush;
QColor Light_PlotTickLabel;
QColor Light_PlotBasePen;
QColor Light_PlotTickPen;
QColor Light_PeakPlotLine;
QColor Light_TuningLine;
} colorScheme;
colorPrefsType colorPreset[numColorPresetsTotal];
struct preferences {
@ -906,9 +877,6 @@ private:
audioSetup rxSetup;
audioSetup txSetup;
// TODO: Remove
colors defaultColors;
void setDefaultColors(); // populate with default values
void useColors(); // set the plot up
void setDefPrefs(); // populate default values to default prefs