ModelEdit channels 'next' support

This commit is contained in:
Bertrand Songis
2014-01-17 16:43:36 +01:00
parent 11e83de0d3
commit d134c063e5
2 changed files with 12 additions and 13 deletions
+1 -1
View File
@@ -553,7 +553,7 @@ class LimitData {
bool symetrical; bool symetrical;
char name[6+1]; char name[6+1];
CurveReference curve; CurveReference curve;
void clear() { memset(this, 0, sizeof(LimitData)); min = -100; max = +100; } void clear() { memset(this, 0, sizeof(LimitData)); min = -1000; max = +1000; }
}; };
enum MltpxValue { enum MltpxValue {
+11 -12
View File
@@ -57,24 +57,26 @@ Channels::Channels(QWidget * parent, ModelData & model):
gridLayout->addWidget(offset, i+1, col++, 1, 1); gridLayout->addWidget(offset, i+1, col++, 1, 1);
// Channel min // Channel min
QSpinBox * minSB = new QSpinBox(this); QDoubleSpinBox * minSB = new QDoubleSpinBox(this);
minSB->setProperty("index", i); minSB->setProperty("index", i);
minSB->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); minSB->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
minSB->setAccelerated(true); minSB->setAccelerated(true);
minSB->setDecimals(1);
minSB->setMinimum(model.extendedLimits ? -125 : -100); minSB->setMinimum(model.extendedLimits ? -125 : -100);
minSB->setMaximum(0); minSB->setMaximum(0);
minSB->setValue(model.limitData[i].min); minSB->setValue(float(model.limitData[i].min) / 10);
connect(minSB, SIGNAL(editingFinished()), this, SLOT(minEdited())); connect(minSB, SIGNAL(editingFinished()), this, SLOT(minEdited()));
gridLayout->addWidget(minSB, i+1, col++, 1, 1); gridLayout->addWidget(minSB, i+1, col++, 1, 1);
// Channel max // Channel max
QSpinBox * maxSB = new QSpinBox(this); QDoubleSpinBox * maxSB = new QDoubleSpinBox(this);
maxSB->setProperty("index", i); maxSB->setProperty("index", i);
maxSB->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); maxSB->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
maxSB->setAccelerated(true); maxSB->setAccelerated(true);
maxSB->setDecimals(1);
maxSB->setMinimum(0); maxSB->setMinimum(0);
maxSB->setMaximum(model.extendedLimits ? 125 : 100); maxSB->setMaximum(model.extendedLimits ? 125 : 100);
maxSB->setValue(model.limitData[i].max); maxSB->setValue(float(model.limitData[i].max) / 10);
connect(maxSB, SIGNAL(editingFinished()), this, SLOT(maxEdited())); connect(maxSB, SIGNAL(editingFinished()), this, SLOT(maxEdited()));
gridLayout->addWidget(maxSB, i+1, col++, 1, 1); gridLayout->addWidget(maxSB, i+1, col++, 1, 1);
@@ -108,9 +110,6 @@ Channels::Channels(QWidget * parent, ModelData & model):
gridLayout->addWidget(symlimits, i+1, col++, 1, 1); gridLayout->addWidget(symlimits, i+1, col++, 1, 1);
} }
} }
// setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
// setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
} }
Channels::~Channels() Channels::~Channels()
@@ -141,23 +140,23 @@ void Channels::offsetEdited()
{ {
QDoubleSpinBox *dsb = qobject_cast<QDoubleSpinBox*>(sender()); QDoubleSpinBox *dsb = qobject_cast<QDoubleSpinBox*>(sender());
int index = dsb->property("index").toInt(); int index = dsb->property("index").toInt();
model.limitData[index].offset = round(dsb->value()*10); model.limitData[index].offset = round(dsb->value() * 10);
emit modified(); emit modified();
} }
void Channels::minEdited() void Channels::minEdited()
{ {
QSpinBox *sb = qobject_cast<QSpinBox*>(sender()); QDoubleSpinBox *sb = qobject_cast<QDoubleSpinBox*>(sender());
int index = sb->property("index").toInt(); int index = sb->property("index").toInt();
model.limitData[index].min = sb->value(); model.limitData[index].min = round(sb->value() * 10);
emit modified(); emit modified();
} }
void Channels::maxEdited() void Channels::maxEdited()
{ {
QSpinBox *sb = qobject_cast<QSpinBox*>(sender()); QDoubleSpinBox *sb = qobject_cast<QDoubleSpinBox*>(sender());
int index = sb->property("index").toInt(); int index = sb->property("index").toInt();
model.limitData[index].max = sb->value(); model.limitData[index].max = round(sb->value() * 10);
emit modified(); emit modified();
} }