chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Block lower 500Hz from being used to allow frequency separation

Browse Source
This commit is contained in:
Jordan Sherer 2018-08-23 13:10:20 -04:00
parent 5d0e91a5ed
commit 5166b1e0dd
5 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
FrequencyList.cpp
View File

@ -27,15 +27,15 @@ namespace
FrequencyList_v2::FrequencyItems const default_frequency_list = FrequencyList_v2::FrequencyItems const default_frequency_list =
{ {
{ 1842500, Modes::FT8CALL, IARURegions::ALL}, // 2.5 above { 1842500, Modes::FT8CALL, IARURegions::ALL}, // 2.5 above
{ 3578500, Modes::FT8CALL, IARURegions::ALL}, // 5.5 above { 3578000, Modes::FT8CALL, IARURegions::ALL}, // 5 above
{ 7078500, Modes::FT8CALL, IARURegions::ALL}, // 4.5 above { 7078000, Modes::FT8CALL, IARURegions::ALL}, // 4 above
{10130500, Modes::FT8CALL, IARURegions::ALL}, // 5.5 below {10130000, Modes::FT8CALL, IARURegions::ALL}, // 6 below
{14078500, Modes::FT8CALL, IARURegions::ALL}, // 4.5 above {14078000, Modes::FT8CALL, IARURegions::ALL}, // 4 above
{18104500, Modes::FT8CALL, IARURegions::ALL}, // 4.5 above {18104000, Modes::FT8CALL, IARURegions::ALL}, // 4 above
{21078500, Modes::FT8CALL, IARURegions::ALL}, // 4.5 above {21078000, Modes::FT8CALL, IARURegions::ALL}, // 4 above
{24922500, Modes::FT8CALL, IARURegions::ALL}, // 9.5 above {24922000, Modes::FT8CALL, IARURegions::ALL}, // 9 above
{28078500, Modes::FT8CALL, IARURegions::ALL}, // 4.5 above {28078000, Modes::FT8CALL, IARURegions::ALL}, // 4 above
{50318500, Modes::FT8CALL, IARURegions::ALL}, // 5.5 above {50318000, Modes::FT8CALL, IARURegions::ALL}, // 5 above
}; };
} }

3
mainwindow.cpp
View File

@ -7762,6 +7762,9 @@ void MainWindow::setFreq4(int rxFreq, int txFreq)
txFreq = rxFreq; txFreq = rxFreq;
} }
rxFreq = max(500, rxFreq);
txFreq = max(500, txFreq);
m_previousFreq = currentFreqOffset(); m_previousFreq = currentFreqOffset();
if (ui->RxFreqSpinBox->isEnabled ()) ui->RxFreqSpinBox->setValue(rxFreq); if (ui->RxFreqSpinBox->isEnabled ()) ui->RxFreqSpinBox->setValue(rxFreq);

11
plotter.cpp
View File

@ -329,6 +329,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
QPen penOrange(QColor(255,165,0),3); QPen penOrange(QColor(255,165,0),3);
QPen penGreen(Qt::green, 3); //Mark Tol range with green line QPen penGreen(Qt::green, 3); //Mark Tol range with green line
QPen penRed(Qt::red, 3); //Mark Tx freq with red QPen penRed(Qt::red, 3); //Mark Tx freq with red
QPen penYellow(QColor(243, 156, 18), 3); //Mark band block freq with this pen
QPainter painter(&m_OverlayPixmap); QPainter painter(&m_OverlayPixmap);
painter.initFrom(this); painter.initFrom(this);
QLinearGradient gradient(0, 0, 0 ,m_h2); //fill background with gradient QLinearGradient gradient(0, 0, 0 ,m_h2); //fill background with gradient
@ -396,7 +397,7 @@ void CPlotter::DrawOverlay() //DrawOverlay()
if(m_freqPerDiv==200) minor=4; if(m_freqPerDiv==200) minor=4;
for( int i=1; i<minor*m_hdivs; i++) { //minor ticks for( int i=1; i<minor*m_hdivs; i++) { //minor ticks
x = i*pixperdiv/minor; x = i*pixperdiv/minor;
painter0.drawLine(x,24,x,30); painter0.drawLine(x,22,x,30);
} }
//draw frequency values //draw frequency values
@ -557,6 +558,14 @@ void CPlotter::DrawOverlay() //DrawOverlay()
} }
} }
x1=XfromFreq(0);
x2=XfromFreq(500);
if(x1<=m_w and x2>=0) {
painter0.setPen(penYellow); //Mark bottom of sub-band
painter0.drawLine(x1,26,x2,26);
painter0.drawLine(x1,28,x2,28);
}
if(m_mode=="FT8"){ if(m_mode=="FT8"){
int fwidth=XfromFreq(m_rxFreq+bw)-XfromFreq(m_rxFreq); int fwidth=XfromFreq(m_rxFreq+bw)-XfromFreq(m_rxFreq);
QPainter overPainter(&m_FullOverlayPixmap); QPainter overPainter(&m_FullOverlayPixmap);

8
widegraph.cpp
View File

@ -80,14 +80,14 @@ WideGraph::WideGraph(QSettings * settings, QWidget *parent) :
ui->widePlot->setBinsPerPixel(nbpp); ui->widePlot->setBinsPerPixel(nbpp);
ui->sbPercent2dPlot->setValue(m_Percent2DScreen); ui->sbPercent2dPlot->setValue(m_Percent2DScreen);
ui->widePlot->SetPercent2DScreen(m_Percent2DScreen); ui->widePlot->SetPercent2DScreen(m_Percent2DScreen);
ui->widePlot->setStartFreq(m_settings->value("StartFreq",0).toInt()); ui->widePlot->setStartFreq(m_settings->value("StartFreq", 500).toInt());
ui->fStartSpinBox->setValue(ui->widePlot->startFreq()); ui->fStartSpinBox->setValue(ui->widePlot->startFreq());
m_waterfallPalette=m_settings->value("WaterfallPalette","Default").toString(); m_waterfallPalette=m_settings->value("WaterfallPalette","Default").toString();
m_userPalette = WFPalette {m_settings->value("UserPalette").value<WFPalette::Colours> ()}; m_userPalette = WFPalette {m_settings->value("UserPalette").value<WFPalette::Colours> ()};
m_fMinPerBand = m_settings->value ("FminPerBand").toHash (); m_fMinPerBand = m_settings->value ("FminPerBand").toHash ();
setRxRange (); setRxRange ();
ui->controls_widget->setVisible(!m_settings->value("HideControls", true).toBool()); ui->controls_widget->setVisible(!m_settings->value("HideControls", false).toBool());
ui->cbControls->setChecked(!m_settings->value("HideControls", true).toBool()); ui->cbControls->setChecked(!m_settings->value("HideControls", false).toBool());
} }
int index=0; int index=0;
@ -212,6 +212,8 @@ void WideGraph::on_offsetSpinBox_valueChanged(int n){
return; return;
} }
n = qMax(500, n);
setRxFreq(n); setRxFreq(n);
setTxFreq(n); setTxFreq(n);
setFreq2(n, n); setFreq2(n, n);

3
widegraph.ui
View File

@ -177,6 +177,9 @@
<property name="singleStep"> <property name="singleStep">
<number>100</number> <number>100</number>
</property> </property>
<property name="value">
<number>500</number>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="12"> <item row="1" column="12">