w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Further progress for Echo mode. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5561 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2015-06-09 14:42:53 +00:00
parent 28b4c31dee
commit cb18d6c32e
5 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
echoplot.cpp
View File

@ -30,7 +30,6 @@ EPlotter::EPlotter(QWidget *parent) : //EPlotter Constructor
m_TxFreq = 1500;
m_line = 0;
m_dBStepSize=10;
m_Percent2DScreen = 89; //percent of screen used for 2D display
}
EPlotter::~EPlotter() { } // Destructor
@ -52,8 +51,10 @@ void EPlotter::resizeEvent(QResizeEvent* ) //resizeEvent()
m_Size = size();
m_w = m_Size.width();
m_h = m_Size.height();
m_h1 = (100-m_Percent2DScreen)*(m_Size.height())/100;
m_h2 = (m_Percent2DScreen)*(m_Size.height())/100;
m_h1=30;
m_h2=m_h-m_h1;
qDebug() << m_h << m_h1 << m_h2;
m_2DPixmap = QPixmap(m_Size.width(), m_h2);
m_2DPixmap.fill(Qt::black);
@ -288,5 +289,7 @@ int EPlotter::getSmooth() //getSmooth()
{
return m_smooth;
}
int EPlotter::plotWidth(){return m_2DPixmap.width();}
void EPlotter::UpdateOverlay() {DrawOverlay();}

1
echoplot.h
View File

@ -75,7 +75,6 @@ private:
qint32 m_hdivs;
qint32 m_line;
qint32 m_freqPerDiv;
qint32 m_Percent2DScreen;
qint32 m_h;
qint32 m_h1;
qint32 m_h2;

4
mainwindow.cpp
View File

@ -3230,6 +3230,10 @@ void MainWindow::on_actionEcho_triggered()
m_toneSpacing=1.0;
switch_mode(Modes::Echo);
m_modeTx="Echo";
m_wideGraph->setMode(m_mode);
m_wideGraph->setModeTx(m_modeTx);
ui->TxFreqSpinBox->setValue(1500);
ui->TxFreqSpinBox->setEnabled (false);
statusChanged();
if(!m_echoGraph->isVisible()) m_echoGraph->show();
mode_label->setStyleSheet("QLabel{background-color: #7cfc00}");

30
plotter.cpp
View File

@ -331,23 +331,23 @@ void CPlotter::DrawOverlay() //DrawOverlay()
}
if(m_mode != "JT4") {
QPen pen0(Qt::green, 3); //Mark Rx Freq with green
painter0.setPen(pen0);
if(m_mode=="WSPR-2") { //### WSPR-15 code needed here, too ###
x1=XfromFreq(1400);
x2=XfromFreq(1600);
painter0.drawLine(x1,29,x2,29);
} else {
x1=XfromFreq(m_rxFreq);
x2=XfromFreq(m_rxFreq+bw);
painter0.drawLine(x1,24,x1,30);
painter0.drawLine(x1,28,x2,28);
painter0.drawLine(x2,24,x2,30);
}
QPen pen0(Qt::green, 3); //Mark Rx Freq with green
painter0.setPen(pen0);
if(m_mode=="WSPR-2") { //### WSPR-15 code needed here, too ###
x1=XfromFreq(1400);
x2=XfromFreq(1600);
painter0.drawLine(x1,29,x2,29);
}
if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65") {
x1=XfromFreq(m_rxFreq);
x2=XfromFreq(m_rxFreq+bw);
painter0.drawLine(x1,24,x1,30);
painter0.drawLine(x1,28,x2,28);
painter0.drawLine(x2,24,x2,30);
}
if(m_mode != "JT4") {
if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or
m_mode.mid(0,4)=="WSPR") {
QPen pen1(Qt::red, 3); //Mark Tx freq with red
painter0.setPen(pen1);
x1=XfromFreq(m_txFreq);

1
widegraph.cpp
View File

@ -266,6 +266,7 @@ void WideGraph::setMode(QString mode) //setMode
ui->widePlot->setMode(mode);
ui->widePlot->DrawOverlay();
ui->widePlot->update();
qDebug() << "WideGraph::setMode" << m_mode;
}
void WideGraph::setSubMode(int n) //setSubMode