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
This commit is contained in:
Joe Taylor 2015-06-04 19:11:54 +00:00
parent 8587319f16
commit 091042d61c
4 changed files with 46 additions and 87 deletions

View File

@ -121,7 +121,7 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid, qint64 fre
<< qSetRealNumberPrecision (1) << 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) << qSetRealNumberPrecision (2)
<< "Delay: " << techo << "\n" << "Delay: " << techo << "\n"

View File

@ -20,11 +20,6 @@ EchoGraph::EchoGraph(QSettings * settings, QWidget *parent) :
ui->echoPlot->setMaximumHeight(800); ui->echoPlot->setMaximumHeight(800);
//Restore user's settings //Restore user's settings
/*
QString inifile(QApplication::applicationDirPath());
inifile += "/emecho.ini";
QSettings settings(inifile, QSettings::IniFormat);
*/
m_settings->beginGroup("EchoGraph"); m_settings->beginGroup("EchoGraph");
restoreGeometry (m_settings->value ("geometry", saveGeometry ()).toByteArray ()); restoreGeometry (m_settings->value ("geometry", saveGeometry ()).toByteArray ());
ui->echoPlot->setPlotZero(m_settings->value("PlotZero", 0).toInt()); ui->echoPlot->setPlotZero(m_settings->value("PlotZero", 0).toInt());
@ -52,11 +47,6 @@ void EchoGraph::closeEvent (QCloseEvent * e)
void EchoGraph::saveSettings() void EchoGraph::saveSettings()
{ {
//Save user's settings //Save user's settings
/*
QString inifile(QApplication::applicationDirPath());
inifile += "/emecho.ini";
QSettings settings(inifile, QSettings::IniFormat);
*/
m_settings->beginGroup("EchoGraph"); m_settings->beginGroup("EchoGraph");
m_settings->setValue ("geometry", saveGeometry ()); m_settings->setValue ("geometry", saveGeometry ());
m_settings->setValue("PlotZero",ui->echoPlot->m_plotZero); m_settings->setValue("PlotZero",ui->echoPlot->m_plotZero);

View File

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

View File

@ -52,47 +52,19 @@ SOURCES += \
logbook/countrydat.cpp \ logbook/countrydat.cpp \
logbook/countriesworked.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 \ HEADERS += qt_helpers.hpp \
pimpl_h.hpp pimpl_impl.hpp \ pimpl_h.hpp pimpl_impl.hpp \
@ -104,15 +76,12 @@ HEADERS += qt_helpers.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 \
meterwidget.h \
logbook/logbook.h \ logbook/logbook.h \
logbook/countrydat.h \ logbook/countrydat.h \
logbook/countriesworked.h \ logbook/countriesworked.h \
logbook/adif.h \ logbook/adif.h \
messageaveraging.h \ messageaveraging.h echoplot.h echograph.h Modes.hpp WSPRBandHopping.hpp
echoplot.h echograph.h Modes.hpp
INCLUDEPATH += qmake_only INCLUDEPATH += qmake_only