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

@@ -119,24 +119,24 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid, qint64 fre
       << fixed
       << qSetFieldWidth (6)
       << qSetRealNumberPrecision (1)
-      << "Az:    " << azmoon << "\n"
+      << "Az:     " << azmoon << "\n"
-      "El:    " << elmoon << "\n"
+      "El:     " << elmoon << "\n"
-      "Dop:   " << *ndop00 << "\n"
+      "SelfDop:" << *ndop00 << "\n"
-      "Width: " << int(width1) << "\n"
+      "Width:  " << int(width1) << "\n"
       << qSetRealNumberPrecision (2)
-      << "Delay: " << techo << "\n"
+      << "Delay:  " << techo << "\n"
       << qSetRealNumberPrecision (1)
-      << "DxAz:  " << azmoondx << "\n"
+      << "DxAz:   " << azmoondx << "\n"
-      "DxEl:  " << elmoondx << "\n"
+      "DxEl:   " << elmoondx << "\n"
-      "DxDop: " << *ndop << "\n"
+      "DxDop:  " << *ndop << "\n"
-      "DxWid: " << int(width2) << "\n"
+      "DxWid:  " << int(width2) << "\n"
-      "Dec:   " << decmoon << "\n"
+      "Dec:    " << decmoon << "\n"
-      "SunAz: " << azsun << "\n"
+      "SunAz:  " << azsun << "\n"
-      "SunEl: " << elsun << "\n"
+      "SunEl:  " << elsun << "\n"
-      "Freq:  " << nfreq << "\n"
+      "Freq:   " << nfreq << "\n"
-      "Tsky:  " << ntsky << "\n"
+      "Tsky:   " << ntsky << "\n"
-      "MNR:   " << xnr << "\n"
+      "MNR:    " << xnr << "\n"
-      "Dgrd:  " << dgrd;
+      "Dgrd:   " << dgrd;
   }
   ui_->text_label->setText(message);
 

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);

mainwindow.ui

@@ -2385,7 +2385,7 @@ list. The list can be maintained in Settings (F2).</string>
           </property>
           <property name="minimumSize">
            <size>
-            <width>140</width>
+            <width>160</width>
             <height>30</height>
            </size>
           </property>

wsjtx.pro

@@ -51,68 +51,37 @@ SOURCES += \
 	logbook/adif.cpp \
 	logbook/countrydat.cpp \
 	logbook/countriesworked.cpp \
-	logbook/logbook.cpp \
+  logbook/logbook.cpp \
-        astro.cpp \
+  astro.cpp Radio.cpp NetworkServerLookup.cpp revision_utils.cpp \
-        Radio.cpp \
+  Transceiver.cpp TransceiverBase.cpp TransceiverFactory.cpp \
-        NetworkServerLookup.cpp \
+  PollingTransceiver.cpp EmulateSplitTransceiver.cpp \
-        revision_utils.cpp \
+  HRDTransceiver.cpp DXLabSuiteCommanderTransceiver.cpp \
-        Transceiver.cpp \
+  HamlibTransceiver.cpp FrequencyLineEdit.cpp Bands.cpp \
-        TransceiverBase.cpp \
+  FrequencyList.cpp StationList.cpp ForeignKeyDelegate.cpp \
-        TransceiverFactory.cpp \
+  FrequencyItemDelegate.cpp LiveFrequencyValidator.cpp \
-        PollingTransceiver.cpp \
+  Configuration.cpp	psk_reporter.cpp AudioDevice.cpp \
-        EmulateSplitTransceiver.cpp \
+  Modulator.cpp Detector.cpp logqso.cpp displaytext.cpp \
-        HRDTransceiver.cpp \
+  getfile.cpp soundout.cpp soundin.cpp meterwidget.cpp signalmeter.cpp \
-        DXLabSuiteCommanderTransceiver.cpp \
+  WFPalette.cpp plotter.cpp widegraph.cpp about.cpp mainwindow.cpp \
-        HamlibTransceiver.cpp \
+  main.cpp decodedtext.cpp wsprnet.cpp messageaveraging.cpp \
-        FrequencyLineEdit.cpp \
+  echoplot.cpp echograph.cpp Modes.cpp WSPRBandHopping.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
 
 HEADERS  += qt_helpers.hpp \
-	    pimpl_h.hpp pimpl_impl.hpp \
+  pimpl_h.hpp pimpl_impl.hpp \
-            Radio.hpp NetworkServerLookup.hpp revision_utils.hpp \
+  Radio.hpp NetworkServerLookup.hpp revision_utils.hpp \
-	    mainwindow.h plotter.h soundin.h soundout.h astro.h \
+  mainwindow.h plotter.h soundin.h soundout.h astro.h \
-            about.h WFPalette.hpp widegraph.h getfile.h decodedtext.h \
+  about.h WFPalette.hpp widegraph.h getfile.h decodedtext.h \
-            commons.h sleep.h displaytext.h logqso.h \
+  commons.h sleep.h displaytext.h logqso.h \
-            Bands.hpp FrequencyList.hpp StationList.hpp ForeignKeyDelegate.hpp FrequencyItemDelegate.hpp LiveFrequencyValidator.hpp \
+  Bands.hpp FrequencyList.hpp StationList.hpp ForeignKeyDelegate.hpp FrequencyItemDelegate.hpp LiveFrequencyValidator.hpp \
-            FrequencyLineEdit.hpp AudioDevice.hpp Detector.hpp Modulator.hpp psk_reporter.h \
+  FrequencyLineEdit.hpp AudioDevice.hpp Detector.hpp Modulator.hpp psk_reporter.h \
-            Transceiver.hpp TransceiverBase.hpp TransceiverFactory.hpp PollingTransceiver.hpp \
+  Transceiver.hpp TransceiverBase.hpp TransceiverFactory.hpp PollingTransceiver.hpp \
-            EmulateSplitTransceiver.hpp DXLabSuiteCommanderTransceiver.hpp HamlibTransceiver.hpp \
+  EmulateSplitTransceiver.hpp DXLabSuiteCommanderTransceiver.hpp HamlibTransceiver.hpp \
-            Configuration.hpp wsprnet.h \
+  Configuration.hpp wsprnet.h signalmeter.h meterwidget.h \
-    signalmeter.h \
+  logbook/logbook.h \
-    meterwidget.h \
+  logbook/countrydat.h \
-    logbook/logbook.h \
+  logbook/countriesworked.h \
-    logbook/countrydat.h \
+  logbook/adif.h \
-    logbook/countriesworked.h \
+  messageaveraging.h echoplot.h echograph.h Modes.hpp WSPRBandHopping.hpp
-    logbook/adif.h \
-    messageaveraging.h \
-    echoplot.h echograph.h Modes.hpp
 
 INCLUDEPATH += qmake_only