diff --git a/qmap/about.cpp b/qmap/about.cpp index 508e9692a..35e2b99e3 100644 --- a/qmap/about.cpp +++ b/qmap/about.cpp @@ -13,7 +13,7 @@ CAboutDlg::CAboutDlg(QWidget *parent) : "QMAP is a wideband receiver for the Q65 protocol, intnded
" "primarily for amateur radio EME communication. It works
" "in close cooperation with WSJT-X, versions 2.7 and later.

" - "Copyright 2001-2023 by Joe Taylor, K1JT. Additional
" + "Copyright 2001-2024 by Joe Taylor, K1JT. Additional
" "acknowledgments are contained in the source code."); } diff --git a/qmap/astro.cpp b/qmap/astro.cpp index 615a4c222..fd6f7ff04 100644 --- a/qmap/astro.cpp +++ b/qmap/astro.cpp @@ -44,10 +44,8 @@ Astro::~Astro() delete ui; } -void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid, - int fQSO, int nsetftx, int ntxFreq, QString azelDir, double xavg) +void Astro::astroUpdate(QDateTime t, QString mygrid, QString azelDir, double xavg) { - static int ntxFreq0=-99; char cc[300]; double azsun,elsun,azmoon,elmoon,azmoondx,elmoondx; double ramoon,decmoon,dgrd,poloffset,xnr; @@ -63,10 +61,9 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid, int isec=sec; double uth=nhr + nmin/60.0 + sec/3600.0; int nfreq=(int)datcom_.fcenter; -// if(nfreq<10 or nfreq > 50000) nfreq=144; astrosub_(&nyear, &month, &nday, &uth, &nfreq, mygrid.toLatin1(), - hisgrid.toLatin1(), &azsun, &elsun, &azmoon, &elmoon, + mygrid.toLatin1(), &azsun, &elsun, &azmoon, &elmoon, &azmoondx, &elmoondx, &ntsky, &ndop, &ndop00,&ramoon, &decmoon, &dgrd, &poloffset, &xnr, 6, 6); @@ -76,18 +73,15 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid, snprintf(cc, sizeof(cc), "Az: %6.1f\n" "El: %6.1f\n" - "MyDop: %6d\n" - "DxAz: %6.1f\n" - "DxEl: %6.1f\n" - "DxDop: %6d\n" - "Dec: %6.1f\n" + "SelfDop:%5d\n" + "MoonDec:%5.1f\n" "SunAz: %6.1f\n" "SunEl: %6.1f\n" "Freq: %6d\n" "Tsky: %6d\n" "MNR: %6.1f\n" "Dgrd: %6.1f", - azmoon,elmoon,ndop00,azmoondx,elmoondx,ndop,decmoon,azsun,elsun, + azmoon,elmoon,ndop00,decmoon,azsun,elsun, nfreq,ntsky,xnr,dgrd); ui->astroTextBrowser->setText(" "+ date + "\nUTC: " + utc + "\n" + cc); @@ -155,7 +149,6 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid, // Write pointing data to azel.dat QString fname=azelDir+"/azel.dat"; -// qDebug() << "aa" << fname << isec << bPointing << azOffset << elOffset; QFile f(fname); if(!f.open(QIODevice::WriteOnly | QIODevice::Text)) { if(azelDir==m_AzElDir0) return; @@ -165,22 +158,15 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid, mb.exec(); return; } - int ndiff=0; - if(ntxFreq != ntxFreq0) ndiff=1; - ntxFreq0=ntxFreq; QTextStream out(&f); snprintf(cc,sizeof(cc),"%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Moon\n" "%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Sun\n" "%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Source\n" - "%4d,%6d,%6d,Doppler\n" - "%3d,%1d,fQSO\n" - "%3d,%1d,fQSO2\n", + "%4d,%6d,%6d,Doppler\n", nhr,nmin,isec,azmoon,elmoon, nhr,nmin,isec,azsun+azOffset,elsun+elOffset, nhr,nmin,isec,0.0,0.0, - nfreq,ndop,ndop00, - fQSO,nsetftx, - ntxFreq,ndiff); + nfreq,ndop,ndop00); out << cc; f.close(); } diff --git a/qmap/astro.h b/qmap/astro.h index 51a0bc1a9..325027304 100644 --- a/qmap/astro.h +++ b/qmap/astro.h @@ -14,8 +14,7 @@ class Astro : public QWidget public: explicit Astro (QString const& settings_filename, QWidget *parent = 0); - void astroUpdate(QDateTime t, QString mygrid, QString hisgrid, - int fQSO, int nsetftx, int ntxFreq, QString azelDir, double xavg); + void astroUpdate(QDateTime t, QString mygrid, QString azelDir, double xavg); void setFontSize(int n); int getSelfDop(); diff --git a/qmap/astro.ui b/qmap/astro.ui index 299d411c8..45fa5b9e4 100644 --- a/qmap/astro.ui +++ b/qmap/astro.ui @@ -172,7 +172,7 @@ Dwell - 10 + 15 300 @@ -241,6 +241,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 90 + + + + diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp index 914d193fe..856f83fa0 100644 --- a/qmap/mainwindow.cpp +++ b/qmap/mainwindow.cpp @@ -1032,9 +1032,7 @@ void MainWindow::guiUpdate() } QDateTime t = QDateTime::currentDateTimeUtc(); - int fQSO=m_wide_graph_window->QSOfreq(); - m_astro_window->astroUpdate(t, m_myGrid, m_hisGrid, fQSO, m_setftx, - m_txFreq, m_azelDir, m_xavg); + m_astro_window->astroUpdate(t, m_myGrid, m_azelDir, m_xavg); m_setftx=0; QString utc = t.date().toString(" yyyy MMM dd \n") + t.time().toString(); ui->labUTC->setText(utc);