rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-22 14:19:42 +01:00
Code Issues Releases Activity

GCS/OPmap-Changed slot names to get rid of the automatic signal

Browse Source 
conection failure warning.
This commit is contained in:
PT_Dreamer 2012-06-25 21:10:40 +01:00
parent ecbf02fd33
commit 2e97f1ac6a
4 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ opmap_edit_waypoint_dialog::opmap_edit_waypoint_dialog(QWidget *parent,QAbstract
mapper = new QDataWidgetMapper(this);
mapper->setItemDelegate(new mapDataDelegate(this));
connect(mapper,SIGNAL(currentIndexChanged(int)),this,SLOT(on_currentIndexChanged(int)));
connect(mapper,SIGNAL(currentIndexChanged(int)),this,SLOT(currentIndexChanged(int)));
mapper->setModel(model);
mapper->addMapping(ui->checkBoxLocked,flightDataModel::LOCKED);
mapper->addMapping(ui->doubleSpinBoxLatitude,flightDataModel::LATPOSITION);
@ -74,9 +74,9 @@ opmap_edit_waypoint_dialog::opmap_edit_waypoint_dialog(QWidget *parent,QAbstract
mapper->addMapping(ui->cbCommand,flightDataModel::COMMAND);
mapper->addMapping(ui->sbJump,flightDataModel::JUMPDESTINATION);
mapper->addMapping(ui->sbError,flightDataModel::ERRORDESTINATION);
connect(itemSelection,SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),this,SLOT(on_currentRowChanged(QModelIndex,QModelIndex)));
connect(itemSelection,SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),this,SLOT(currentRowChanged(QModelIndex,QModelIndex)));
}
void opmap_edit_waypoint_dialog::on_currentIndexChanged(int index)
void opmap_edit_waypoint_dialog::currentIndexChanged(int index)
{
ui->lbNumber->setText(QString::number(index));
QModelIndex idx=mapper->model()->index(index,0);
@ -226,7 +226,7 @@ void opmap_edit_waypoint_dialog::setupConditionWidgets()
break;
}
}
void opmap_edit_waypoint_dialog::on_pushButtonCancel_clicked()
void opmap_edit_waypoint_dialog::pushButtonCancel_clicked()
{
my_waypoint = NULL;
close();
@ -272,7 +272,7 @@ void opmap_edit_waypoint_dialog::enableEditWidgets(bool value)
}
}
void opmap_edit_waypoint_dialog::on_currentRowChanged(QModelIndex current, QModelIndex previous)
void opmap_edit_waypoint_dialog::currentRowChanged(QModelIndex current, QModelIndex previous)
{
mapper->setCurrentIndex(current.row());
}

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

@ -60,16 +60,16 @@ private:
private slots:
private slots:
void on_currentIndexChanged(int index);
void currentIndexChanged(int index);
void setupModeWidgets();
void setupPositionWidgets(bool isRelative);
void setupConditionWidgets();
void on_pushButtonCancel_clicked();
void pushButtonCancel_clicked();
void on_pushButtonOK_clicked();
void on_pushButton_clicked();
void on_pushButton_2_clicked();
void enableEditWidgets(bool);
void on_currentRowChanged(QModelIndex,QModelIndex);
void currentRowChanged(QModelIndex,QModelIndex);
};
#endif // OPMAP_EDIT_WAYPOINT_DIALOG_H

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

@ -51,12 +51,12 @@ void pathPlanner::setModel(flightDataModel *model,QItemSelectionModel *selection
ui->tableView->setSelectionModel(selection);
ui->tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
ui->tableView->setItemDelegate(new mapDataDelegate(this));
connect(model,SIGNAL(rowsInserted(const QModelIndex&,int,int)),this,SLOT(on_rowsInserted(const QModelIndex&,int,int)));
connect(model,SIGNAL(rowsInserted(const QModelIndex&,int,int)),this,SLOT(rowsInserted(const QModelIndex&,int,int)));
wid=new opmap_edit_waypoint_dialog(NULL,model,selection);
ui->tableView->resizeColumnsToContents();
}
void pathPlanner::on_rowsInserted ( const QModelIndex & parent, int start, int end )
void pathPlanner::rowsInserted ( const QModelIndex & parent, int start, int end )
{
Q_UNUSED(parent);
for(int x=start;x<end+1;x++)
@ -102,16 +102,6 @@ void pathPlanner::on_tbSaveToFile_clicked()
myModel->writeToFile(fileName);
}
void pathPlanner::on_groupBox_clicked()
{
}
void pathPlanner::on_groupBox_toggled(bool arg1)
{
wid->setVisible(arg1);
}
void pathPlanner::on_tbDetails_clicked()
{
if(wid)

6
ground/openpilotgcs/src/plugins/opmap/pathplanner.h
View File

@ -45,7 +45,7 @@ public:
void setModel(flightDataModel *model,QItemSelectionModel *selection);
private slots:
void on_rowsInserted ( const QModelIndex & parent, int start, int end );
void rowsInserted ( const QModelIndex & parent, int start, int end );
void on_tbAdd_clicked();
@ -57,10 +57,6 @@ private slots:
void on_tbSaveToFile_clicked();
void on_groupBox_clicked();
void on_groupBox_toggled(bool arg1);
void on_tbDetails_clicked();
void on_tbSendToUAV_clicked();