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

Display Hot A/B and El in MSK144 mode.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7173 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-13 18:02:44 +00:00
parent b42c096e63
commit a3410b1e02
2 changed files with 42 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mainwindow.cpp
View File

@ -659,7 +659,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
} }
ui->labAz->setStyleSheet("border: 0px;"); ui->labAz->setStyleSheet("border: 0px;");
ui->labDist->setStyleSheet("border: 0px;"); // ui->labDist->setStyleSheet("border: 0px;");
auto t = "UTC dB DT Freq Message"; auto t = "UTC dB DT Freq Message";
ui->decodedTextLabel->setText(t); ui->decodedTextLabel->setText(t);
@ -1672,6 +1672,7 @@ void MainWindow::statusChanged()
, tr ("Cannot open \"%1\" for writing: %2") , tr ("Cannot open \"%1\" for writing: %2")
.arg (f.fileName ()).arg (f.errorString ())); .arg (f.fileName ()).arg (f.errorString ()));
} }
on_dxGridEntry_textChanged(m_hisGrid);
} }
bool MainWindow::eventFilter (QObject * object, QEvent * event) bool MainWindow::eventFilter (QObject * object, QEvent * event)
@ -3536,7 +3537,7 @@ void MainWindow::genStdMsgs(QString rpt)
QString hisCall=ui->dxCallEntry->text(); QString hisCall=ui->dxCallEntry->text();
if(!hisCall.size ()) { if(!hisCall.size ()) {
ui->labAz->clear (); ui->labAz->clear ();
ui->labDist->clear (); // ui->labDist->clear ();
ui->tx1->clear (); ui->tx1->clear ();
ui->tx2->clear (); ui->tx2->clear ();
ui->tx3->clear (); ui->tx3->clear ();
@ -3888,31 +3889,28 @@ void MainWindow::on_dxGridEntry_textChanged (QString const& grid)
m_hisGrid = grid; m_hisGrid = grid;
statusUpdate (); statusUpdate ();
} }
qint64 nsec = QDateTime::currentMSecsSinceEpoch() % 86400; qint64 nsec = (QDateTime::currentMSecsSinceEpoch()/1000) % 86400;
double utch=nsec/3600.0; double utch=nsec/3600.0;
int nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter; int nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter;
azdist_(const_cast <char *> ((m_config.my_grid () + " ").left (6).toLatin1().constData()), azdist_(const_cast <char *> ((m_config.my_grid () + " ").left (6).toLatin1().constData()),
const_cast <char *> ((m_hisGrid + " ").left (6).toLatin1().constData()),&utch, const_cast <char *> ((m_hisGrid + " ").left (6).toLatin1().constData()),&utch,
&nAz,&nEl,&nDmiles,&nDkm,&nHotAz,&nHotABetter,6,6); &nAz,&nEl,&nDmiles,&nDkm,&nHotAz,&nHotABetter,6,6);
QString t; QString t;
t.sprintf("Az: %d",nAz); int nd=nDkm;
if(m_config.miles()) nd=nDmiles;
if(m_mode=="MSK144") {
if(nHotABetter==0)t.sprintf("Az: %d B: %d El: %d %d",nAz,nHotAz,nEl,nd);
if(nHotABetter!=0)t.sprintf("Az: %d A: %d El: %d %d",nAz,nHotAz,nEl,nd);
} else {
t.sprintf("Az: %d %d",nAz,nd);
}
if(m_config.miles()) t += " mi";
if(!m_config.miles()) t += " km";
ui->labAz->setText (t); ui->labAz->setText (t);
if (m_config.miles ()) } else {
{ if (m_hisGrid.size ()) {
t.sprintf ("%d mi", int (0.621371 * nDkm));
}
else
{
t.sprintf ("%d km", nDkm);
}
ui->labDist->setText(t);
}
else {
if (m_hisGrid.size ())
{
m_hisGrid.clear (); m_hisGrid.clear ();
ui->labAz->clear (); ui->labAz->clear ();
ui->labDist->clear ();
statusUpdate (); statusUpdate ();
} }
} }

60
mainwindow.ui
View File

@ -2080,28 +2080,6 @@ list. The list can be maintained in Settings (F2).</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QLabel" name="labAz">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="indent">
<number>4</number>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLineEdit" name="dxCallEntry"> <widget class="QLineEdit" name="dxCallEntry">
<property name="toolTip"> <property name="toolTip">
@ -2115,22 +2093,6 @@ list. The list can be maintained in Settings (F2).</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QLabel" name="labDist">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="dxGridEntry"> <widget class="QLineEdit" name="dxGridEntry">
<property name="toolTip"> <property name="toolTip">
@ -2164,6 +2126,28 @@ list. The list can be maintained in Settings (F2).</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="labAz">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="indent">
<number>4</number>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>