Fixed spec percent bug. Reduced default controls to nil

This commit is contained in:
Jordan Sherer 2018-07-09 15:34:44 -04:00
parent 2a7f38b187
commit 722f2f10ae
3 changed files with 11 additions and 10 deletions

View File

@ -36,7 +36,7 @@ CPlotter::CPlotter(QWidget *parent) : //CPlotter Constructor
m_line {0},
m_fSample {12000},
m_nsps {6912},
m_Percent2DScreen {30}, //percent of screen used for 2D display
m_Percent2DScreen {0}, //percent of screen used for 2D display
m_Percent2DScreen0 {0},
m_rxFreq {1020},
m_txFreq {0},

View File

@ -64,8 +64,8 @@ WideGraph::WideGraph(QSettings * settings, QWidget *parent) :
ui->bppSpinBox->setValue(n);
m_nsmo=m_settings->value("SmoothYellow",1).toInt();
ui->smoSpinBox->setValue(m_nsmo);
m_Percent2DScreen=m_settings->value("Percent2D",30).toInt();
m_waterfallAvg = m_settings->value("WaterfallAvg",5).toInt();
m_Percent2DScreen=m_settings->value("Percent2D", 0).toInt();
m_waterfallAvg = m_settings->value("WaterfallAvg", 1).toInt();
ui->waterfallAvgSpinBox->setValue(m_waterfallAvg);
ui->widePlot->setWaterfallAvg(m_waterfallAvg);
ui->widePlot->setCurrent(m_settings->value("Current",false).toBool());
@ -76,17 +76,18 @@ WideGraph::WideGraph(QSettings * settings, QWidget *parent) :
if(ui->widePlot->cumulative()) ui->spec2dComboBox->setCurrentIndex(1);
if(ui->widePlot->linearAvg()) ui->spec2dComboBox->setCurrentIndex(2);
if(ui->widePlot->Reference()) ui->spec2dComboBox->setCurrentIndex(3);
int nbpp=m_settings->value("BinsPerPixel",2).toInt();
int nbpp=m_settings->value("BinsPerPixel", 4).toInt();
ui->widePlot->setBinsPerPixel(nbpp);
ui->sbPercent2dPlot->setValue(m_Percent2DScreen);
ui->widePlot->SetPercent2DScreen(m_Percent2DScreen);
ui->widePlot->setStartFreq(m_settings->value("StartFreq",0).toInt());
ui->fStartSpinBox->setValue(ui->widePlot->startFreq());
m_waterfallPalette=m_settings->value("WaterfallPalette","Default").toString();
m_userPalette = WFPalette {m_settings->value("UserPalette").value<WFPalette::Colours> ()};
m_fMinPerBand = m_settings->value ("FminPerBand").toHash ();
setRxRange ();
ui->controls_widget->setVisible(!m_settings->value("HideControls",false).toBool());
ui->cbControls->setChecked(!m_settings->value("HideControls",false).toBool());
ui->controls_widget->setVisible(!m_settings->value("HideControls", true).toBool());
ui->cbControls->setChecked(!m_settings->value("HideControls", true).toBool());
}
int index=0;

View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>799</width>
<width>942</width>
<height>337</height>
</rect>
</property>
@ -68,7 +68,7 @@
<string>Controls</string>
</property>
<property name="checked">
<bool>true</bool>
<bool>false</bool>
</property>
</widget>
</widget>
@ -219,7 +219,7 @@
<number>5</number>
</property>
<property name="value">
<number>30</number>
<number>0</number>
</property>
</widget>
</item>
@ -293,7 +293,7 @@
<number>1</number>
</property>
<property name="value">
<number>2</number>
<number>5</number>
</property>
</widget>
</item>