diff --git a/widgets/plotter.cpp b/widgets/plotter.cpp index ed1ed9d86..14c13a50d 100644 --- a/widgets/plotter.cpp +++ b/widgets/plotter.cpp @@ -141,7 +141,7 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed) //move current data down one line (must do this before attaching a QPainter object) if(bScroll and !m_bReplot) m_WaterfallPixmap.scroll(0,1,0,0,m_w,m_h1); QPainter painter1(&m_WaterfallPixmap); - if(m_bFirst or bRed or (!m_bQ65_Sync and !m_bQ65_MultiSync) or m_mode!=m_mode0 + if(m_bFirst or bRed or !m_bQ65_Sync or m_mode!=m_mode0 or m_bResized or m_rxFreq!=m_rxFreq0) { m_2DPixmap = m_OverlayPixmap.copy(0,0,m_w,m_h2); m_bFirst=false; @@ -230,7 +230,7 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed) } - if(i==iz-1 and !m_bQ65_Sync and !m_bQ65_MultiSync) { + if(i==iz-1 and !m_bQ65_Sync) { painter2D.drawPolyline(LineBuf,j); } LineBuf[j].setX(i); @@ -274,7 +274,7 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed) painter2D.drawText(x1-4,y,"73"); } - if(bRed and (m_bQ65_Sync or m_bQ65_MultiSync)) { //Plot the Q65 red or orange sync curve + if(bRed and m_bQ65_Sync) { //Plot the Q65 red or orange sync curve int k=0; int k2=0; std::ifstream f; @@ -287,7 +287,6 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed) f >> freq >> sync >> sync2; if(f.eof()) break; x=XfromFreq(freq); -// if(m_bQ65_MultiSync) sync=sync2; if(sync > -99.0 and sync != 0.0) { y=m_h2*(0.9 - 0.09*gain2d*sync) - m_plot2dZero - 10; LineBuf2[k2].setX(x); //Red sync curve @@ -301,7 +300,6 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed) } f.close(); QPen pen0(Qt::red,2); -// if(m_bQ65_MultiSync) pen0.setColor("orange"); painter2D.setPen(pen0); painter2D.drawPolyline(LineBuf2,k2); pen0.setColor("orange"); diff --git a/widgets/plotter.h b/widgets/plotter.h index a4a8d6e04..582d36451 100644 --- a/widgets/plotter.h +++ b/widgets/plotter.h @@ -82,8 +82,7 @@ public: bool Reference() const {return m_bReference;} void setQ65_Sync(bool b) {m_bQ65_Sync = b;} bool Q65_Sync() const {return m_bQ65_Sync;} - void setQ65_MultiSync(bool b) {m_bQ65_MultiSync = b;} - bool Q65_MultiSync() const {return m_bQ65_MultiSync;} void drawRed(int ia, int ib, float swide[]); + void drawRed(int ia, int ib, float swide[]); void setVHF(bool bVHF); void setRedFile(QString fRed); void setFST4_FreqRange(int fLow,int fHigh); @@ -117,7 +116,6 @@ private: bool m_bReference; bool m_bReference0; bool m_bQ65_Sync; - bool m_bQ65_MultiSync; bool m_bVHF; bool m_bSingleDecode; bool m_bFirst=true; diff --git a/widgets/widegraph.cpp b/widgets/widegraph.cpp index 6f6736029..bb53279cd 100644 --- a/widgets/widegraph.cpp +++ b/widgets/widegraph.cpp @@ -71,13 +71,11 @@ WideGraph::WideGraph(QSettings * settings, QWidget *parent) : ui->widePlot->setLinearAvg(m_settings->value("LinearAvg",false).toBool()); ui->widePlot->setReference(m_settings->value("Reference",false).toBool()); ui->widePlot->setQ65_Sync(m_settings->value("Q65_Sync",false).toBool()); - ui->widePlot->setQ65_MultiSync(m_settings->value("Q65_MultiSync",false).toBool()); if(ui->widePlot->current()) ui->spec2dComboBox->setCurrentIndex(0); if(ui->widePlot->cumulative()) ui->spec2dComboBox->setCurrentIndex(1); if(ui->widePlot->linearAvg()) ui->spec2dComboBox->setCurrentIndex(2); if(ui->widePlot->Reference()) ui->spec2dComboBox->setCurrentIndex(3); if(ui->widePlot->Q65_Sync()) ui->spec2dComboBox->setCurrentIndex(4); - if(ui->widePlot->Q65_MultiSync()) ui->spec2dComboBox->setCurrentIndex(5); int nbpp=m_settings->value("BinsPerPixel",2).toInt(); ui->widePlot->setBinsPerPixel(nbpp); ui->sbPercent2dPlot->setValue(m_Percent2DScreen); @@ -135,7 +133,6 @@ void WideGraph::saveSettings() //saveS m_settings->setValue ("LinearAvg", ui->widePlot->linearAvg()); m_settings->setValue ("Reference", ui->widePlot->Reference()); m_settings->setValue ("Q65_Sync", ui->widePlot->Q65_Sync()); - m_settings->setValue ("Q65_MultiSync", ui->widePlot->Q65_MultiSync()); m_settings->setValue ("BinsPerPixel", ui->widePlot->binsPerPixel ()); m_settings->setValue ("StartFreq", ui->widePlot->startFreq ()); m_settings->setValue ("WaterfallPalette", m_waterfallPalette); @@ -323,7 +320,6 @@ void WideGraph::on_spec2dComboBox_currentIndexChanged(int index) ui->widePlot->setLinearAvg(false); ui->widePlot->setReference(false); ui->widePlot->setQ65_Sync(false); - ui->widePlot->setQ65_MultiSync(false); ui->smoSpinBox->setEnabled(false); switch (index) { @@ -343,9 +339,6 @@ void WideGraph::on_spec2dComboBox_currentIndexChanged(int index) case 4: ui->widePlot->setQ65_Sync(true); break; - case 5: - ui->widePlot->setQ65_MultiSync(true); - break; } replot(); } diff --git a/widgets/widegraph.ui b/widgets/widegraph.ui index 202482f54..758cad8c4 100644 --- a/widgets/widegraph.ui +++ b/widgets/widegraph.ui @@ -340,11 +340,6 @@ Q65_Sync - - - Q65_MultiSync - -