Skip to content

Q
qgroundcontrol
Commit c2b2b3c0 authored by tecnosapiens's avatar tecnosapiens
Browse files
Options

change slugs camera control

parent 9af0bb6c
Show whitespace changes
Inline Side-by-side
Showing with 1531 additions and 1542 deletions
src/uas/SlugsMAV.cc
View file @ c2b2b3c0
......@@ -137,7 +137,7 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
case MAVLINK_MSG_ID_PID: //182
memset(&mlSinglePid,0,sizeof(mavlink_pid_t));
mavlink_msg_pid_decode(&message, &mlSinglePid);
qDebug() << "\nSLUGS RECEIVED PID Message = "<<mlSinglePid.idx;
// qDebug() << "\nSLUGS RECEIVED PID Message = "<<mlSinglePid.idx;
emit slugsPidValues(uasId, mlSinglePid);
......@@ -220,7 +220,7 @@ void SlugsMAV::emitSignals (void){
#ifdef MAVLINK_ENABLED_SLUGS
void SlugsMAV::emitGpsSignals (void){
qDebug()<<"After Emit GPS Signal"<<mlGpsData.fix_type;
// qDebug()<<"After Emit GPS Signal"<<mlGpsData.fix_type;
//ToDo Uncomment if. it was comment only to test
......@@ -248,7 +248,7 @@ void SlugsMAV::emitGpsSignals (void){
void SlugsMAV::emitPidSignal()
{
qDebug() << "\nSLUGS RECEIVED PID Message";
// qDebug() << "\nSLUGS RECEIVED PID Message";
emit slugsPidValues(uasId, mlSinglePid);
}
......
src/ui/SlugsDataSensorView.cc
View file @ c2b2b3c0
......@@ -104,7 +104,7 @@ void SlugsDataSensorView::slugsGlobalPositionChanged(UASInterface *uas,
ui->m_GpsLongitude->setText(QString::number(lon));
ui->m_GpsHeight->setText(QString::number(alt));
qDebug()<<"GPS Position = "<<lat<<" - "<<lon<<" - "<<alt;
//qDebug()<<"GPS Position = "<<lat<<" - "<<lon<<" - "<<alt;
}
......@@ -154,7 +154,7 @@ void SlugsDataSensorView::slugAttitudeChanged(UASInterface* uas,
ui->m_Pitch->setPlainText(QString::number(slugpitch));
ui->m_Yaw->setPlainText(QString::number(slugyaw));
qDebug()<<"Attitude change = "<<slugroll<<" - "<<slugpitch<<" - "<<slugyaw;
// qDebug()<<"Attitude change = "<<slugroll<<" - "<<slugpitch<<" - "<<slugyaw;
}
......
src/ui/SlugsDataSensorView.ui
View file @ c2b2b3c0
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>399</width>
<height>604</height>
<height>598</height>
</rect>
</property>
<property name="sizePolicy">
......@@ -31,18 +31,18 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_23">
<layout class="QGridLayout" name="gridLayout_25">
<item row="0" column="0">
<widget class="QTabWidget" name="SlugsSensorView_tabWidget">
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Tab 1</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_10">
<item>
<layout class="QGridLayout" name="gridLayout_24">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
<widget class="QGroupBox" name="position_groupBox">
......@@ -2904,10 +2904,8 @@
<attribute name="title">
<string>Tab 3</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_16">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<layout class="QGridLayout" name="gridLayout_23">
<item row="0" column="0">
<widget class="QGroupBox" name="sensorBiases_groupBox_2">
<property name="minimumSize">
<size>
......@@ -2924,8 +2922,8 @@
<property name="title">
<string>CPU Load</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
<item>
<layout class="QGridLayout" name="gridLayout_20">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_10">
<item row="0" column="0">
<widget class="QLabel" name="label_55">
......@@ -3109,7 +3107,7 @@
</layout>
</widget>
</item>
<item>
<item row="0" column="1">
<widget class="QGroupBox" name="sensorBiases_groupBox_3">
<property name="minimumSize">
<size>
......@@ -3126,8 +3124,8 @@
<property name="title">
<string>Air Data</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
<item>
<layout class="QGridLayout" name="gridLayout_21">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_11">
<item row="0" column="0">
<widget class="QLabel" name="label_56">
......@@ -3311,9 +3309,7 @@
</layout>
</widget>
</item>
</layout>
</item>
<item>
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="sensorBiases_groupBox_4">
<property name="minimumSize">
<size>
......@@ -3330,8 +3326,6 @@
<property name="title">
<string>Filtered Data</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_14">
<item>
<layout class="QGridLayout" name="gridLayout_15">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_12">
......@@ -3520,7 +3514,7 @@
</item>
</layout>
</item>
<item row="0" column="1" rowspan="2">
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout_14">
<item row="0" column="0">
<widget class="QLabel" name="label_25">
......@@ -3701,7 +3695,7 @@
</item>
</layout>
</item>
<item row="1" column="0" rowspan="2">
<item row="1" column="0">
<layout class="QGridLayout" name="gridLayout_13">
<item row="0" column="0">
<widget class="QLabel" name="label_66">
......@@ -3882,7 +3876,7 @@
</item>
</layout>
</item>
<item row="2" column="1">
<item row="1" column="1">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
......@@ -3890,17 +3884,15 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>84</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="sensorBiases_groupBox_5">
<property name="minimumSize">
<size>
......@@ -3917,8 +3909,6 @@
<property name="title">
<string>Raw Data</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_15">
<item>
<layout class="QGridLayout" name="gridLayout_16">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_17">
......@@ -4101,7 +4091,7 @@
</item>
</layout>
</item>
<item row="0" column="1" rowspan="2">
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout_18">
<item row="0" column="0">
<widget class="QLabel" name="label_71">
......@@ -4282,7 +4272,7 @@
</item>
</layout>
</item>
<item row="1" column="0" rowspan="2">
<item row="1" column="0">
<layout class="QGridLayout" name="gridLayout_19">
<item row="0" column="0">
<widget class="QLabel" name="label_74">
......@@ -4463,7 +4453,7 @@
</item>
</layout>
</item>
<item row="2" column="1">
<item row="1" column="1">
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
......@@ -4471,14 +4461,12 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>84</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
......
src/ui/SlugsPadCameraControl.cpp
View file @ c2b2b3c0
......@@ -27,6 +27,7 @@ SlugsPadCameraControl::~SlugsPadCameraControl()
void SlugsPadCameraControl::mouseMoveEvent(QMouseEvent *event)
{
//emit mouseMoveCoord(event->x(),event->y());
if(dragging)
{
......
src/ui/SlugsPadCameraControl.h
View file @ c2b2b3c0
......@@ -19,12 +19,16 @@ public:
public slots:
void getDeltaPositionPad(int x, int y);
double getDistPixel(int x1, int y1, int x2, int y2);
QPointF ObtenerMarcacionDistanciaPixel(double lon1, double lat1, double lon2, double lat2);
QPointF getPointBy_BearingDistance(double lat1, double lon1, double rumbo, double distancia);
signals:
void mouseMoveCoord(int x, int y);
void mousePressCoord(int x, int y);
......
src/ui/SlugsVideoCamControl.ui
View file @ c2b2b3c0
......@@ -22,10 +22,10 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_x">
<property name="mouseTracking">
<bool>true</bool>
......@@ -35,7 +35,7 @@
</property>
</widget>
</item>
<item>
<item row="0" column="1">
<widget class="QLabel" name="label_y">
<property name="mouseTracking">
<bool>true</bool>
......@@ -45,21 +45,17 @@
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_dir">
<item row="1" column="1">
<widget class="QCheckBox" name="viewCamBordeatMap_checkBox">
<property name="text">
<string>Camera Pos</string>
<string>Camera at Map</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="viewCamBordeatMap_checkBox">
<widget class="QLabel" name="label_dir">
<property name="text">
<string>Camera at Map</string>
<string>Camera Pos</string>
</property>
</widget>
</item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment