caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Graph axes + input value checking

Browse Source
This commit is contained in:
Jan Käberich 2022-10-20 00:28:10 +02:00
parent c7a99af820
commit 168f3beec8
3 changed files with 369 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

402
Software/PC_Application/LibreVNA-GUI/Tools/eyediagramdialog.cpp
View File

@ -5,6 +5,8 @@
#include "Util/util.h"
#include "preferences.h"
#include "Traces/fftcomplex.h"
#include "Traces/traceaxis.h"
#include "unit.h"
#include <random>
#include <thread>
@ -19,13 +21,18 @@ EyeDiagramDialog::EyeDiagramDialog(TraceModel &model) :
ui(new Ui::EyeDiagramDialog)
{
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
workingBuffer = &eyeBuffer[0];
finishedBuffer = &eyeBuffer[1];
updating = false;
firstUpdate = true;
trace = nullptr;
tdr = new Math::TDR();
ui->update->setEnabled(false);
ui->datarate->setUnit("bps");
@ -68,15 +75,23 @@ EyeDiagramDialog::EyeDiagramDialog(TraceModel &model) :
ui->widget->setDialog(this);
connect(this, &EyeDiagramDialog::updatePercent, ui->progress, &QProgressBar::setValue, Qt::QueuedConnection);
connect(this, &EyeDiagramDialog::calculationStatus, ui->status, &QLabel::setText, Qt::QueuedConnection);
connect(ui->update, &QPushButton::clicked, this, &EyeDiagramDialog::triggerUpdate);
connect(this, &EyeDiagramDialog::updateDone, ui->widget, qOverload<>(&QWidget::update));
connect(ui->traceSelector, qOverload<int>(&QComboBox::currentIndexChanged), [=](){
trace = qvariant_cast<Trace*>(ui->traceSelector->itemData(ui->traceSelector->currentIndex()));
tdr->assignInput(trace);
ui->update->setEnabled(true);
});
connect(tdr, &Math::TDR::outputSamplesChanged, [=](){
if(ui->updateOnTraceChange->isChecked() || firstUpdate) {
triggerUpdate();
firstUpdate = false;
}
});
// find applicable traces
for(auto t : model.getTraces()) {
if(t->getDataType() != Trace::DataType::Frequency) {
@ -104,9 +119,24 @@ EyeDiagramDialog::EyeDiagramDialog(TraceModel &model) :
EyeDiagramDialog::~EyeDiagramDialog()
{
delete tdr;
delete ui;
}
unsigned int EyeDiagramDialog::getCalculatedPixelsX()
{
return finishedBuffer->size();
}
unsigned int EyeDiagramDialog::getCalculatedPixelsY()
{
if(getCalculatedPixelsX() > 0) {
return (*finishedBuffer)[0].size();
} else {
return 0;
}
}
double EyeDiagramDialog::getIntensity(unsigned int x, unsigned int y)
{
if(finishedBuffer->size() > x) {
@ -117,9 +147,30 @@ double EyeDiagramDialog::getIntensity(unsigned int x, unsigned int y)
return std::numeric_limits<double>::quiet_NaN();
}
double EyeDiagramDialog::displayedTime()
{
return 2 * 1.0/ui->datarate->value();
}
double EyeDiagramDialog::minGraphVoltage()
{
auto highlevel = ui->highLevel->value();
auto lowlevel = ui->lowLevel->value();
auto eyeRange = highlevel - lowlevel;
return lowlevel - eyeRange * yOverrange;
}
double EyeDiagramDialog::maxGraphVoltage()
{
auto highlevel = ui->highLevel->value();
auto lowlevel = ui->lowLevel->value();
auto eyeRange = highlevel - lowlevel;
return highlevel + eyeRange * yOverrange;
}
bool EyeDiagramDialog::triggerUpdate()
{
update(ui->widget->width(), ui->widget->height());
update(ui->widget->eyeWidth(), ui->widget->eyeHeight());
}
bool EyeDiagramDialog::update(unsigned int width, unsigned int height)
@ -134,8 +185,9 @@ bool EyeDiagramDialog::update(unsigned int width, unsigned int height)
void EyeDiagramDialog::updateThread(unsigned int width, unsigned int height)
{
emit updatePercent(0);
emit calculationStatus("Starting calculation...");
if(!trace) {
emit calculationStatus("No trace assigned");
updating = false;
return;
}
@ -149,11 +201,36 @@ void EyeDiagramDialog::updateThread(unsigned int width, unsigned int height)
auto falltime = ui->falltime->value();
auto noise = ui->noise->value();
auto jitter = ui->jitter->value();
bool linearEdge = ui->fallrisetype->currentIndex() == 0;
unsigned int patternbits = ui->patternLength->currentIndex() + 2;
unsigned int cycles = ui->displayedCycles->value() + 1; // first cycle will not be displayed
// sanity check values
// TODO
if(datarate >= trace->getSample(trace->numSamples() - 1).x) {
emit calculationStatus("Data rate too high");
updating = false;
return;
}
if(datarate <= trace->getSample(0).x) {
emit calculationStatus("Data rate too low");
updating = false;
return;
}
if(risetime > 0.3 * 1.0 / datarate) {
emit calculationStatus("Rise time too high");
updating = false;
return;
}
if(falltime > 0.3 * 1.0 / datarate) {
emit calculationStatus("Fall time too high");
updating = false;
return;
}
if(jitter > 0.3 * 1.0 / datarate) {
emit calculationStatus("Jitter too high");
updating = false;
return;
}
qDebug() << "Eye calculation: input values okay";
@ -164,9 +241,10 @@ void EyeDiagramDialog::updateThread(unsigned int width, unsigned int height)
y.resize(height, 0.0);
}
emit calculationStatus("Generating PRBS sequence...");
// calculate timestep
double displayedTime = 2 * 1.0/datarate; // always showing two bit periods
double timestep = displayedTime / (width);
double timestep = displayedTime() / (width);
auto prbs = new PRBS(patternbits);
@ -183,21 +261,32 @@ void EyeDiagramDialog::updateThread(unsigned int width, unsigned int height)
std::normal_distribution<> dist_jitter(0, jitter);
// reserve vector for input data
std::vector<double> input(width * cycles, 0.0);
std::vector<std::complex<double>> inVec(width * cycles, 0.0);
unsigned int bitcnt = 1;
double transitionTime = -10; // assume that we start with a settled input, last transition was "long" ago
for(unsigned int i=0;i<input.size();i++) {
for(unsigned int i=0;i<inVec.size();i++) {
double time = i*timestep;
double voltage;
if(time >= transitionTime) {
// currently within a bit transition
double edgeTime = 0;
double expTimeConstant;
if(!currentBit && nextBit) {
edgeTime = risetime;
} else if(currentBit && !nextBit) {
edgeTime = falltime;
}
if(linearEdge) {
// edge is modeled as linear rise/fall
// increase slightly to account for typical 10/90% fall/rise time
edgeTime *= 1.25;
} else {
// edge is modeled as exponential rise/fall. Adjust time constant to match
// selected rise/fall time (with 10-90% signal rise/fall within specified time)
expTimeConstant = edgeTime / 2.197224577;
edgeTime = 6 * expTimeConstant; // after six time constants, 99.7% of signal movement has happened
}
if(time >= transitionTime + edgeTime) {
// bit transition settled
voltage = nextBit ? highlevel : lowlevel;
@ -209,96 +298,76 @@ void EyeDiagramDialog::updateThread(unsigned int width, unsigned int height)
} else {
// still within rise or fall time
double timeSinceEdge = time - transitionTime;
double edgeRatio = timeSinceEdge / edgeTime;
double from = currentBit ? highlevel : lowlevel;
double to = nextBit ? highlevel : lowlevel;
voltage = from * (1.0 - edgeRatio) + to * edgeRatio;
if(linearEdge) {
double edgeRatio = timeSinceEdge / edgeTime;
voltage = from * (1.0 - edgeRatio) + to * edgeRatio;
} else {
voltage = from + (1.0 - exp(-timeSinceEdge/expTimeConstant)) * (to - from);
}
}
} else {
// still before the next edge
voltage = currentBit ? highlevel : lowlevel;
}
voltage += dist_noise(mt_noise);
input[i] = voltage;
inVec[i] = voltage;
}
// input voltage vector fully assembled
qDebug() << "Eye calculation: input data generated";
emit calculationStatus("Extracting impulse response...");
// calculate impulse response of trace
auto tdr = new Math::TDR();
// default configuration of TDR is lowpass with automatic DC, which is exactly what we need
// TDR calculation happens in background thread, need to wait for emitted signal
volatile bool TDRdone = false;
double eyeTimeShift = 0;
std::vector<std::complex<double>> impulseVec;
// determine how long the impulse response is
auto samples = tdr->numSamples();
if(samples == 0) {
// TDR calculation not yet done, unable to update
updating = false;
emit calculationStatus("No time-domain data from trace");
return;
}
auto length = tdr->getSample(samples - 1).x;
std::vector<double> convolutionData;
auto conn = connect(tdr, &Math::TDR::outputSamplesChanged, [&](){
if(!TDRdone) {
// determine how long the impulse response is
auto samples = tdr->numSamples();
auto length = tdr->getSample(samples - 1).x;
// determine average delay
auto total_step = tdr->getStepResponse(samples - 1);
for(unsigned int i=0;i<samples;i++) {
auto step = tdr->getStepResponse(i);
if(abs(total_step - step) <= abs(step)) {
// mid point reached
eyeTimeShift = tdr->getSample(i).x;
break;
}
}
auto scale = timestep / (length / (samples - 1));
unsigned long convolutedSize = length / timestep;
if(convolutedSize > input.size()) {
// impulse response is longer than what we display, truncate
convolutedSize = input.size();
}
convolutionData.resize(convolutedSize);
for(unsigned long i=0;i<convolutedSize;i++) {
auto x = i*timestep;
convolutionData[i] = tdr->getInterpolatedSample(x).y.real() * scale;
}
TDRdone = true;
// determine average delay
auto total_step = tdr->getStepResponse(samples - 1);
for(unsigned int i=0;i<samples;i++) {
auto step = tdr->getStepResponse(i);
if(abs(total_step - step) <= abs(step)) {
// mid point reached
eyeTimeShift = tdr->getSample(i).x;
break;
}
});
// assigning the trace starts the TDR calculation
tdr->assignInput(trace);
}
// wait for the TDR calculation to be done
while(!TDRdone) {
std::this_thread::sleep_for(20ms);
};
disconnect(conn);
delete tdr;
auto scale = timestep / (length / (samples - 1));
unsigned long convolutedSize = length / timestep;
if(convolutedSize > inVec.size()) {
// impulse response is longer than what we display, truncate
convolutedSize = inVec.size();
}
impulseVec.resize(convolutedSize);
for(unsigned long i=0;i<convolutedSize;i++) {
auto x = i*timestep;
impulseVec[i] = tdr->getInterpolatedSample(x).y.real() * scale;
}
eyeTimeShift += (risetime + falltime) / 4;
eyeTimeShift += (risetime + falltime) * 1.25 / 4;
eyeTimeShift += 0.5 / datarate;
int eyeXshift = eyeTimeShift / timestep;
qDebug() << "Eye calculation: TDR calculation done";
// calculate voltage at top and bottom of diagram for y binning to pixels
auto eyeRange = highlevel - lowlevel;
auto topValue = highlevel + eyeRange * yOverrange;
auto bottomValue = lowlevel - eyeRange * yOverrange;
emit calculationStatus("Performing convolution...");
unsigned int highestIntensity = 0;
qDebug() << "Convolve via FFT start";
std::vector<std::complex<double>> inVec;
std::vector<std::complex<double>> impulseVec;
std::vector<std::complex<double>> outVec;
for(auto i : input) {
inVec.push_back(i);
}
for(auto i : convolutionData) {
impulseVec.push_back(i);
}
impulseVec.resize(inVec.size(), 0.0);
outVec.resize(inVec.size());
Fft::convolve(inVec, impulseVec, outVec);
@ -334,16 +403,13 @@ void EyeDiagramDialog::updateThread(unsigned int width, unsigned int height)
}
};
emit calculationStatus("Creating intensity bitmap...");
// got the input data and the convolution data, calculate output
int lastyBin;
for(unsigned int i=width;i<input.size();i++) {
// double voltage = 0;
// for(unsigned j=0;j<convolutionData.size();j++) {
// double inputValue = i >= j ? input[i-j] : input[0];
// voltage += convolutionData[j] * inputValue;
// }
for(unsigned int i=width;i<inVec.size();i++) {
double voltage = outVec[i].real();
int yBin = Util::Scale<double>(voltage, bottomValue, topValue, height-1, 0);
int yBin = Util::Scale<double>(voltage, minGraphVoltage(), maxGraphVoltage(), height-1, 0);
// increment pixel bin
if(yBin < 0) {
yBin = 0;
@ -357,7 +423,6 @@ void EyeDiagramDialog::updateThread(unsigned int width, unsigned int height)
addLine(xlast, lastyBin, xnow, yBin, xlast > 0);
}
lastyBin = yBin;
emit updatePercent(100 * i / input.size());
}
qDebug() << "Eye calculation: Convolution done";
@ -368,12 +433,13 @@ void EyeDiagramDialog::updateThread(unsigned int width, unsigned int height)
v /= highestIntensity;
}
}
emit updatePercent(100);
// switch buffers
auto buf = finishedBuffer;
finishedBuffer = workingBuffer;
workingBuffer = buf;
updating = false;
emit calculationStatus("Eye calculation complete");
emit updateDone();
}
@ -387,18 +453,182 @@ void EyeDiagramPlot::setDialog(EyeDiagramDialog *dialog)
this->dialog = dialog;
}
void EyeDiagramPlot::paintEvent(QPaintEvent *event)
unsigned int EyeDiagramPlot::eyeWidth()
{
return width() - leftSpace() - rightSpace();
}
unsigned int EyeDiagramPlot::eyeHeight()
{
return height() - topSpace() - bottomSpace();
}
unsigned int EyeDiagramPlot::leftSpace()
{
auto &pref = Preferences::getInstance();
QPainter p(this);
p.setBackground(QBrush(pref.Graphs.Color.background));
p.fillRect(0, 0, width(), height(), QBrush(pref.Graphs.Color.background));
return pref.Graphs.fontSizeAxis * 5.5;
}
unsigned int EyeDiagramPlot::bottomSpace()
{
auto &pref = Preferences::getInstance();
return pref.Graphs.fontSizeAxis * 3;
}
void EyeDiagramPlot::paintEvent(QPaintEvent *event)
{
if(!dialog) {
return;
}
for(unsigned int i=0;i<width();i++) {
for(unsigned int j=0;j<height();j++) {
auto value = dialog->getIntensity(i, j);
auto &pref = Preferences::getInstance();
int plotAreaLeft = leftSpace();
int plotAreaWidth = width() - leftSpace() - rightSpace();
int plotAreaTop = topSpace();
int plotAreaHeight = height() - topSpace() - bottomSpace();
QPainter p(this);
p.setBackground(QBrush(pref.Graphs.Color.background));
p.fillRect(0, 0, width(), height(), QBrush(pref.Graphs.Color.background));
auto pen = QPen(pref.Graphs.Color.axis, 0);
pen.setCosmetic(true);
p.setPen(pen);
auto plotRect = QRect(plotAreaLeft, plotAreaTop, plotAreaWidth + 1, plotAreaHeight + 1);
p.drawRect(plotRect);
// Y axis
QString labelY = "Voltage";
auto font = p.font();
font.setPixelSize(pref.Graphs.fontSizeAxis);
p.setFont(font);
p.setPen(QPen(pref.Graphs.Color.axis, 1));
p.save();
p.translate(0, height()-bottomSpace());
p.rotate(-90);
p.drawText(QRect(0, 0, height()-bottomSpace(), pref.Graphs.fontSizeAxis*1.5), Qt::AlignHCenter, labelY);
p.restore();
XAxis axis;
axis.set(XAxis::Type::Time, false, true, dialog->minGraphVoltage(), dialog->maxGraphVoltage(), 10);
// draw ticks
if(axis.getTicks().size() > 0) {
// this only works for evenly distributed ticks:
auto max = qMax(abs(axis.getTicks().front()), abs(axis.getTicks().back()));
double step;
if(axis.getTicks().size() >= 2) {
step = abs(axis.getTicks()[0] - axis.getTicks()[1]);
} else {
// only one tick, set arbitrary number of digits
step = max / 1000;
}
int significantDigits = floor(log10(max)) - floor(log10(step)) + 1;
for(unsigned int j = 0; j < axis.getTicks().size(); j++) {
auto yCoord = axis.transform(axis.getTicks()[j], plotAreaTop + plotAreaHeight, plotAreaTop);
p.setPen(QPen(pref.Graphs.Color.axis, 1));
// draw tickmark on axis
auto tickStart = plotAreaLeft;
auto tickLen = -2;
p.drawLine(tickStart, yCoord, tickStart + tickLen, yCoord);
QString unit = "";
QString prefix = " ";
if(pref.Graphs.showUnits) {
unit = "V";
prefix = "um ";
}
auto tickValue = Unit::ToString(axis.getTicks()[j], unit, prefix, significantDigits);
p.drawText(QRectF(0, yCoord - pref.Graphs.fontSizeAxis/2 - 2, tickStart + 2 * tickLen, pref.Graphs.fontSizeAxis), Qt::AlignRight, tickValue);
// tick lines
if(yCoord == plotAreaTop || yCoord == plotAreaTop + plotAreaHeight) {
// skip tick lines right on the plot borders
continue;
}
// only draw tick lines for primary axis
if (pref.Graphs.Color.Ticks.Background.enabled) {
if (j%2)
{
int yCoordTop = axis.transform(axis.getTicks()[j], plotAreaTop, plotAreaTop + plotAreaHeight);
int yCoordBot = axis.transform(axis.getTicks()[j-1], plotAreaTop, plotAreaTop + plotAreaHeight);
if(yCoordTop > yCoordBot) {
auto buf = yCoordBot;
yCoordBot = yCoordTop;
yCoordTop = buf;
}
p.setBrush(pref.Graphs.Color.Ticks.Background.background);
p.setPen(pref.Graphs.Color.Ticks.Background.background);
auto rect = QRect(plotAreaLeft+1, yCoordTop+1, plotAreaWidth-2, yCoordBot-yCoordTop-2);
p.drawRect(rect);
}
}
p.setPen(QPen(pref.Graphs.Color.Ticks.divisions, 0.5, Qt::DashLine));
p.drawLine(plotAreaLeft, yCoord, plotAreaLeft + plotAreaWidth, yCoord);
}
}
// use the XY-plot axes for tick calculation
axis.set(XAxis::Type::Time, false, true, 0, dialog->displayedTime(), 10);
// X axis name
p.drawText(QRect(plotAreaLeft, height()-pref.Graphs.fontSizeAxis*1.5, plotAreaWidth, pref.Graphs.fontSizeAxis*1.5), Qt::AlignHCenter, axis.TypeToName());
// draw X axis ticks
if(axis.getTicks().size() >= 1) {
// draw X ticks
int significantDigits;
// this only works for evenly distributed ticks:
auto max = qMax(abs(axis.getTicks().front()), abs(axis.getTicks().back()));
double step;
if(axis.getTicks().size() >= 2) {
step = abs(axis.getTicks()[0] - axis.getTicks()[1]);
} else {
// only one tick, set arbitrary number of digits
step = max / 1000;
}
significantDigits = floor(log10(max)) - floor(log10(step)) + 1;
QString prefixes = "fpnum kMG";
QString unit = "";
if(pref.Graphs.showUnits) {
unit = axis.Unit();
}
QString commonPrefix = QString();
int lastTickLabelEnd = 0;
for(auto t : axis.getTicks()) {
auto xCoord = axis.transform(t, plotAreaLeft, plotAreaLeft + plotAreaWidth);
p.setPen(QPen(pref.Graphs.Color.axis, 1));
p.drawLine(xCoord, plotAreaTop + plotAreaHeight, xCoord, plotAreaTop + plotAreaHeight + 2);
if(xCoord != plotAreaLeft && xCoord != plotAreaLeft + plotAreaWidth) {
p.setPen(QPen(pref.Graphs.Color.Ticks.divisions, 0.5, Qt::DashLine));
p.drawLine(xCoord, plotAreaTop, xCoord, plotAreaTop + plotAreaHeight);
}
if(xCoord - 40 <= lastTickLabelEnd) {
// would overlap previous tick label, skip
continue;
}
auto tickValue = Unit::ToString(t, unit, prefixes, significantDigits);
p.setPen(QPen(pref.Graphs.Color.axis, 1));
QRect bounding;
p.drawText(QRect(xCoord - pref.Graphs.fontSizeAxis*2, plotAreaTop + plotAreaHeight + 5, pref.Graphs.fontSizeAxis*4,
pref.Graphs.fontSizeAxis), Qt::AlignHCenter, tickValue, &bounding);
lastTickLabelEnd = bounding.x() + bounding.width();
}
}
if(dialog->getCalculatedPixelsX() == 0 || dialog->getCalculatedPixelsY() == 0) {
// no eye data
return;
}
// eye data is normally calculated to match the displayed pixels in this widget.
// But the window size mighe have been adjusted since the last eye calculation.
// Use scale factors until the eye data is updated
double xScale = (double) plotAreaWidth / dialog->getCalculatedPixelsX();
double yScale = (double) plotAreaHeight / dialog->getCalculatedPixelsY();
for(unsigned int i=0;i<plotAreaWidth;i++) {
for(unsigned int j=0;j<plotAreaHeight;j++) {
auto value = dialog->getIntensity(i / xScale, j / yScale);
if(isnan(value) || value == 0) {
// do not paint, just leave the background shining through
continue;
@ -406,7 +636,7 @@ void EyeDiagramPlot::paintEvent(QPaintEvent *event)
auto pen = QPen(Util::getIntensityGradeColor(value));
pen.setCosmetic(true);
p.setPen(pen);
p.drawPoint(i, j);
p.drawPoint(plotAreaLeft + i + 1, plotAreaTop + j + 1);
}
}
}

18
Software/PC_Application/LibreVNA-GUI/Tools/eyediagramdialog.h
View File

@ -2,6 +2,7 @@
#define EYEDIAGRAMDIALOG_H
#include "Traces/tracemodel.h"
#include "Traces/Math/tdr.h"
#include <vector>
@ -21,7 +22,13 @@ public:
void setDialog(EyeDiagramDialog *dialog);
unsigned int eyeWidth();
unsigned int eyeHeight();
private:
unsigned int leftSpace();
unsigned int rightSpace() {return 10;}
unsigned int topSpace() {return 10;}
unsigned int bottomSpace();
void paintEvent(QPaintEvent *event) override;
EyeDiagramDialog *dialog;
@ -35,8 +42,14 @@ public:
explicit EyeDiagramDialog(TraceModel &model);
~EyeDiagramDialog();
unsigned int getCalculatedPixelsX();
unsigned int getCalculatedPixelsY();
double getIntensity(unsigned int x, unsigned int y);
double displayedTime();
double minGraphVoltage();
double maxGraphVoltage();
public slots:
bool triggerUpdate();
bool update(unsigned int width, unsigned int height);
@ -46,7 +59,7 @@ signals:
private:
signals:
void updatePercent(int percent);
void calculationStatus(QString s);
private:
static constexpr double yOverrange = 0.2;
@ -60,7 +73,10 @@ private:
std::vector<std::vector<double>> *workingBuffer;
std::vector<std::vector<double>> *finishedBuffer;
Math::TDR *tdr;
bool updating;
bool firstUpdate;
};
#endif // EYEDIAGRAMDIALOG_H

51
Software/PC_Application/LibreVNA-GUI/Tools/eyediagramdialog.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>909</width>
<height>544</height>
<width>897</width>
<height>575</height>
</rect>
</property>
<property name="windowTitle">
@ -74,54 +74,54 @@
<item row="2" column="1">
<widget class="SIUnitEdit" name="falltime"/>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>High level:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="SIUnitEdit" name="highLevel"/>
</item>
<item row="4" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Low level:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<widget class="SIUnitEdit" name="lowLevel"/>
</item>
<item row="5" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Noise (RMS):</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="6" column="1">
<widget class="SIUnitEdit" name="noise"/>
</item>
<item row="6" column="0">
<item row="7" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Jitter (RMS):</string>
</property>
</widget>
</item>
<item row="6" column="1">
<item row="7" column="1">
<widget class="SIUnitEdit" name="jitter"/>
</item>
<item row="7" column="0">
<item row="8" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Pattern length:</string>
</property>
</widget>
</item>
<item row="7" column="1">
<item row="8" column="1">
<widget class="QComboBox" name="patternLength">
<property name="currentIndex">
<number>7</number>
@ -178,6 +178,27 @@
</item>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Rise/Fall type:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="fallrisetype">
<item>
<property name="text">
<string>Linear</string>
</property>
</item>
<item>
<property name="text">
<string>Exponential</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
@ -230,9 +251,9 @@
</widget>
</item>
<item>
<widget class="QProgressBar" name="progress">
<property name="value">
<number>0</number>
<widget class="QLabel" name="status">
<property name="text">
<string/>
</property>
</widget>
</item>