504-Software-Development-Group
/
PayloadAPP
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

光电吊舱页面bug修复；主页面界面调整

Browse Source
pull/6/head^2
caoyuhui 7 months ago
parent deb121f667
commit a95cb2c121
7 changed files with 279 additions and 267 deletions
Show Stats Download Patch File Download Diff File

11
Src/GDDC/gddcdlg.cpp
Unescape Escape View File

@ -86,7 +86,8 @@ void GDDCdlg::initWindow()
m_DlgGDDCSet = new GDDCSet(); m_DlgGDDCSet = new GDDCSet();
m_GDDCCmdDlg = new GDDCCmdDlg(this); m_GDDCCmdDlg = new GDDCCmdDlg(this);
m_GDDCStateDlg = new GDDCStateInfo(this); m_GDDCStateDlg = new GDDCStateInfo(this);
ui->pushButShowStatePage->setIcon(QIcon(":/res/right.png"));
ui->pushButShowCmdPage->setIcon(QIcon(":/res/down.png"));
} }
//初始化参数 //初始化参数
@ -99,8 +100,6 @@ void GDDCdlg::initParam()
m_DCcmdBuffer.resize(cmdLength); m_DCcmdBuffer.resize(cmdLength);
detectionAreaSetting = false; detectionAreaSetting = false;
connectFlag.resize(12,false); connectFlag.resize(12,false);
ui->pushButShowCmdPage->setIcon(QIcon(":/res/down.png"));
ui->pushButShowStatePage->setIcon(QIcon(":/res/right.png"));
} }
@ -292,9 +291,9 @@ void GDDCdlg::resizeUI()
/******控制区位置和大小设置*****/ /******控制区位置和大小设置*****/
double cmdAreaHeight; double cmdAreaHeight;
double cmdAreaWidth; double cmdAreaWidth;
if(m_GDDCStateDlg->isVisible()){cmdAreaWidth = GDDCPageWidth-STATEPAGEWIDTH;} if(isStatePageShow){cmdAreaWidth = GDDCPageWidth-STATEPAGEWIDTH;}
else{cmdAreaWidth = GDDCPageWidth;} else{cmdAreaWidth = GDDCPageWidth;}
if(m_GDDCCmdDlg->isVisible()){cmdAreaHeight = CMDPAGEHIGHT;} if(isCmdPageShow){cmdAreaHeight = CMDPAGEHIGHT;}
else{cmdAreaHeight = 0;} else{cmdAreaHeight = 0;}
m_GDDCCmdDlg->setGeometry(0,GDDCPageHeight-cmdAreaHeight,(int)cmdAreaWidth,(int)cmdAreaHeight); m_GDDCCmdDlg->setGeometry(0,GDDCPageHeight-cmdAreaHeight,(int)cmdAreaWidth,(int)cmdAreaHeight);
m_GDDCCmdDlg->ui->tabWidget->setGeometry(0,0,(int)cmdAreaWidth,(int)cmdAreaHeight); m_GDDCCmdDlg->ui->tabWidget->setGeometry(0,0,(int)cmdAreaWidth,(int)cmdAreaHeight);
@ -303,7 +302,7 @@ void GDDCdlg::resizeUI()
/*********状态区位置和大小设置***********/ /*********状态区位置和大小设置***********/
double stateAreaHeight = GDDCPageHeight; double stateAreaHeight = GDDCPageHeight;
double stateAreaWidth; double stateAreaWidth;
if(m_GDDCStateDlg->isVisible()){stateAreaWidth = STATEPAGEWIDTH;} if(isStatePageShow){stateAreaWidth = STATEPAGEWIDTH;}
else{stateAreaWidth = 0;} else{stateAreaWidth = 0;}
m_GDDCStateDlg->setGeometry(GDDCPageWidth-stateAreaWidth,0,stateAreaWidth,stateAreaHeight); m_GDDCStateDlg->setGeometry(GDDCPageWidth-stateAreaWidth,0,stateAreaWidth,stateAreaHeight);
m_GDDCStateDlg->ui->tableViewShowIState->setGeometry(0,0,stateAreaWidth,stateAreaHeight); m_GDDCStateDlg->ui->tableViewShowIState->setGeometry(0,0,stateAreaWidth,stateAreaHeight);

9
Src/HomePage/homepagedlg.cpp
Unescape Escape View File

