rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

Tweeks: restore 'step' curve logic to original; adjust node text position, clipping;

Browse Source
This commit is contained in:
Mike LaBranche 2012-07-08 10:38:15 -07:00
parent a328ab9973
commit ea60769680
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/openpilotgcs/src/plugins/config/mixercurve.cpp
View File

@ -150,7 +150,6 @@ void MixerCurve::UpdateCurveUI()
m_mixerUI->CurveStep->setVisible(true); m_mixerUI->CurveStep->setVisible(true);
m_mixerUI->CurveStep->setMinimum(1.0); m_mixerUI->CurveStep->setMinimum(1.0);
m_mixerUI->CurveStep->setMaximum(4.0);
} }
if ( curveType.compare("Exp")==0) if ( curveType.compare("Exp")==0)
{ {
@ -204,7 +203,7 @@ void MixerCurve::GenerateCurve()
} }
if ( CurveType.compare("Step")==0) if ( CurveType.compare("Step")==0)
{ {
if (i < value3) //(scale*100<value3) if (scale*100<value3)
{ {
points.append(value1); points.append(value1);
} }

22
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.cpp
View File

@ -81,22 +81,30 @@ void Node::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWid
if (option->state & QStyle::State_Sunken) { if (option->state & QStyle::State_Sunken) {
gradient.setCenter(3, 3); gradient.setCenter(3, 3);
gradient.setFocalPoint(3, 3); gradient.setFocalPoint(3, 3);
gradient.setColorAt(1, QColor("#1c870b").light(120)); //gradient.setColorAt(1, QColor("#1c870b").light(120));
gradient.setColorAt(0, QColor("#116703").light(120)); //gradient.setColorAt(0, QColor("#116703").light(120));
gradient.setColorAt(1, Qt::darkBlue);
gradient.setColorAt(0, Qt::darkBlue);
} else { } else {
gradient.setColorAt(0, "#1c870b"); if (value() < 0) {
gradient.setColorAt(1, "#116703"); gradient.setColorAt(0, Qt::red);
gradient.setColorAt(1, Qt::red);
}
else {
gradient.setColorAt(0, "#1c870b");
gradient.setColorAt(1, "#116703");
}
} }
painter->setBrush(gradient); painter->setBrush(gradient);
painter->setPen(QPen(Qt::black, 0)); painter->setPen(QPen(Qt::black, 0));
painter->drawEllipse(-13, -13, 26, 26); painter->drawEllipse(-13, -13, 26, 26);
painter->setPen(QPen(Qt::white, 0));
if (value() < 0) { if (value() < 0) {
painter->setPen(QPen(Qt::red, 0)); painter->drawText(-13, 4, QString().sprintf("% .2f", value()));
painter->drawText(-12, 4, QString().sprintf("%.2f", value()));
} }
else { else {
painter->setPen(QPen(Qt::white, 0));
painter->drawText(-11, 4, QString().sprintf("%.2f", value())); painter->drawText(-11, 4, QString().sprintf("%.2f", value()));
} }
} }

2
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.cpp
View File

@ -248,7 +248,7 @@ void MixerCurveWidget::resizeEvent(QResizeEvent* event)
QRectF rect = plot->boundingRect(); QRectF rect = plot->boundingRect();
fitInView(rect.adjusted(-12,-12,12,12), Qt::KeepAspectRatio); fitInView(rect.adjusted(-15,-15,15,15), Qt::KeepAspectRatio);
} }
void MixerCurveWidget::itemMoved(double itemValue) void MixerCurveWidget::itemMoved(double itemValue)