From 91f2d433c990b09e4858eca3c270977a7b21a0e3 Mon Sep 17 00:00:00 2001 From: Mariano Lizarraga Date: Thu, 11 Nov 2010 15:30:38 -0600 Subject: [PATCH] Started populating the Combobox in HIL sim with the available Links --- src/ui/slugshilsim.cc | 15 +++++++++++++++ src/ui/slugshilsim.h | 9 ++++++++- src/ui/slugshilsim.ui | 12 ++++++------ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/ui/slugshilsim.cc b/src/ui/slugshilsim.cc index 1d3c26c..8a8272d 100644 --- a/src/ui/slugshilsim.cc +++ b/src/ui/slugshilsim.cc @@ -1,14 +1,29 @@ #include "slugshilsim.h" #include "ui_slugshilsim.h" +#include "LinkManager.h" SlugsHilSim::SlugsHilSim(QWidget *parent) : QWidget(parent), ui(new Ui::SlugsHilSim) { ui->setupUi(this); + linkAdded(); + } SlugsHilSim::~SlugsHilSim() { delete ui; } + +void SlugsHilSim::linkAdded(void){ + + ui->cb_mavlinkLinks->clear(); + + QList linkList = LinkManager::instance()->getLinks() ; + + for (int i = 0; i< linkList.size(); i++){ + ui->cb_mavlinkLinks->addItem((linkList.takeFirst())->getName()); + } + +} diff --git a/src/ui/slugshilsim.h b/src/ui/slugshilsim.h index 345b32e..57c4e56 100644 --- a/src/ui/slugshilsim.h +++ b/src/ui/slugshilsim.h @@ -2,9 +2,11 @@ #define SLUGSHILSIM_H #include - +#include +#include #include "LinkInterface.h" + namespace Ui { class SlugsHilSim; } @@ -19,6 +21,11 @@ public: protected: LinkInterface* hilLink; + QHostAddress* simulinkIp; + QUdpSocket* txSocket; + QUdpSocket* rxSocket; + +slots: private: Ui::SlugsHilSim *ui; diff --git a/src/ui/slugshilsim.ui b/src/ui/slugshilsim.ui index e03075a..2281b46 100644 --- a/src/ui/slugshilsim.ui +++ b/src/ui/slugshilsim.ui @@ -53,7 +53,7 @@ - + 60 @@ -99,7 +99,7 @@ - + 60 @@ -132,7 +132,7 @@ - + 60 @@ -179,12 +179,12 @@ Qt::RightToLeft - Slugs HIL Sim Serial Port + Slugs HIL Sim Serial Link - + @@ -204,7 +204,7 @@ - + Set in HIL Mode