rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-21 13:28:58 +01:00
Code Issues Releases Activity

GCS-Couple of bug fixes and created a new defaultRequested signal

Browse Source
This commit is contained in:
PT_Dreamer 2012-08-14 23:02:08 +01:00
parent 0f8974178a
commit 2ddb0e63d2
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp
View File

@ -66,6 +66,7 @@ ConfigCameraStabilizationWidget::ConfigCameraStabilizationWidget(QWidget *parent
addUAVObject("MixerSettings");
disableMouseWheelEvents();
connect(this,SIGNAL(defaultRequested(int)),this,SLOT(defaultRequestedSlot(int)));
}
ConfigCameraStabilizationWidget::~ConfigCameraStabilizationWidget()
@ -214,6 +215,10 @@ void ConfigCameraStabilizationWidget::updateObjectsFromWidgets()
ConfigTaskWidget::updateObjectsFromWidgets();
}
void ConfigCameraStabilizationWidget::defaultRequestedSlot(int group)
{
}
/**
@}

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

@ -46,6 +46,8 @@ private:
Ui_CameraStabilizationWidget *m_camerastabilization;
void refreshWidgetsValues(UAVObject *obj);
void updateObjectsFromWidgets();
private slots:
void defaultRequestedSlot(int group);
};
#endif // CONFIGCAMERASTABILIZATIONWIDGET_H

9
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -32,7 +32,7 @@
/**
* Constructor
*/
ConfigTaskWidget::ConfigTaskWidget(QWidget *parent) : QWidget(parent),isConnected(false),smartsave(NULL),dirty(false),outOfLimitsStyle("background-color: rgb(255, 0, 0);"),timeOut(NULL),allowWidgetUpdates(true)
ConfigTaskWidget::ConfigTaskWidget(QWidget *parent) : QWidget(parent),isConnected(false),smartsave(NULL),dirty(false),outOfLimitsStyle("background-color: rgb(255, 0, 0);"),allowWidgetUpdates(true)
{
pm = ExtensionSystem::PluginManager::instance();
objManager = pm->getObject<UAVObjectManager>();
@ -176,10 +176,6 @@ ConfigTaskWidget::~ConfigTaskWidget()
if(oTw)
delete oTw;
}
if(timeOut)
{
delete timeOut;
}
}
void ConfigTaskWidget::saveObjectToSD(UAVObject *obj)
@ -772,6 +768,7 @@ void ConfigTaskWidget::addReloadButton(QPushButton *button, int buttonGroup)
void ConfigTaskWidget::defaultButtonClicked()
{
int group=sender()->property("group").toInt();
emit defaultRequested(group);
QList<objectToWidget*> * list=defaultReloadGroups.value(group);
foreach(objectToWidget * oTw,*list)
{
@ -791,7 +788,7 @@ void ConfigTaskWidget::reloadButtonClicked()
if(!list)
return;
ObjectPersistence* objper = dynamic_cast<ObjectPersistence*>( getObjectManager()->getObject(ObjectPersistence::NAME) );
timeOut=new QTimer(this);
QTimer * timeOut=new QTimer(this);
QEventLoop * eventLoop=new QEventLoop(this);
connect(timeOut, SIGNAL(timeout()),eventLoop,SLOT(quit()));
connect(objper, SIGNAL(objectUpdated(UAVObject*)), eventLoop, SLOT(quit()));

2
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h
View File

@ -139,6 +139,7 @@ signals:
void autoPilotConnected();
//fired when the autopilot disconnects
void autoPilotDisconnected();
void defaultRequested(int group);
private slots:
void objectUpdated(UAVObject*);
void defaultButtonClicked();
@ -165,7 +166,6 @@ private:
void disconnectWidgetUpdatesToSlot(QWidget *widget, const char *function);
void loadWidgetLimits(QWidget *widget, UAVObjectField *field, int index, bool hasLimits, double sclale);
QString outOfLimitsStyle;
QTimer * timeOut;
protected slots:
virtual void disableObjUpdates();
virtual void enableObjUpdates();

1
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/smartsavebutton.cpp
View File

@ -151,6 +151,7 @@ void smartSaveButton::setObjects(QList<UAVDataObject *> list)
void smartSaveButton::addObject(UAVDataObject * obj)
{
Q_ASSERT(obj);
if(!objects.contains(obj))
objects.append(obj);
}