w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-01 21:45:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove Q65_MultiSync as a separate option. We always show both red and orange sync curves.

Browse Source
This commit is contained in:
Joe Taylor
2021-02-01 15:28:22 -05:00
parent 34cb4c502d
commit 558b426944
4 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widgets/plotter.cpp
+3 -5
View File
@@ -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");