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

GCS/OPMap-add apply and cancel buttons to the wp editor

Browse Source
This commit is contained in:
PT_Dreamer 2012-07-06 22:57:20 +01:00
parent 71a35b2dd8
commit 66ed4552be
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp
View File

@ -37,11 +37,11 @@ opmap_edit_waypoint_dialog::opmap_edit_waypoint_dialog(QWidget *parent,QAbstract
ui(new Ui::opmap_edit_waypoint_dialog)
{
ui->setupUi(this);
my_waypoint = NULL;
connect(ui->checkBoxLocked,SIGNAL(toggled(bool)),this,SLOT(enableEditWidgets(bool)));
connect(ui->cbMode,SIGNAL(currentIndexChanged(int)),this,SLOT(setupModeWidgets()));
connect(ui->cbCondition,SIGNAL(currentIndexChanged(int)),this,SLOT(setupConditionWidgets()));
connect(ui->pushButtonApply,SIGNAL(clicked()),this,SLOT(pushButtonApply_clicked()));
connect(ui->pushButtonCancel,SIGNAL(clicked()),this,SLOT(pushButtonCancel_clicked()));
mapDataDelegate::loadComboBox(ui->cbMode,flightDataModel::MODE);
mapDataDelegate::loadComboBox(ui->cbCondition,flightDataModel::CONDITION);
mapDataDelegate::loadComboBox(ui->cbCommand,flightDataModel::COMMAND);
@ -50,6 +50,7 @@ opmap_edit_waypoint_dialog::opmap_edit_waypoint_dialog(QWidget *parent,QAbstract
mapper->setItemDelegate(new mapDataDelegate(this));
connect(mapper,SIGNAL(currentIndexChanged(int)),this,SLOT(currentIndexChanged(int)));
mapper->setModel(model);
mapper->setSubmitPolicy(QDataWidgetMapper::ManualSubmit);
mapper->addMapping(ui->checkBoxLocked,flightDataModel::LOCKED);
mapper->addMapping(ui->doubleSpinBoxLatitude,flightDataModel::LATPOSITION);
mapper->addMapping(ui->doubleSpinBoxLongitude,flightDataModel::LNGPOSITION);
@ -94,6 +95,7 @@ opmap_edit_waypoint_dialog::~opmap_edit_waypoint_dialog()
void opmap_edit_waypoint_dialog::on_pushButtonOK_clicked()
{
mapper->submit();
close();
}
@ -226,12 +228,16 @@ void opmap_edit_waypoint_dialog::setupConditionWidgets()
break;
}
}
void opmap_edit_waypoint_dialog::pushButtonCancel_clicked()
{
my_waypoint = NULL;
mapper->revert();
close();
}
void opmap_edit_waypoint_dialog::pushButtonApply_clicked()
{
mapper->submit();
}
void opmap_edit_waypoint_dialog::editWaypoint(mapcontrol::WayPointItem *waypoint_item)
{
if (!waypoint_item) return;

2
ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.h
View File

@ -53,7 +53,6 @@ public:
private:
Ui::opmap_edit_waypoint_dialog *ui;
mapcontrol::WayPointItem * my_waypoint;
QDataWidgetMapper *mapper;
QAbstractItemModel * model;
QItemSelectionModel * itemSelection;
@ -65,6 +64,7 @@ private slots:
void setupConditionWidgets();
void pushButtonCancel_clicked();
void on_pushButtonOK_clicked();
void pushButtonApply_clicked();
void on_pushButton_clicked();
void on_pushButton_2_clicked();
void enableEditWidgets(bool);

14
ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.ui
View File

@ -780,6 +780,20 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonApply">
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonCancel">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>