1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-16 08:29:15 +01:00

Merge branch 'filnet/OP-1007_output_config_gadget_shows_unsaved_warning_when_no_chnage_were_made' into next

This commit is contained in:
Philippe Renon 2013-06-21 22:10:26 +02:00
commit ee5d6957c8

View File

@ -110,6 +110,11 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
updateEnableControls();
}
ConfigOutputWidget::~ConfigOutputWidget()
{
// Do nothing
}
void ConfigOutputWidget::enableControls(bool enable)
{
ConfigTaskWidget::enableControls(enable);
@ -120,11 +125,6 @@ void ConfigOutputWidget::enableControls(bool enable)
ui->channelOutTest->setEnabled(enable);
}
ConfigOutputWidget::~ConfigOutputWidget()
{
// Do nothing
}
/**
Toggles the channel testing mode by making the GCS take over
the ActuatorCommand objects
@ -242,6 +242,8 @@ void ConfigOutputWidget::refreshWidgetsValues(UAVObject *obj)
{
Q_UNUSED(obj);
bool dirty = isDirty();
// Get Actuator Settings
ActuatorSettings *actuatorSettings = ActuatorSettings::GetInstance(getObjectManager());
Q_ASSERT(actuatorSettings);
@ -353,6 +355,8 @@ void ConfigOutputWidget::refreshWidgetsValues(UAVObject *obj)
int neutral = actuatorSettingsData.ChannelNeutral[outputChannelForm->index()];
outputChannelForm->neutral(neutral);
}
setDirty(dirty);
}
/**