@ -70,7 +70,7 @@ void HomePageDlg::initButton()
{ {
QIcon icon; QIcon icon;
icon.addFile(":/res/settings.png"); icon.addFile(":/res/settings.png");
QPushButton* btn = new QPushButton; btn = new QPushButton;
btn->setParent(this); btn->setParent(this);
btn->setMinimumSize(40,40); btn->setMinimumSize(40,40);
btn->setMaximumSize(40,40); btn->setMaximumSize(40,40);
@ -91,4 +91,11 @@ void HomePageDlg::on_pushButton_clicked()
{ {
emit sendUrl(_urlMap); emit sendUrl(_urlMap);
} }
//区域重绘
void HomePageDlg::resizeEvent(QResizeEvent *event)
{
double GDDCPageHeight = (double)(this->height());
double GDDCPageWidth = (double)(this->width());
btn->setGeometry(GDDCPageWidth-40,0,40,40);
}

6
Src/HomePage/homepagedlg.h
Unescape Escape View File

@ -4,7 +4,7 @@
#include <QWidget> #include <QWidget>
#include <unordered_map> #include <unordered_map>
#include "Src/HomePage/homepagesetingwidget.h" #include "Src/HomePage/homepagesetingwidget.h"
#include "QPushButton"
namespace Ui { namespace Ui {
class HomePageDlg; class HomePageDlg;
} }
@ -29,6 +29,10 @@ private:
QString _adHocNetwork; QString _adHocNetwork;
QString _satelliteComm; QString _satelliteComm;
std::unordered_map<QString,QString> _urlMap; std::unordered_map<QString,QString> _urlMap;
QPushButton* btn;
protected:
void resizeEvent(QResizeEvent *event);
signals: signals:
void sendUrl(std::unordered_map<QString,QString> urlMap); void sendUrl(std::unordered_map<QString,QString> urlMap);
private slots: private slots:

33
Src/HomePage/homepagedlg.ui
Unescape Escape View File

@ -20,21 +20,7 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>GroupBox</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>GroupBox</string>
</property>
</widget>
</item>
<item row="0" column="3">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QWidget" name="widget" native="true"> <widget class="QWidget" name="widget" native="true">
@ -55,28 +41,11 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QWidget" name="widget_2" native="true"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="1">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>GroupBox</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>GroupBox</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

474
Src/HomePage/homepagesetingwidget.ui
Unescape Escape View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>725</width> <width>725</width>
<height>443</height> <height>404</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -17,247 +17,279 @@
<iconset resource="../../mainwindow.qrc"> <iconset resource="../../mainwindow.qrc">
<normaloff>:/res/settings.png</normaloff>:/res/settings.png</iconset> <normaloff>:/res/settings.png</normaloff>:/res/settings.png</iconset>
</property> </property>
<widget class="QFrame" name="frame_2"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="geometry"> <item>
<rect> <widget class="QFrame" name="frame_2">
<x>30</x> <property name="frameShape">
<y>10</y> <enum>QFrame::Shape::StyledPanel</enum>
<width>661</width> </property>
<height>181</height> <property name="frameShadow">
</rect> <enum>QFrame::Shadow::Raised</enum>
</property> </property>
<property name="frameShape"> <layout class="QVBoxLayout" name="verticalLayout_3">
<enum>QFrame::Shape::StyledPanel</enum> <item>
</property> <widget class="QFrame" name="frame">
<property name="frameShadow"> <property name="frameShape">
<enum>QFrame::Shadow::Raised</enum> <enum>QFrame::Shape::StyledPanel</enum>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <property name="frameShadow">
<item> <enum>QFrame::Shadow::Raised</enum>
<widget class="QFrame" name="frame"> </property>
<property name="frameShape"> <layout class="QVBoxLayout" name="verticalLayout">
<enum>QFrame::Shape::StyledPanel</enum> <item>
</property> <widget class="QGroupBox" name="netGroupBox_2">
<property name="frameShadow"> <property name="title">
<enum>QFrame::Shadow::Raised</enum> <string>卫通</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QGridLayout" name="gridLayout_3">
<item> <item row="0" column="0">
<widget class="QGroupBox" name="lLinkGroupBox"> <widget class="QLabel" name="label_3">
<property name="title">
<string>L链</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>IP:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lLinkLineEdit"/>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>60</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="lLinkButton">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text"> <property name="text">
<string>设置</string> <string>IP:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="QLineEdit" name="sateliteLineEdit"/>
</item>
<item row="0" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="sateliteButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>100</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</item> </widget>
</layout> </item>
</widget> <item>
</item> <widget class="QGroupBox" name="netGroupBox">
<item> <property name="title">
<widget class="QGroupBox" name="netGroupBox"> <string>宽带自组网</string>
<property name="title"> </property>
<string>宽带自组网</string> <layout class="QGridLayout" name="gridLayout_2">
</property> <item row="0" column="1">
<layout class="QGridLayout" name="gridLayout_2"> <widget class="QLineEdit" name="netLineEdit"/>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>60</width>
<height>20</height>
</size>
</property>
</spacer>
</item> </item>
<item> <item row="0" column="0">
<widget class="QPushButton" name="netButton"> <widget class="QLabel" name="label_2">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text"> <property name="text">
<string>设置</string> <string>IP:</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="0" column="2">
</item> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item row="0" column="0"> <item>
<widget class="QLabel" name="label_2"> <spacer name="horizontalSpacer_2">
<property name="text"> <property name="orientation">
<string>IP:</string> <enum>Qt::Orientation::Horizontal</enum>
</property> </property>
</widget> <property name="sizeType">
</item> <enum>QSizePolicy::Policy::Fixed</enum>
<item row="0" column="1"> </property>
<widget class="QLineEdit" name="netLineEdit"/> <property name="sizeHint" stdset="0">
</item> <size>
</layout> <width>20</width>
</widget> <height>20</height>
</item> </size>
<item> </property>
<widget class="QGroupBox" name="netGroupBox_2"> </spacer>
<property name="title"> </item>
<string>卫通</string> <item>
</property> <widget class="QPushButton" name="netButton">
<layout class="QGridLayout" name="gridLayout_3"> <property name="sizePolicy">
<item row="0" column="0"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<widget class="QLabel" name="label_3"> <horstretch>100</horstretch>
<property name="text"> <verstretch>0</verstretch>
<string>IP:</string> </sizepolicy>
</property> </property>
</widget> <property name="minimumSize">
</item> <size>
<item row="0" column="1"> <width>100</width>
<widget class="QLineEdit" name="sateliteLineEdit"/> <height>0</height>
</item> </size>
<item row="4" column="1"> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <property name="maximumSize">
<item> <size>
<spacer name="horizontalSpacer_3"> <width>200</width>
<property name="orientation"> <height>16777215</height>
<enum>Qt::Orientation::Horizontal</enum> </size>
</property> </property>
<property name="sizeType"> <property name="text">
<enum>QSizePolicy::Policy::Fixed</enum> <string>设置</string>
</property> </property>
<property name="sizeHint" stdset="0"> </widget>
<size> </item>
<width>60</width> </layout>
<height>20</height>
</size>
</property>
</spacer>
</item> </item>
<item> </layout>
<widget class="QPushButton" name="sateliteButton"> </widget>
<property name="maximumSize"> </item>
<size> <item>
<width>100</width> <widget class="QGroupBox" name="lLinkGroupBox">
<height>16777215</height> <property name="title">
</size> <string>L链</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>设置</string> <string>IP:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="QLineEdit" name="lLinkLineEdit"/>
</item>
<item row="0" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="lLinkButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>100</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>设置</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</item> </widget>
</layout> </item>
</widget> </layout>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>450</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="oneKeyButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>160</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>一键设置</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_5"> <layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="orientation"> <item>
<enum>Qt::Orientation::Horizontal</enum> <spacer name="horizontalSpacer_4">
</property> <property name="orientation">
<property name="sizeType"> <enum>Qt::Orientation::Horizontal</enum>
<enum>QSizePolicy::Policy::Fixed</enum> </property>
</property> <property name="sizeType">
<property name="sizeHint" stdset="0"> <enum>QSizePolicy::Policy::Fixed</enum>
<size> </property>
<width>15</width> <property name="sizeHint" stdset="0">
<height>20</height> <size>
</size> <width>450</width>
</property> <height>20</height>
</spacer> </size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="oneKeyButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>160</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>一键设置</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>15</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </widget>
</layout> </item>
</widget> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../mainwindow.qrc"/> <include location="../../mainwindow.qrc"/>

1
mainwindow.cpp
Unescape Escape View File

@ -83,7 +83,6 @@ void MainWindow::initWindow()
m_SDFPDlg = new SDFPDlg(this); m_SDFPDlg = new SDFPDlg(this);
m_GDDCdlg = new GDDCdlg(this); m_GDDCdlg = new GDDCdlg(this);
m_HomePagedlg = new HomePageDlg(this); m_HomePagedlg = new HomePageDlg(this);
m_ModelCameraDlg = new ModelCameraDlg(this); m_ModelCameraDlg = new ModelCameraDlg(this);
m_rescueLoadWidget = new RescueLoadWidget(this); m_rescueLoadWidget = new RescueLoadWidget(this);

12
mainwindow.ui
Unescape Escape View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1113</width> <width>829</width>
<height>572</height> <height>497</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -257,7 +257,7 @@
</action> </action>
<action name="toolbar_action2"> <action name="toolbar_action2">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="mainwindow.qrc">
<normaloff>:/res/GDDC.png</normaloff>:/res/GDDC.png</iconset> <normaloff>:/res/GDDC.png</normaloff>:/res/GDDC.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -269,7 +269,7 @@
</action> </action>
<action name="toolbar_action3"> <action name="toolbar_action3">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="mainwindow.qrc">
<normaloff>:/res/LChain.png</normaloff>:/res/LChain.png</iconset> <normaloff>:/res/LChain.png</normaloff>:/res/LChain.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -343,6 +343,8 @@
</property> </property>
</action> </action>
</widget> </widget>
<resources/> <resources>
<include location="mainwindow.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

Write Preview
Loading…
Cancel
Save