From ea6076968017ca0115ec1fcf07ff10b32627789b Mon Sep 17 00:00:00 2001
From: Mike LaBranche <mdlabranche@gmail.com>
Date: Sun, 8 Jul 2012 10:38:15 -0700
Subject: [PATCH] Tweeks: restore 'step' curve logic to original; adjust node
 text position, clipping;

---
 .../src/plugins/config/mixercurve.cpp         |  3 +--
 .../uavobjectwidgetutils/mixercurvepoint.cpp  | 22 +++++++++++++------
 .../uavobjectwidgetutils/mixercurvewidget.cpp |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/mixercurve.cpp b/ground/openpilotgcs/src/plugins/config/mixercurve.cpp
index 3a9306759..d8d3c8f95 100644
--- a/ground/openpilotgcs/src/plugins/config/mixercurve.cpp
+++ b/ground/openpilotgcs/src/plugins/config/mixercurve.cpp
@@ -150,7 +150,6 @@ void MixerCurve::UpdateCurveUI()
         m_mixerUI->CurveStep->setVisible(true);
 
         m_mixerUI->CurveStep->setMinimum(1.0);
-        m_mixerUI->CurveStep->setMaximum(4.0);
     }
     if ( curveType.compare("Exp")==0)
     {
@@ -204,7 +203,7 @@ void MixerCurve::GenerateCurve()
        }
        if ( CurveType.compare("Step")==0)
        {
-           if (i < value3) //(scale*100<value3)
+           if (scale*100<value3)
            {
                points.append(value1);
            }
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.cpp
index 1187b898f..5fdd2fbbf 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvepoint.cpp
@@ -81,22 +81,30 @@ void Node::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWid
     if (option->state & QStyle::State_Sunken) {
         gradient.setCenter(3, 3);
         gradient.setFocalPoint(3, 3);
-        gradient.setColorAt(1, QColor("#1c870b").light(120));
-        gradient.setColorAt(0, QColor("#116703").light(120));
+        //gradient.setColorAt(1, QColor("#1c870b").light(120));
+        //gradient.setColorAt(0, QColor("#116703").light(120));
+
+        gradient.setColorAt(1, Qt::darkBlue);
+        gradient.setColorAt(0, Qt::darkBlue);
     } else {
-        gradient.setColorAt(0, "#1c870b");
-        gradient.setColorAt(1, "#116703");
+        if (value() < 0) {
+            gradient.setColorAt(0, Qt::red);
+            gradient.setColorAt(1, Qt::red);
+        }
+        else {
+            gradient.setColorAt(0, "#1c870b");
+            gradient.setColorAt(1, "#116703");
+        }
     }
     painter->setBrush(gradient);
     painter->setPen(QPen(Qt::black, 0));
     painter->drawEllipse(-13, -13, 26, 26);
 
+    painter->setPen(QPen(Qt::white, 0));
     if (value() < 0) {
-        painter->setPen(QPen(Qt::red, 0));
-        painter->drawText(-12, 4, QString().sprintf("%.2f", value()));
+        painter->drawText(-13, 4, QString().sprintf("% .2f", value()));
     }
     else {
-        painter->setPen(QPen(Qt::white, 0));
         painter->drawText(-11, 4, QString().sprintf("%.2f", value()));
     }
 }
diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.cpp
index 110131ae4..3833b18ed 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/mixercurvewidget.cpp
@@ -248,7 +248,7 @@ void MixerCurveWidget::resizeEvent(QResizeEvent* event)
 
     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)