From f8387bfaaa27374c9d547afad4e1f6a0ffbfc6b1 Mon Sep 17 00:00:00 2001 From: PT_Dreamer Date: Tue, 18 Sep 2012 14:23:35 +0100 Subject: [PATCH] GCS-Only update the aiframe config widget after all relevant objects are updated This was deleted by someone with any aparent reason. --- .../src/plugins/config/configvehicletypewidget.cpp | 7 +++---- .../src/plugins/uavobjectwidgetutils/configtaskwidget.cpp | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp index 2d43e6673..7055851ef 100644 --- a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp @@ -471,11 +471,10 @@ void ConfigVehicleTypeWidget::refreshWidgetsValues(UAVObject * o) { Q_UNUSED(o); - //if(!allObjectsUpdated()) - // return; + if(!allObjectsUpdated()) + return; - //WHAT DOES THIS DO? - bool dirty=isDirty(); //WHY IS THIS CALLED HERE AND THEN AGAIN SEVERAL LINES LATER IN setupAirframeUI() + bool dirty=isDirty(); // Get the Airframe type from the system settings: UAVDataObject* system = dynamic_cast(getObjectManager()->getObject(QString("SystemSettings"))); diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp index ddad8c88a..63c2d13f4 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp +++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp @@ -553,11 +553,13 @@ void ConfigTaskWidget::objectUpdated(UAVObject *obj) */ bool ConfigTaskWidget::allObjectsUpdated() { + qDebug()<<"ConfigTaskWidge:allObjectsUpdated called"; bool ret=true; foreach(UAVObject *obj, objectUpdates.keys()) { ret=ret & objectUpdates[obj]; } + qDebug()<<"Returned:"<