From a1329208c1ee49f8ec45d5e32717f10a184b7363 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 4 Jun 2015 19:11:54 +0000 Subject: [PATCH] Code cleanups related to Echo mode. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5527 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- astro.cpp | 32 +++++++++--------- echograph.cpp | 10 ------ mainwindow.ui | 2 +- wsjtx.pro | 89 +++++++++++++++++---------------------------------- 4 files changed, 46 insertions(+), 87 deletions(-) diff --git a/astro.cpp b/astro.cpp index 23c7dc63a..39caad991 100644 --- a/astro.cpp +++ b/astro.cpp @@ -119,24 +119,24 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid, qint64 fre << fixed << qSetFieldWidth (6) << qSetRealNumberPrecision (1) - << "Az: " << azmoon << "\n" - "El: " << elmoon << "\n" - "Dop: " << *ndop00 << "\n" - "Width: " << int(width1) << "\n" + << "Az: " << azmoon << "\n" + "El: " << elmoon << "\n" + "SelfDop:" << *ndop00 << "\n" + "Width: " << int(width1) << "\n" << qSetRealNumberPrecision (2) - << "Delay: " << techo << "\n" + << "Delay: " << techo << "\n" << qSetRealNumberPrecision (1) - << "DxAz: " << azmoondx << "\n" - "DxEl: " << elmoondx << "\n" - "DxDop: " << *ndop << "\n" - "DxWid: " << int(width2) << "\n" - "Dec: " << decmoon << "\n" - "SunAz: " << azsun << "\n" - "SunEl: " << elsun << "\n" - "Freq: " << nfreq << "\n" - "Tsky: " << ntsky << "\n" - "MNR: " << xnr << "\n" - "Dgrd: " << dgrd; + << "DxAz: " << azmoondx << "\n" + "DxEl: " << elmoondx << "\n" + "DxDop: " << *ndop << "\n" + "DxWid: " << int(width2) << "\n" + "Dec: " << decmoon << "\n" + "SunAz: " << azsun << "\n" + "SunEl: " << elsun << "\n" + "Freq: " << nfreq << "\n" + "Tsky: " << ntsky << "\n" + "MNR: " << xnr << "\n" + "Dgrd: " << dgrd; } ui_->text_label->setText(message); diff --git a/echograph.cpp b/echograph.cpp index c18cf9c7c..f3d890bcb 100644 --- a/echograph.cpp +++ b/echograph.cpp @@ -20,11 +20,6 @@ EchoGraph::EchoGraph(QSettings * settings, QWidget *parent) : ui->echoPlot->setMaximumHeight(800); //Restore user's settings -/* - QString inifile(QApplication::applicationDirPath()); - inifile += "/emecho.ini"; - QSettings settings(inifile, QSettings::IniFormat); -*/ m_settings->beginGroup("EchoGraph"); restoreGeometry (m_settings->value ("geometry", saveGeometry ()).toByteArray ()); ui->echoPlot->setPlotZero(m_settings->value("PlotZero", 0).toInt()); @@ -52,11 +47,6 @@ void EchoGraph::closeEvent (QCloseEvent * e) void EchoGraph::saveSettings() { //Save user's settings -/* - QString inifile(QApplication::applicationDirPath()); - inifile += "/emecho.ini"; - QSettings settings(inifile, QSettings::IniFormat); -*/ m_settings->beginGroup("EchoGraph"); m_settings->setValue ("geometry", saveGeometry ()); m_settings->setValue("PlotZero",ui->echoPlot->m_plotZero); diff --git a/mainwindow.ui b/mainwindow.ui index 6a7ee82d3..712b685e4 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -2385,7 +2385,7 @@ list. The list can be maintained in Settings (F2). - 140 + 160 30 diff --git a/wsjtx.pro b/wsjtx.pro index 4073b1a3c..fc1e7b5ea 100644 --- a/wsjtx.pro +++ b/wsjtx.pro @@ -51,68 +51,37 @@ SOURCES += \ logbook/adif.cpp \ logbook/countrydat.cpp \ logbook/countriesworked.cpp \ - logbook/logbook.cpp \ - astro.cpp \ - Radio.cpp \ - NetworkServerLookup.cpp \ - revision_utils.cpp \ - Transceiver.cpp \ - TransceiverBase.cpp \ - TransceiverFactory.cpp \ - PollingTransceiver.cpp \ - EmulateSplitTransceiver.cpp \ - HRDTransceiver.cpp \ - DXLabSuiteCommanderTransceiver.cpp \ - HamlibTransceiver.cpp \ - FrequencyLineEdit.cpp \ - Bands.cpp \ - FrequencyList.cpp \ - StationList.cpp \ - ForeignKeyDelegate.cpp \ - FrequencyItemDelegate.cpp \ - LiveFrequencyValidator.cpp \ - Configuration.cpp \ - psk_reporter.cpp \ - AudioDevice.cpp \ - Modulator.cpp \ - Detector.cpp \ - logqso.cpp \ - displaytext.cpp \ - getfile.cpp \ - soundout.cpp \ - soundin.cpp \ - meterwidget.cpp \ - signalmeter.cpp \ - WFPalette.cpp \ - plotter.cpp \ - widegraph.cpp \ - about.cpp \ - mainwindow.cpp \ - main.cpp \ - decodedtext.cpp \ - wsprnet.cpp \ - messageaveraging.cpp \ - echoplot.cpp echograph.cpp Modes.cpp + logbook/logbook.cpp \ + astro.cpp Radio.cpp NetworkServerLookup.cpp revision_utils.cpp \ + Transceiver.cpp TransceiverBase.cpp TransceiverFactory.cpp \ + PollingTransceiver.cpp EmulateSplitTransceiver.cpp \ + HRDTransceiver.cpp DXLabSuiteCommanderTransceiver.cpp \ + HamlibTransceiver.cpp FrequencyLineEdit.cpp Bands.cpp \ + FrequencyList.cpp StationList.cpp ForeignKeyDelegate.cpp \ + FrequencyItemDelegate.cpp LiveFrequencyValidator.cpp \ + Configuration.cpp psk_reporter.cpp AudioDevice.cpp \ + Modulator.cpp Detector.cpp logqso.cpp displaytext.cpp \ + getfile.cpp soundout.cpp soundin.cpp meterwidget.cpp signalmeter.cpp \ + WFPalette.cpp plotter.cpp widegraph.cpp about.cpp mainwindow.cpp \ + main.cpp decodedtext.cpp wsprnet.cpp messageaveraging.cpp \ + echoplot.cpp echograph.cpp Modes.cpp WSPRBandHopping.cpp HEADERS += qt_helpers.hpp \ - pimpl_h.hpp pimpl_impl.hpp \ - Radio.hpp NetworkServerLookup.hpp revision_utils.hpp \ - mainwindow.h plotter.h soundin.h soundout.h astro.h \ - about.h WFPalette.hpp widegraph.h getfile.h decodedtext.h \ - commons.h sleep.h displaytext.h logqso.h \ - Bands.hpp FrequencyList.hpp StationList.hpp ForeignKeyDelegate.hpp FrequencyItemDelegate.hpp LiveFrequencyValidator.hpp \ - FrequencyLineEdit.hpp AudioDevice.hpp Detector.hpp Modulator.hpp psk_reporter.h \ - Transceiver.hpp TransceiverBase.hpp TransceiverFactory.hpp PollingTransceiver.hpp \ - EmulateSplitTransceiver.hpp DXLabSuiteCommanderTransceiver.hpp HamlibTransceiver.hpp \ - Configuration.hpp wsprnet.h \ - signalmeter.h \ - meterwidget.h \ - logbook/logbook.h \ - logbook/countrydat.h \ - logbook/countriesworked.h \ - logbook/adif.h \ - messageaveraging.h \ - echoplot.h echograph.h Modes.hpp + pimpl_h.hpp pimpl_impl.hpp \ + Radio.hpp NetworkServerLookup.hpp revision_utils.hpp \ + mainwindow.h plotter.h soundin.h soundout.h astro.h \ + about.h WFPalette.hpp widegraph.h getfile.h decodedtext.h \ + commons.h sleep.h displaytext.h logqso.h \ + Bands.hpp FrequencyList.hpp StationList.hpp ForeignKeyDelegate.hpp FrequencyItemDelegate.hpp LiveFrequencyValidator.hpp \ + FrequencyLineEdit.hpp AudioDevice.hpp Detector.hpp Modulator.hpp psk_reporter.h \ + Transceiver.hpp TransceiverBase.hpp TransceiverFactory.hpp PollingTransceiver.hpp \ + EmulateSplitTransceiver.hpp DXLabSuiteCommanderTransceiver.hpp HamlibTransceiver.hpp \ + Configuration.hpp wsprnet.h signalmeter.h meterwidget.h \ + logbook/logbook.h \ + logbook/countrydat.h \ + logbook/countriesworked.h \ + logbook/adif.h \ + messageaveraging.h echoplot.h echograph.h Modes.hpp WSPRBandHopping.hpp INCLUDEPATH += qmake_only