Merge branch 'master' into waveform

Conflicts:
	inputsource.h
	mainwindow.cpp
	mainwindow.h
	spectrogram.cpp
	spectrogram.h
	spectrogramcontrols.cpp
	spectrogramcontrols.h
This commit is contained in:
Mike Walters
2016-02-29 22:46:50 +00:00
5 changed files with 144 additions and 14 deletions

View File

@@ -56,6 +56,26 @@ SpectrogramControls::SpectrogramControls(const QString & title, QWidget * parent
powerMinSlider->setValue(-50);
layout->addRow(new QLabel(tr("Power min:")), powerMinSlider);
timeScaleCheckBox = new QCheckBox(widget);
timeScaleCheckBox->setCheckState(Qt::Checked);
layout->addRow(new QLabel(tr("time overlay:")), timeScaleCheckBox);
cursorFrequencyLabel = new QLabel();
layout->addRow(new QLabel(tr("Cursor frequency:")), cursorFrequencyLabel);
cursorTimeLabel = new QLabel();
layout->addRow(new QLabel(tr("Cursor time:")), cursorTimeLabel);
deltaDragCheckBox = new QCheckBox(widget);
deltaDragCheckBox->setCheckState(Qt::Checked);
layout->addRow(new QLabel(tr("Delta dragging:")), deltaDragCheckBox);
deltaFrequencyLabel = new QLabel();
layout->addRow(new QLabel(tr("Delta frequency:")), deltaFrequencyLabel);
deltaTimeLabel = new QLabel();
layout->addRow(new QLabel(tr("Delta time:")), deltaTimeLabel);
widget->setLayout(layout);
setWidget(widget);
@@ -74,4 +94,4 @@ void SpectrogramControls::fileOpenButtonClicked()
this, tr("Open File"), "", tr("Sample file (*.cfile *.bin);;All files (*)")
);
emit openFile(fileName);
}
}