Skip to content

Commit

Permalink
Draw sensor status like an artificial horizon
Browse files Browse the repository at this point in the history
This should be easier to understand than the previous cabinet
projection. Furthermore, fix "jumping" of the sensor dialog when the
length of the decimal representation of the sensor values changes.
Finally, always get and set sensor dead and max zones in degree. There
are converted to redians internally.
  • Loading branch information
mmmaisel committed Apr 23, 2022
1 parent 011a480 commit 53707ff
Show file tree
Hide file tree
Showing 7 changed files with 335 additions and 324 deletions.
8 changes: 4 additions & 4 deletions src/globalvariables.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@ const int GlobalVariables::JoyControlStick::DEFAULTSTICKDELAY = 0;

// ---- JoySensor ---- //

const double GlobalVariables::JoySensor::ACCEL_MIN = -30.0;
const double GlobalVariables::JoySensor::ACCEL_MAX = 30.0;
const double GlobalVariables::JoySensor::ACCEL_MIN = -90.0;
const double GlobalVariables::JoySensor::ACCEL_MAX = 90.0;
const double GlobalVariables::JoySensor::GRAVITY = 9.80665;
const double GlobalVariables::JoySensor::GYRO_MIN = -10.0;
const double GlobalVariables::JoySensor::GYRO_MAX = 10.0;
const double GlobalVariables::JoySensor::GYRO_MIN = -360.0;
const double GlobalVariables::JoySensor::GYRO_MAX = 360.0;
const double GlobalVariables::JoySensor::DEFAULTDEADZONE = 0.5;
const int GlobalVariables::JoySensor::DEFAULTDIAGONALRANGE = 45;
const unsigned int GlobalVariables::JoySensor::DEFAULTSENSORDELAY = 0;
Expand Down
41 changes: 21 additions & 20 deletions src/gui/joysensoreditdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,10 @@ JoySensorEditDialog::JoySensorEditDialog(JoySensor *sensor, QWidget *parent)

updateWindowTitleSensorName();

m_ui->deadZoneSlider->setValue(m_sensor->getDeadZone());
m_ui->deadZoneSpinBox->setValue(m_sensor->getDeadZone());

m_ui->maxZoneSlider->setValue(m_sensor->getMaxZone());
m_ui->maxZoneSpinBox->setValue(m_sensor->getMaxZone());

m_ui->diagonalRangeSlider->setValue(m_sensor->getDiagonalRange());
m_ui->diagonalRangeSpinBox->setValue(m_sensor->getDiagonalRange());

QString xCoorString = QString::number(m_sensor->getXCoordinate());
m_ui->xCoordinateValue->setText(xCoorString);

QString yCoorString = QString::number(m_sensor->getYCoordinate());
m_ui->yCoordinateValue->setText(yCoorString);

QString zCoorString = QString::number(m_sensor->getZCoordinate());
m_ui->zCoordinateValue->setText(zCoorString);

auto min_width = m_ui->xCoordinateLabel->fontMetrics().
auto min_width = m_ui->xCoordinateValue->fontMetrics().
boundingRect(QString("X.XXXXXXX")).width();
m_ui->xCoordinateLabel->setMinimumWidth(min_width);
m_ui->xCoordinateValue->setMinimumWidth(min_width);
m_ui->xCoordinateValue->setAlignment(Qt::AlignLeft);

if (m_sensor->getType() == JoySensor::ACCELEROMETER)
{
Expand All @@ -95,6 +78,24 @@ JoySensorEditDialog::JoySensorEditDialog(JoySensor *sensor, QWidget *parent)
m_ui->maxZoneSpinBox->setMaximum(GlobalVariables::JoySensor::GYRO_MAX);
}

m_ui->deadZoneSlider->setValue(m_sensor->getDeadZone());
m_ui->deadZoneSpinBox->setValue(m_sensor->getDeadZone());

m_ui->maxZoneSlider->setValue(m_sensor->getMaxZone());
m_ui->maxZoneSpinBox->setValue(m_sensor->getMaxZone());

m_ui->diagonalRangeSlider->setValue(m_sensor->getDiagonalRange());
m_ui->diagonalRangeSpinBox->setValue(m_sensor->getDiagonalRange());

QString xCoorString = QString::number(m_sensor->getXCoordinate());
m_ui->xCoordinateValue->setText(xCoorString);

QString yCoorString = QString::number(m_sensor->getYCoordinate());
m_ui->yCoordinateValue->setText(yCoorString);

QString zCoorString = QString::number(m_sensor->getZCoordinate());
m_ui->zCoordinateValue->setText(zCoorString);

m_ui->sensorStatusBoxWidget->setSensor(m_sensor);

selectCurrentPreset();
Expand Down
Loading

0 comments on commit 53707ff

Please sign in to comment.