diff --git a/App/HealthUI/HealthUI.ui b/App/HealthUI/HealthUI.ui
index bfeb06b..9e01d95 100644
--- a/App/HealthUI/HealthUI.ui
+++ b/App/HealthUI/HealthUI.ui
@@ -7,7 +7,7 @@
0
0
390
- 217
+ 205
@@ -32,7 +32,7 @@
-
- 健康状态 -< 绿色：正常，黄色：解码错误，红色：通讯错误 >-
+
Qt::AlignCenter
diff --git a/App/Setting/Index0/Global/GlobalSetting.cpp b/App/Setting/Index0/Global/GlobalSetting.cpp
index edfd02f..7633344 100644
--- a/App/Setting/Index0/Global/GlobalSetting.cpp
+++ b/App/Setting/Index0/Global/GlobalSetting.cpp
@@ -23,6 +23,12 @@ GlobalSetting::GlobalSetting(QWidget *parent) :
//地图缓存相关UI
+ ui->doubleSpinBox_left_lat->setValue(52);
+ ui->doubleSpinBox_left_lng->setValue(74);
+
+ ui->doubleSpinBox_right_lat->setValue(18);
+ ui->doubleSpinBox_right_lng->setValue(135);
+
// ui->label_mapcache_info->hide();
// ui->label_maplat->hide();
@@ -502,6 +508,9 @@ void GlobalSetting::on_pushButton_map_cache_clicked()
qint8 zoom = ui->comboBox_map_level->currentData().toInt();
+ qDebug() << lat_l << lng_l << lat_r << lng_r << zoom;
+
+
if((lat_l == lat_r) &&(lng_l == lng_r))//如果值一样，说明就是一个点，不开启缓存
{
diff --git a/App/ToolsUI/PowerSystem/PowerSystem.cpp b/App/ToolsUI/PowerSystem/PowerSystem.cpp
index 7162b2e..8c12b9c 100644
--- a/App/ToolsUI/PowerSystem/PowerSystem.cpp
+++ b/App/ToolsUI/PowerSystem/PowerSystem.cpp
@@ -32,6 +32,7 @@ PowerSystem::PowerSystem(QWidget *parent) :
setColor(ui->label_TRPM,state::success);
*/
+ ui->checkBox_17->setHidden(true);
//设置灯
setColor(ui->checkBox_1,state::success);
diff --git a/App/ToolsUI/ServoSystem/ServoSystem.cpp b/App/ToolsUI/ServoSystem/ServoSystem.cpp
index 5473275..795aa13 100644
--- a/App/ToolsUI/ServoSystem/ServoSystem.cpp
+++ b/App/ToolsUI/ServoSystem/ServoSystem.cpp
@@ -149,6 +149,9 @@ ServoSystem::ServoSystem(QWidget *parent) :
m_le = 0;
+ ui->pushButton_HeatOn1->setHidden(true);
+ ui->pushButton_HeatOn2->setHidden(true);
+
}
ServoSystem::~ServoSystem()
@@ -278,16 +281,16 @@ void ServoSystem::setCheckState(uint32_t pos,QVariant value)
setColor(ui->checkBox_500W,(value.toBool())?(state::success):(state::failure));
break;
case 6:
- setColor(ui->checkBox_5525D,(value.toBool())?(state::success):(state::failure));
+ //setColor(ui->checkBox_5525D,(value.toBool())?(state::success):(state::failure));
break;
case 7:
- setColor(ui->checkBox_5803A,(value.toBool())?(state::success):(state::failure));
+ //setColor(ui->checkBox_5803A,(value.toBool())?(state::success):(state::failure));
break;
case 8:
- setColor(ui->checkBox_5607A,(value.toBool())?(state::success):(state::failure));
+ //setColor(ui->checkBox_5607A,(value.toBool())?(state::success):(state::failure));
break;
case 9:
- setColor(ui->checkBox_4525D,(value.toBool())?(state::success):(state::failure));
+ //setColor(ui->checkBox_4525D,(value.toBool())?(state::success):(state::failure));
break;
case 10:
//setColor(ui->checkBox_atteck,(value.toBool())?(state::success):(state::failure));
diff --git a/App/ToolsUI/ServoSystem/ServoSystem.ui b/App/ToolsUI/ServoSystem/ServoSystem.ui
index 7cd5589..3545a19 100644
--- a/App/ToolsUI/ServoSystem/ServoSystem.ui
+++ b/App/ToolsUI/ServoSystem/ServoSystem.ui
@@ -807,77 +807,7 @@
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
-
- 5607A
-
-
-
- -
-
-
- 空速管加热
-
-
-
- -
-
-
- 4525D
-
-
-
- -
-
-
- 500瓦开
-
-
-
- -
-
-
- 5525D
-
-
-
- -
-
-
- 28V电源
-
-
-
- -
-
-
- 56V电源
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- -
-
-
- 机载电源
-
-
-
- -
-
-
- 5803A
-
-
-
- -
+
-
Qt::Vertical
@@ -890,6 +820,41 @@
+ -
+
+
+ 机载电源
+
+
+
+ -
+
+
+ 28V电源
+
+
+
+ -
+
+
+ 56V电源
+
+
+
+ -
+
+
+ 空速管加热
+
+
+
+ -
+
+
+ 500瓦开
+
+
+
diff --git a/App/mainwindow.cpp b/App/mainwindow.cpp
index e2c250d..a763f57 100644
--- a/App/mainwindow.cpp
+++ b/App/mainwindow.cpp
@@ -534,9 +534,10 @@ MainWindow::MainWindow(QWidget *parent)
connect(dlink->mavlinknode->Mission,SIGNAL(currentPoint(int)),
map,SLOT(WPSetCurrent(int)));
-
+/*
connect(dlink->mavlinknode->Mission,SIGNAL(currentPoint(int)),
menuBarUI,SLOT(setTargetPoint(int)));
+ */
/*
connect(dlink->mavlinknode->Mission,SIGNAL(currentPoint(int)),
toolsui->diagram,SLOT(setTargetPoint(int)));
@@ -1403,12 +1404,24 @@ void MainWindow::updateUI()//事件驱动式更新数据
dlink->mavlinknode->vehicle.emb_atom_com.Airspeed);
+ uint32_t health = dlink->mavlinknode->vehicle.sys_status.onboard_control_sensors_health;
+ uint32_t enable = dlink->mavlinknode->vehicle.sys_status.onboard_control_sensors_enabled;
+ uint32_t present = dlink->mavlinknode->vehicle.sys_status.onboard_control_sensors_present;
+
+ uint64_t time;
+ uint64_t date;
- uint64_t time = ((uint64_t)dlink->mavlinknode->vehicle.ins2.time)% 1000000;
- uint64_t date = ((uint64_t)dlink->mavlinknode->vehicle.ins2.time)/ 1000000;
-
- //qDebug() << time << date << (uint64_t)dlink->mavlinknode->vehicle.ins2.time;
+ if(getBit(health,12)?(true):(false))
+ {
+ time = ((uint64_t)dlink->mavlinknode->vehicle.ins1.time)% 1000000;
+ date = ((uint64_t)dlink->mavlinknode->vehicle.ins1.time)/ 1000000;
+ }
+ else
+ {
+ time = ((uint64_t)dlink->mavlinknode->vehicle.ins2.time)% 1000000;
+ date = ((uint64_t)dlink->mavlinknode->vehicle.ins2.time)/ 1000000;
+ }
menuBarUI->setTargetAlt(dlink->mavlinknode->vehicle.sys_status.load);
@@ -1514,9 +1527,7 @@ void MainWindow::updateUI()//事件驱动式更新数据
- uint32_t health = dlink->mavlinknode->vehicle.sys_status.onboard_control_sensors_health;
- uint32_t enable = dlink->mavlinknode->vehicle.sys_status.onboard_control_sensors_enabled;
- uint32_t present = dlink->mavlinknode->vehicle.sys_status.onboard_control_sensors_present;
+
//qDebug() << health << QString::number(health,16);
// 0000 0000 0000 0000 0000 0000 0000 0000
@@ -1732,6 +1743,9 @@ void MainWindow::updateUI()//事件驱动式更新数据
group_old = group;
+
+ // menuBarUI->setTargetPoint();
+
}
diff --git a/opmap/mapwidget/images/plane.png b/opmap/mapwidget/images/plane.png
new file mode 100644
index 0000000..76402f6
Binary files /dev/null and b/opmap/mapwidget/images/plane.png differ
diff --git a/opmap/mapwidget/opmapwidget.cpp b/opmap/mapwidget/opmapwidget.cpp
index 30198d0..3bc716e 100644
--- a/opmap/mapwidget/opmapwidget.cpp
+++ b/opmap/mapwidget/opmapwidget.cpp
@@ -985,33 +985,32 @@ void OPMapWidget::mouseDoubleClickEvent(QMouseEvent *event)
//生成一个列表
//如果是点击生成，那么就获取当前的编辑组，使用当前编辑组的编号
- if(isWPCreate == true)
+ if(currentGroup != 1)//如果不是当前组不是围栏，那么可以生成
{
- if(event->button() == Qt::LeftButton)
+ if(isWPCreate == true)
{
- QPointF p = event->pos();
- p = map->mapFromParent(p);
- internals::PointLatLng LatLng;
- LatLng = map->FromLocalToLatLng(p.x(), p.y());
- WayPointItem *Item = WPCreate(LatLng,50);
+ if(event->button() == Qt::LeftButton)
+ {
+ QPointF p = event->pos();
+ p = map->mapFromParent(p);
+ internals::PointLatLng LatLng;
+ LatLng = map->FromLocalToLatLng(p.x(), p.y());
+ WayPointItem *Item = WPCreate(LatLng,50);
- foreach(QGraphicsItem * i, map->childItems()) {
- WayPointItem *w = qgraphicsitem_cast(i);
+ foreach(QGraphicsItem * i, map->childItems()) {
+ WayPointItem *w = qgraphicsitem_cast(i);
- if (w) {
- if (w->MissionType() == Item->MissionType()) {
- if(w->Number() == (Item->Number() - 1))
- {
- WPLineCreate(w,Item,Qt::green,false,2);
+ if (w) {
+ if (w->MissionType() == Item->MissionType()) {
+ if(w->Number() == (Item->Number() - 1))
+ {
+ WPLineCreate(w,Item,Qt::green,false,2);
+ }
}
}
}
}
-
-
-
-
}
}
emit MouseDoubleClickEvent(event);
@@ -1653,11 +1652,20 @@ void OPMapWidget::SetRotate(qreal const & value)
void OPMapWidget::userRipMap(bool start, qreal lat_l, qreal lng_l, qreal lat_r, qreal lng_r, qint8 zoom)
{
- internals::RectLatLng rect(lat_l,lng_l,lat_r - lat_l,lng_r - lng_l);
+ internals::RectLatLng rect(lat_l,lng_l,qAbs(lat_r - lat_l),qAbs(lng_r - lng_l));
if(start == true)
{
+ //生成16个线程
+
+
+ //每个线程分配不同的矩形
+
+
+
+ //开启线程
+
MapRipper * mapRipper = new MapRipper(core, rect,zoom);
@@ -2949,6 +2957,18 @@ void OPMapWidget::WPGroup(int value)
find_PointNumber(currentGroup);
+ /*
+ if(currentGroup == 1)
+ {
+ isWPCreate = false;
+ }
+ else
+ {
+ isWPCreate = true;
+ }
+ */
+
+
update();
}