piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'kilrah/667_extended_limits' into next

Browse Source 
Conflicts:
	companion/src/modeledit/modeledit.cpp
This commit is contained in:
Andre Bernet
2014-04-03 21:22:15 +02:00
parent 144952f46d 31823c0c95
commit 573e8600e3
5 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modeledit/channels.cpp
+16
View File
@@ -70,10 +70,12 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
minSB->setAccelerated(true);
minSB->setDecimals(1);
minSB->setMinimum(model.extendedLimits ? -125 : -100);
minSB->setSingleStep(0.1);
minSB->setMaximum(0);
minSB->setValue(float(model.limitData[i].min) / 10);
connect(minSB, SIGNAL(editingFinished()), this, SLOT(minEdited()));
gridLayout->addWidget(minSB, i+1, col++, 1, 1);
minSpins << minSB;
// Channel max
QDoubleSpinBox * maxSB = new QDoubleSpinBox(this);
@@ -82,10 +84,12 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
maxSB->setAccelerated(true);
maxSB->setDecimals(1);
maxSB->setMinimum(0);
maxSB->setSingleStep(0.1);
maxSB->setMaximum(model.extendedLimits ? 125 : 100);
maxSB->setValue(float(model.limitData[i].max) / 10);
connect(maxSB, SIGNAL(editingFinished()), this, SLOT(maxEdited()));
gridLayout->addWidget(maxSB, i+1, col++, 1, 1);
maxSpins << maxSB;
// Channel inversion
QComboBox * invCB = new QComboBox(this);
@@ -182,6 +186,18 @@ void Channels::maxEdited()
emit modified();
}
void Channels::refreshExtendedLimits()
{
for (int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
QDoubleSpinBox * minDSB = minSpins[i];
QDoubleSpinBox * maxDSB = maxSpins[i];
minDSB->setMinimum(model.extendedLimits ? -125 : -100);
maxDSB->setMaximum(model.extendedLimits ? 125 : 100);
}
emit modified();
}
void Channels::invEdited()
{
QComboBox *cb = qobject_cast<QComboBox*>(sender());