rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

Bugfixes: distingish between curve base min/max and client requested (multi's & 90% max);

Browse Source 
keep spindelegate synched with requested min/max's;
clean up a few old field based references;
make all nodes move when curve is flat;
This commit is contained in:
Mike LaBranche 2012-07-06 13:38:46 -07:00
parent 06eb23abe6
commit 382fecabbe
5 changed files with 45 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
View File

@ -186,8 +186,7 @@ QString ConfigFixedWingWidget::updateConfigObjectsFromWidgets()
Q_ASSERT(mixer);
// Remove Feed Forward, it is pointless on a plane:
UAVObjectField* field = mixer->getField(QString("FeedForward"));
field->setDouble(0);
setMixerValue(mixer, "FeedForward", 0.0);
// Set the throttle curve
setThrottleCurve(mixer,VehicleConfig::MIXER_THROTTLECURVE1, m_aircraft->fixedWingThrottle->getCurve());

21
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp
View File

@ -198,24 +198,15 @@ QString ConfigGroundVehicleWidget::updateConfigObjectsFromWidgets()
QString airframeType = "GroundVehicleCar";
// Save the curve (common to all ground vehicle frames)
UAVDataObject *obj = dynamic_cast<UAVDataObject*>(getObjectManager()->getObject(QString("MixerSettings")));
UAVDataObject *mixer = dynamic_cast<UAVDataObject*>(getObjectManager()->getObject(QString("MixerSettings")));
// Remove Feed Forward, it is pointless on a ground vehicle:
UAVObjectField* field = obj->getField(QString("FeedForward"));
field->setDouble(0);
field = obj->getField("ThrottleCurve1");
QList<double> curve = m_aircraft->groundVehicleThrottle1->getCurve();
for (int i=0;i<curve.length();i++) {
field->setValue(curve.at(i),i);
}
setMixerValue(mixer, "FeedForward", 0.0);
// set the throttle curves
setThrottleCurve(mixer, VehicleConfig::MIXER_THROTTLECURVE1, m_aircraft->groundVehicleThrottle1->getCurve() );
setThrottleCurve(mixer, VehicleConfig::MIXER_THROTTLECURVE2, m_aircraft->groundVehicleThrottle2->getCurve() );
field = obj->getField("ThrottleCurve2");
curve = m_aircraft->groundVehicleThrottle2->getCurve();
for (int i=0;i<curve.length();i++) {
field->setValue(curve.at(i),i);
}
//All airframe types must start with "GroundVehicle"
if (m_aircraft->groundVehicleType->currentText() == "Turnable (car)" ) {
airframeType = "GroundVehicleCar";

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

@ -57,12 +57,16 @@ MixerCurve::MixerCurve(QWidget *parent) :
MixerCurve::~MixerCurve()
{
delete m_mixerUI;
delete m_spinDelegate;
}
void MixerCurve::setMixerType(MixerCurveType curveType)
{
m_curveType = curveType;
m_mixerUI->CurveMin->setMaximum(1.0);
m_mixerUI->CurveMax->setMaximum(1.0);
switch (m_curveType) {
case MixerCurve::MIXERCURVE_THROTTLE:
{
@ -82,10 +86,10 @@ void MixerCurve::setMixerType(MixerCurveType curveType)
}
}
DoubleSpinDelegate *sbd = new DoubleSpinDelegate();
sbd->setRange(m_curve->getMin(), m_curve->getMax());
m_spinDelegate = new DoubleSpinDelegate();
m_spinDelegate->setRange(m_mixerUI->CurveMin->minimum(), m_mixerUI->CurveMax->maximum());
for (int i=0; i<MixerCurveWidget::NODE_NUMELEM; i++) {
m_settings->setItemDelegateForRow(i, sbd);
m_settings->setItemDelegateForRow(i, m_spinDelegate);
}
ResetCurve();
@ -93,11 +97,11 @@ void MixerCurve::setMixerType(MixerCurveType curveType)
void MixerCurve::ResetCurve()
{
m_mixerUI->CurveMin->setValue(m_curve->getMin());
m_mixerUI->CurveMax->setValue(m_curve->getMax());
m_mixerUI->CurveMin->setValue(m_mixerUI->CurveMin->minimum());
m_mixerUI->CurveMax->setValue(m_mixerUI->CurveMax->maximum());
m_mixerUI->CurveType->setCurrentIndex(m_mixerUI->CurveType->findText("Linear"));
initLinearCurve(MixerCurveWidget::NODE_NUMELEM, m_curve->getMax(), m_curve->getMin());
initLinearCurve(MixerCurveWidget::NODE_NUMELEM, getCurveMax(), getCurveMin());
UpdateSettingsTable();
}
@ -107,23 +111,6 @@ void MixerCurve::UpdateCurveUI()
//get the user settings
QString curveType = m_mixerUI->CurveType->currentText();
switch (m_curveType) {
case MixerCurve::MIXERCURVE_THROTTLE:
{
m_mixerUI->CurveMin->setMinimum(0.0);
m_mixerUI->CurveMax->setMinimum(0.0);
break;
}
case MixerCurve::MIXERCURVE_PITCH:
{
m_mixerUI->CurveMin->setMinimum(-1.0);
m_mixerUI->CurveMax->setMinimum(-1.0);
break;
}
}
m_mixerUI->CurveMin->setMaximum(m_curve->getMax());
m_mixerUI->CurveMax->setMaximum(m_curve->getMax());
m_mixerUI->CurveStep->setMinimum(0.0);
m_mixerUI->CurveStep->setMaximum(100.0);
@ -151,7 +138,8 @@ void MixerCurve::UpdateCurveUI()
m_mixerUI->CurveMax->setVisible(true);
m_mixerUI->stepLabel->setText("Step at");
m_mixerUI->stepLabel->setVisible(true);
m_mixerUI->CurveStep->setVisible(true);
m_mixerUI->CurveStep->setVisible(true);
m_mixerUI->CurveStep->setMaximum(4.0);
}
if ( curveType.compare("Exp")==0)
{
@ -247,6 +235,9 @@ void MixerCurve::initLinearCurve(int numPoints, double maxValue, double minValue
setMax(maxValue);
m_curve->initLinearCurve(numPoints, maxValue, minValue);
if (m_spinDelegate)
m_spinDelegate->setRange(minValue, maxValue);
}
void MixerCurve::setCurve(const QList<double>* points)
{
@ -255,7 +246,7 @@ void MixerCurve::setCurve(const QList<double>* points)
}
void MixerCurve::setMin(double value)
{
m_curve->setMin(value);
//m_curve->setMin(value);
m_mixerUI->CurveMin->setMinimum(value);
}
double MixerCurve::getMin()
@ -264,7 +255,7 @@ double MixerCurve::getMin()
}
void MixerCurve::setMax(double value)
{
m_curve->setMax(value);
//m_curve->setMax(value);
m_mixerUI->CurveMax->setMaximum(value);
}
double MixerCurve::getMax()
@ -330,11 +321,25 @@ void MixerCurve::CurveTypeChanged()
void MixerCurve::CurveMinChanged(double value)
{
// the min changed so redraw the curve
// mixercurvewidget::setCurve will trim any points below min
QList<double> points = m_curve->getCurve();
points.removeFirst();
points.push_front(value);
QString CurveType = m_mixerUI->CurveType->currentText();
if ( CurveType.compare("Flat")==0) {
// the min changed so redraw the curve
// but since the curve is flat make all points = value
// because we use curveMin for the flat value in ui
for (int i = 0; i < points.count(); i++) {
points.pop_back();
points.push_front(value);
}
}
else {
// the min changed so redraw the curve
// mixercurvewidget::setCurve will trim any points below min
points.removeFirst();
points.push_front(value);
}
setCurve(&points);
}
@ -355,9 +360,6 @@ void MixerCurve::showEvent(QShowEvent *event)
m_settings->resizeColumnsToContents();
m_settings->setColumnWidth(0,(m_settings->width()- m_settings->verticalHeader()->width()));
// const QRectF& rectRef = QRectF(0,0,parentWidget()->width() - 50 , parentWidget()->width() - 50);
// m_curve->fitInView(rectRef, Qt::KeepAspectRatio);
m_curve->showEvent(event);
}
@ -366,8 +368,5 @@ void MixerCurve::resizeEvent(QResizeEvent* event)
m_settings->resizeColumnsToContents();
m_settings->setColumnWidth(0,(m_settings->width() - m_settings->verticalHeader()->width()));
// const QRectF& rectRef = QRectF(0,0,parentWidget()->width() - 50 , parentWidget()->width() - 50);
// m_curve->fitInView(rectRef, Qt::KeepAspectRatio);
m_curve->resizeEvent(event);
}

2
ground/openpilotgcs/src/plugins/config/mixercurve.h
View File

@ -34,6 +34,7 @@
#include "ui_mixercurve.h"
#include "mixercurvewidget.h"
#include "doublespindelegate.h"
#include "uavobjectwidgetutils_global.h"
@ -91,6 +92,7 @@ private:
MixerCurveWidget* m_curve;
QTableWidget* m_settings;
MixerCurveType m_curveType;
DoubleSpinDelegate* m_spinDelegate;
};

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

@ -185,7 +185,7 @@ QList<double> MixerCurveWidget::getCurve() {
*/
void MixerCurveWidget::initLinearCurve(int numPoints, double maxValue, double minValue)
{
double range = setRange(minValue, maxValue);
double range = maxValue - minValue; // setRange(minValue, maxValue);
QList<double> points;
for (double i=0; i < (double)numPoints; i++) {