w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-31 13:10:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

1. Re-scale the 2-d cumulative spectrum.

Browse Source 
2. Swap positions of "QSO Frequency" and "Band Activity" windows.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3265 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-05-14 00:22:22 +00:00
parent e881b10ce3
commit e00dd5fdb0
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mainwindow.cpp
View File

@ -70,9 +70,9 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) :
txMsgButtonGroup->addButton(ui->txrb5,5); txMsgButtonGroup->addButton(ui->txrb5,5);
txMsgButtonGroup->addButton(ui->txrb6,6); txMsgButtonGroup->addButton(ui->txrb6,6);
connect(txMsgButtonGroup,SIGNAL(buttonClicked(int)),SLOT(set_ntx(int))); connect(txMsgButtonGroup,SIGNAL(buttonClicked(int)),SLOT(set_ntx(int)));
connect(ui->decodedTextBrowser,SIGNAL(selectCallsign(bool,bool)),this,
SLOT(doubleClickOnCall(bool,bool)));
connect(ui->decodedTextBrowser2,SIGNAL(selectCallsign(bool,bool)),this, connect(ui->decodedTextBrowser2,SIGNAL(selectCallsign(bool,bool)),this,
SLOT(doubleClickOnCall(bool,bool)));
connect(ui->decodedTextBrowser,SIGNAL(selectCallsign(bool,bool)),this,
SLOT(doubleClickOnCall2(bool,bool))); SLOT(doubleClickOnCall2(bool,bool)));
setWindowTitle(Program_Title_Version); setWindowTitle(Program_Title_Version);
@ -272,8 +272,8 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) :
if(ui->actionAFMHot->isChecked()) on_actionAFMHot_triggered(); if(ui->actionAFMHot->isChecked()) on_actionAFMHot_triggered();
if(ui->actionBlue->isChecked()) on_actionBlue_triggered(); if(ui->actionBlue->isChecked()) on_actionBlue_triggered();
ui->decodedTextLabel->setFont(ui->decodedTextBrowser->font()); ui->decodedTextLabel->setFont(ui->decodedTextBrowser2->font());
ui->decodedTextLabel2->setFont(ui->decodedTextBrowser2->font()); ui->decodedTextLabel2->setFont(ui->decodedTextBrowser->font());
t="UTC dB DT Freq Message"; t="UTC dB DT Freq Message";
ui->decodedTextLabel->setText(t); ui->decodedTextLabel->setText(t);
ui->decodedTextLabel2->setText(t); ui->decodedTextLabel2->setText(t);
@ -1312,7 +1312,7 @@ void MainWindow::readFromStdout() //readFromStdout
bf.setBackground(QBrush(QColor(bg))); bf.setBackground(QBrush(QColor(bg)));
QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" + QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" +
bg + "\"><pre>" + " " + "</pre></td></tr></table>"; bg + "\"><pre>" + " " + "</pre></td></tr></table>";
cursor = ui->decodedTextBrowser2->textCursor(); cursor = ui->decodedTextBrowser->textCursor();
cursor.movePosition(QTextCursor::End); cursor.movePosition(QTextCursor::End);
bf = cursor.blockFormat(); bf = cursor.blockFormat();
bf.setBackground(QBrush(QColor(bg))); bf.setBackground(QBrush(QColor(bg)));
@ -1332,12 +1332,12 @@ void MainWindow::readFromStdout() //readFromStdout
QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" + QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" +
bg + "\"><pre>" + t1 + "</pre></td></tr></table>"; bg + "\"><pre>" + t1 + "</pre></td></tr></table>";
if(bQSO) { if(bQSO) {
cursor = ui->decodedTextBrowser->textCursor(); cursor = ui->decodedTextBrowser2->textCursor();
cursor.movePosition(QTextCursor::End); cursor.movePosition(QTextCursor::End);
bf = cursor.blockFormat(); bf = cursor.blockFormat();
bf.setBackground(QBrush(QColor(bg))); bf.setBackground(QBrush(QColor(bg)));
cursor.insertHtml(s); cursor.insertHtml(s);
ui->decodedTextBrowser->setTextCursor(cursor); ui->decodedTextBrowser2->setTextCursor(cursor);
} }
if(jt9com_.nagain==0) { if(jt9com_.nagain==0) {
@ -1347,12 +1347,12 @@ void MainWindow::readFromStdout() //readFromStdout
} }
QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" + QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" +
bg + "\"><pre>" + t1 + "</pre></td></tr></table>"; bg + "\"><pre>" + t1 + "</pre></td></tr></table>";
cursor = ui->decodedTextBrowser2->textCursor(); cursor = ui->decodedTextBrowser->textCursor();
cursor.movePosition(QTextCursor::End); cursor.movePosition(QTextCursor::End);
bf = cursor.blockFormat(); bf = cursor.blockFormat();
bf.setBackground(QBrush(QColor(bg))); bf.setBackground(QBrush(QColor(bg)));
cursor.insertHtml(s); cursor.insertHtml(s);
ui->decodedTextBrowser2->setTextCursor(cursor); ui->decodedTextBrowser->setTextCursor(cursor);
} }
QString msg=t.mid(34); QString msg=t.mid(34);
@ -1448,9 +1448,9 @@ void MainWindow::killFile()
void MainWindow::on_EraseButton_clicked() //Erase void MainWindow::on_EraseButton_clicked() //Erase
{ {
qint64 ms=QDateTime::currentMSecsSinceEpoch(); qint64 ms=QDateTime::currentMSecsSinceEpoch();
ui->decodedTextBrowser->clear(); ui->decodedTextBrowser2->clear();
if((ms-m_msErase)<500) { if((ms-m_msErase)<500) {
ui->decodedTextBrowser2->clear(); ui->decodedTextBrowser->clear();
QFile f(m_appDir + "/decoded.txt"); QFile f(m_appDir + "/decoded.txt");
if(f.exists()) f.remove(); if(f.exists()) f.remove();
} }
@ -1745,12 +1745,12 @@ void MainWindow::displayTxMsg(QString t)
t=QDateTime::currentDateTimeUtc().toString("hhmmss Tx: ") + t; t=QDateTime::currentDateTimeUtc().toString("hhmmss Tx: ") + t;
QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" + QString s = "<table border=0 cellspacing=0 width=100%><tr><td bgcolor=\"" +
bg + "\"><pre>" + t + "</pre></td></tr></table>"; bg + "\"><pre>" + t + "</pre></td></tr></table>";
cursor = ui->decodedTextBrowser->textCursor(); cursor = ui->decodedTextBrowser2->textCursor();
cursor.movePosition(QTextCursor::End); cursor.movePosition(QTextCursor::End);
bf = cursor.blockFormat(); bf = cursor.blockFormat();
bf.setBackground(QBrush(QColor(bg))); bf.setBackground(QBrush(QColor(bg)));
cursor.insertHtml(s); cursor.insertHtml(s);
ui->decodedTextBrowser->setTextCursor(cursor); ui->decodedTextBrowser2->setTextCursor(cursor);
} }
void MainWindow::startTx2() void MainWindow::startTx2()
@ -1884,14 +1884,14 @@ void MainWindow::doubleClickOnCall2(bool shift, bool ctrl)
void MainWindow::doubleClickOnCall(bool shift, bool ctrl) void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
{ {
QTextCursor cursor; QTextCursor cursor;
if(!m_decodedText2) cursor=ui->decodedTextBrowser->textCursor(); if(!m_decodedText2) cursor=ui->decodedTextBrowser2->textCursor();
if(m_decodedText2) cursor=ui->decodedTextBrowser2->textCursor(); if(m_decodedText2) cursor=ui->decodedTextBrowser->textCursor();
cursor.select(QTextCursor::LineUnderCursor); cursor.select(QTextCursor::LineUnderCursor);
int i2=cursor.position(); int i2=cursor.position();
QString t; QString t;
if(!m_decodedText2) t= ui->decodedTextBrowser->toPlainText(); //Full contents if(!m_decodedText2) t= ui->decodedTextBrowser2->toPlainText(); //Full contents
if(m_decodedText2) t= ui->decodedTextBrowser2->toPlainText(); if(m_decodedText2) t= ui->decodedTextBrowser->toPlainText();
QString t1 = t.mid(0,i2); //contents up to \n on selected line QString t1 = t.mid(0,i2); //contents up to \n on selected line
int i1=t1.lastIndexOf("\n") + 1; //points to first char of line int i1=t1.lastIndexOf("\n") + 1; //points to first char of line

4
mainwindow.ui
View File

@ -327,7 +327,7 @@ p, li { white-space: pre-wrap; }
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Band Activity</string> <string>QSO Frequency</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -350,7 +350,7 @@ p, li { white-space: pre-wrap; }
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>QSO Frequency</string> <string>Band Activity</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>

2
plotter.cpp
View File

@ -128,7 +128,7 @@ void CPlotter::draw(float swide[], float red[], int i0) //draw()
for(int k=0; k<m_binsPerPixel; k++) { for(int k=0; k<m_binsPerPixel; k++) {
sum+=jt9com_.savg[j++]; sum+=jt9com_.savg[j++];
} }
y2=gain*10.0*log10(sum/m_binsPerPixel) - 20; y2=gain*6.0*log10(sum/m_binsPerPixel) - 10.0;
} }
if(m_bJT9Sync) y2=3.0*gain*red[i] - 15; if(m_bJT9Sync) y2=3.0*gain*red[i] - 15;
if(strong != strong0 or i==m_w-1) { if(strong != strong0 or i==m_w-1) {

2
wsjtx.iss
View File

@ -14,7 +14,7 @@ Source: "c:\Users\joe\wsjt\wsjtx_install\wsjt.ico"; DestDir: "{app}"
Source: "c:\Users\joe\wsjt\wsjtx_install\afmhot.dat"; DestDir: "{app}"; Source: "c:\Users\joe\wsjt\wsjtx_install\afmhot.dat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\wsjtx_install\blue.dat"; DestDir: "{app}"; Source: "c:\Users\joe\wsjt\wsjtx_install\blue.dat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\wsjtx_install\CALL3.TXT"; DestDir: "{app}"; Flags: onlyifdoesntexist Source: "c:\Users\joe\wsjt\wsjtx_install\CALL3.TXT"; DestDir: "{app}"; Flags: onlyifdoesntexist
Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{app}"; Flags: onlyifdoesntexist Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\wsjtx\shortcuts.txt"; DestDir: "{app}" Source: "c:\Users\joe\wsjt\wsjtx\shortcuts.txt"; DestDir: "{app}"
Source: "c:\Users\joe\wsjt\wsjtx\mouse_commands.txt"; DestDir: "{app}" Source: "c:\Users\joe\wsjt\wsjtx\mouse_commands.txt"; DestDir: "{app}"
Source: "c:\Users\joe\wsjt\wsjtx\WSJT-X_Users_Guide.pdf"; DestDir: "{app}" Source: "c:\Users\joe\wsjt\wsjtx\WSJT-X_Users_Guide.pdf"; DestDir: "{app}"