Reintegrate merge from wsjtx_exp branch.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6122 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2015-11-18 01:28:12 +00:00
parent 09ef0cccd8
commit 97704efba8
148 changed files with 10084 additions and 1574 deletions
+11 -1
View File
@@ -1,6 +1,7 @@
#include "echograph.h"
#include "commons.h"
#include <QSettings>
#include <QApplication>
#include "echoplot.h"
#include "ui_echograph.h"
#include "moc_echograph.cpp"
@@ -13,6 +14,7 @@ EchoGraph::EchoGraph(QSettings * settings, QWidget *parent) :
ui(new Ui::EchoGraph)
{
ui->setupUi(this);
setWindowTitle (QApplication::applicationName () + " - " + tr ("Echo Graph"));
installEventFilter(parent); //Installing the filter
ui->echoPlot->setCursor(Qt::CrossCursor);
setMaximumWidth(2048);
@@ -34,9 +36,10 @@ EchoGraph::EchoGraph(QSettings * settings, QWidget *parent) :
ui->binsPerPixelSpinBox->setValue(n);
ui->echoPlot->m_blue=m_settings->value("BlueCurve",false).toBool();
ui->cbBlue->setChecked(ui->echoPlot->m_blue);
m_nColor=m_settings->value("EchoColors",0).toInt();
m_settings->endGroup();
ui->cbBlue->setVisible(false); //Not using "blue" (for now, at least)
ui->echoPlot->setColors(m_nColor);
}
EchoGraph::~EchoGraph()
@@ -61,6 +64,7 @@ void EchoGraph::saveSettings()
m_settings->setValue("Smooth",ui->echoPlot->m_smooth);
m_settings->setValue("EchoBPP",ui->echoPlot->m_binsPerPixel);
m_settings->setValue("BlueCurve",ui->echoPlot->m_blue);
m_settings->setValue("EchoColors",m_nColor);
m_settings->endGroup();
}
@@ -100,3 +104,9 @@ void EchoGraph::on_binsPerPixelSpinBox_valueChanged(int n)
ui->echoPlot->DrawOverlay();
ui->echoPlot->draw();
}
void EchoGraph::on_pbColors_clicked()
{
m_nColor = (m_nColor+1) % 6;
ui->echoPlot->setColors(m_nColor);
}