add tools uis

App/About/About.cpp

@@ -0,0 +1,15 @@
+#include "About.h"
+#include "ui_About.h"
+
+About::About(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::About)
+{
+    ui->setupUi(this);
+    setWindowTitle(tr("About"));
+}
+
+About::~About()
+{
+    delete ui;
+}

App/About/About.h

@@ -0,0 +1,22 @@
+#ifndef ABOUT_H
+#define ABOUT_H
+
+#include <QWidget>
+
+namespace Ui {
+class About;
+}
+
+class About : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit About(QWidget *parent = nullptr);
+    ~About();
+
+private:
+    Ui::About *ui;
+};
+
+#endif // ABOUT_H

App/About/About.pri

@@ -0,0 +1,15 @@
+FORMS += \
+    $$PWD/About.ui
+
+HEADERS += \
+    $$PWD/About.h
+
+SOURCES += \
+    $$PWD/About.cpp
+
+
+
+
+
+
+

App/About/About.ui

@@ -0,0 +1,21 @@
+<ui version="4.0">
+ <author/>
+ <comment/>
+ <exportmacro/>
+ <class>About</class>
+ <widget name="About" class="QWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+ </widget>
+ <pixmapfunction/>
+ <connections/>
+</ui>

App/App.pro

@@ -15,6 +15,11 @@ include (./LinkUI/LinkUI.pri)
 include (./InspectUI/InspectUI.pri)
 
 
+include (./ToolsUI/ToolsUI.pri)
+include (./About/About.pri)
+include (./Setting/Setting.pri)
+include (./Help/Help.pri)
+
 
 win32:
 {

App/Help/Help.cpp

@@ -0,0 +1,15 @@
+#include "Help.h"
+#include "ui_Help.h"
+
+Help::Help(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::Help)
+{
+    ui->setupUi(this);
+    setWindowTitle(tr("Help"));
+}
+
+Help::~Help()
+{
+    delete ui;
+}

App/Help/Help.h

@@ -0,0 +1,22 @@
+#ifndef HELP_H
+#define HELP_H
+
+#include <QWidget>
+
+namespace Ui {
+class Help;
+}
+
+class Help : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit Help(QWidget *parent = nullptr);
+    ~Help();
+
+private:
+    Ui::Help *ui;
+};
+
+#endif // HELP_H

App/Help/Help.pri

@@ -0,0 +1,14 @@
+FORMS += \
+    $$PWD/Help.ui
+
+HEADERS += \
+    $$PWD/Help.h
+
+SOURCES += \
+    $$PWD/Help.cpp
+
+
+
+
+
+

App/Help/Help.ui

@@ -0,0 +1,21 @@
+<ui version="4.0">
+ <author/>
+ <comment/>
+ <exportmacro/>
+ <class>Help</class>
+ <widget name="Help" class="QWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+ </widget>
+ <pixmapfunction/>
+ <connections/>
+</ui>

App/InspectUI/InspectUI.cpp

@@ -1,4 +1,4 @@
-#include "InspectUI.h"
+#include "InspectUI.h"
 #include "ui_InspectUI.h"
 
 InspectUI::InspectUI(QWidget *parent) :
@@ -12,3 +12,19 @@ InspectUI::~InspectUI()
 {
     delete ui;
 }
+
+
+void InspectUI::on_MavlinkpushButton_clicked()
+{
+    emit clicked(ui->MavlinkpushButton->text());
+}
+
+void InspectUI::on_ParampushButton_clicked()
+{
+    emit clicked(ui->ParampushButton->text());
+}
+
+void InspectUI::on_AddpushButton_clicked()
+{
+    emit clicked(ui->AddpushButton->text());
+}

App/InspectUI/InspectUI.h

@@ -1,4 +1,4 @@
-#ifndef INSPECTUI_H
+#ifndef INSPECTUI_H
 #define INSPECTUI_H
 
 #include <QWidget>
@@ -15,6 +15,16 @@ public:
     explicit InspectUI(QWidget *parent = nullptr);
     ~InspectUI();
 
+signals:
+    void clicked(QString);
+
+private slots:
+    void on_MavlinkpushButton_clicked();
+
+    void on_ParampushButton_clicked();
+
+    void on_AddpushButton_clicked();
+
 private:
     Ui::InspectUI *ui;
 };

App/InspectUI/InspectUI.ui

@@ -13,33 +13,49 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <widget class="QPushButton" name="pushButton">
+  <widget class="QPushButton" name="MavlinkpushButton">
    <property name="geometry">
     <rect>
-     <x>270</x>
+     <x>180</x>
      <y>10</y>
-     <width>131</width>
-     <height>131</height>
+     <width>100</width>
+     <height>100</height>
     </rect>
    </property>
    <property name="text">
-    <string>Mavlink Inspector</string>
+    <string>Mavlink</string>
    </property>
   </widget>
-  <widget class="QPushButton" name="pushButton_2">
+  <widget class="QPushButton" name="ParampushButton">
    <property name="geometry">
     <rect>
-     <x>410</x>
+     <x>290</x>
      <y>10</y>
-     <width>131</width>
-     <height>131</height>
+     <width>100</width>
+     <height>100</height>
     </rect>
    </property>
    <property name="text">
-    <string>Parameter Inspector</string>
+    <string>Parameter</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="AddpushButton">
+   <property name="geometry">
+    <rect>
+     <x>400</x>
+     <y>10</y>
+     <width>100</width>
+     <height>100</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>ADD</string>
    </property>
   </widget>
  </widget>
  <resources/>
  <connections/>
+ <slots>
+  <signal>clicked(QString)</signal>
+ </slots>
 </ui>

App/LinkUI/LinkUI.cpp

@@ -1,4 +1,4 @@
-#include "LinkUI.h"
+#include "LinkUI.h"
 #include "ui_LinkUI.h"
 
 LinkUI::LinkUI(QWidget *parent) :
@@ -12,3 +12,18 @@ LinkUI::~LinkUI()
 {
     delete ui;
 }
+
+void LinkUI::on_SerialPortpushButton_clicked()
+{
+    emit clicked(ui->SerialPortpushButton->text());
+}
+
+void LinkUI::on_UDPpushButton_clicked()
+{
+    emit clicked(ui->UDPpushButton->text());
+}
+
+void LinkUI::on_AddpushButton_clicked()
+{
+    emit clicked(ui->AddpushButton->text());
+}

App/LinkUI/LinkUI.h

@@ -1,4 +1,4 @@
-#ifndef LINKUI_H
+#ifndef LINKUI_H
 #define LINKUI_H
 
 #include <QWidget>
@@ -15,6 +15,16 @@ public:
     explicit LinkUI(QWidget *parent = nullptr);
     ~LinkUI();
 
+signals:
+    void clicked(QString);
+
+private slots:
+    void on_SerialPortpushButton_clicked();
+
+    void on_UDPpushButton_clicked();
+
+    void on_AddpushButton_clicked();
+
 private:
     Ui::LinkUI *ui;
 };

App/LinkUI/LinkUI.ui

@@ -13,11 +13,11 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <widget class="QPushButton" name="pushButton">
+  <widget class="QPushButton" name="SerialPortpushButton">
    <property name="geometry">
     <rect>
-     <x>260</x>
-     <y>40</y>
+     <x>170</x>
+     <y>10</y>
      <width>100</width>
      <height>100</height>
     </rect>
@@ -26,11 +26,11 @@
     <string>Serial Port</string>
    </property>
   </widget>
-  <widget class="QPushButton" name="pushButton_2">
+  <widget class="QPushButton" name="UDPpushButton">
    <property name="geometry">
     <rect>
-     <x>370</x>
-     <y>40</y>
+     <x>280</x>
+     <y>10</y>
      <width>100</width>
      <height>100</height>
     </rect>
@@ -39,6 +39,19 @@
     <string>UDP</string>
    </property>
   </widget>
+  <widget class="QPushButton" name="AddpushButton">
+   <property name="geometry">
+    <rect>
+     <x>390</x>
+     <y>10</y>
+     <width>100</width>
+     <height>100</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>ADD</string>
+   </property>
+  </widget>
  </widget>
  <resources/>
  <connections/>

App/Setting/Setting.cpp

@@ -0,0 +1,17 @@
+#include "Setting.h"
+#include "ui_Setting.h"
+
+Setting::Setting(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::Setting)
+{
+    ui->setupUi(this);
+    setWindowTitle(tr("Setting"));
+
+
+}
+
+Setting::~Setting()
+{
+    delete ui;
+}

App/Setting/Setting.h

@@ -0,0 +1,22 @@
+#ifndef SETTING_H
+#define SETTING_H
+
+#include <QWidget>
+
+namespace Ui {
+class Setting;
+}
+
+class Setting : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit Setting(QWidget *parent = nullptr);
+    ~Setting();
+
+private:
+    Ui::Setting *ui;
+};
+
+#endif // SETTING_H

App/Setting/Setting.pri

@@ -0,0 +1,23 @@
+FORMS += \
+    $$PWD/Setting.ui
+
+HEADERS += \
+    $$PWD/Setting.h
+
+SOURCES += \
+    $$PWD/Setting.cpp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

App/Setting/Setting.ui

@@ -0,0 +1,21 @@
+<ui version="4.0">
+ <author/>
+ <comment/>
+ <exportmacro/>
+ <class>Setting</class>
+ <widget name="Setting" class="QWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+ </widget>
+ <pixmapfunction/>
+ <connections/>
+</ui>

App/ToolsUI/ToolsUI.cpp

@@ -0,0 +1,29 @@
+#include "ToolsUI.h"
+#include "ui_ToolsUI.h"
+
+ToolsUI::ToolsUI(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::ToolsUI)
+{
+    ui->setupUi(this);
+}
+
+ToolsUI::~ToolsUI()
+{
+    delete ui;
+}
+
+void ToolsUI::on_AboutpushButton_clicked()
+{
+    emit clicked(ui->AboutpushButton->text());
+}
+
+void ToolsUI::on_SettingpushButton_clicked()
+{
+    emit clicked(ui->SettingpushButton->text());
+}
+
+void ToolsUI::on_HelppushButton_clicked()
+{
+    emit clicked(ui->HelppushButton->text());
+}

App/ToolsUI/ToolsUI.h

@@ -0,0 +1,35 @@
+#ifndef TOOLSUI_H
+#define TOOLSUI_H
+
+#include <QWidget>
+
+namespace Ui {
+class ToolsUI;
+}
+
+class ToolsUI : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ToolsUI(QWidget *parent = nullptr);
+    ~ToolsUI();
+
+signals:
+    void clicked(QString);
+
+
+
+
+private slots:
+    void on_AboutpushButton_clicked();
+
+    void on_SettingpushButton_clicked();
+
+    void on_HelppushButton_clicked();
+
+private:
+    Ui::ToolsUI *ui;
+};
+
+#endif // TOOLSUI_H

App/ToolsUI/ToolsUI.pri

@@ -0,0 +1,31 @@
+
+
+
+HEADERS += \
+    $$PWD/ToolsUI.h \
+    LinkUI/LinkUI.h \
+
+
+SOURCES += \
+    $$PWD/ToolsUI.cpp \
+    LinkUI/LinkUI.cpp \
+
+
+
+FORMS += \
+    $$PWD/ToolsUI.ui \
+    LinkUI/LinkUI.ui
+
+
+
+
+
+
+
+
+
+
+
+
+
+

App/ToolsUI/ToolsUI.ui

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ToolsUI</class>
+ <widget class="QWidget" name="ToolsUI">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>586</width>
+    <height>439</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QPushButton" name="HelppushButton">
+   <property name="geometry">
+    <rect>
+     <x>390</x>
+     <y>10</y>
+     <width>100</width>
+     <height>100</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Help</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="AboutpushButton">
+   <property name="geometry">
+    <rect>
+     <x>170</x>
+     <y>10</y>
+     <width>100</width>
+     <height>100</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>About</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="SettingpushButton">
+   <property name="geometry">
+    <rect>
+     <x>280</x>
+     <y>10</y>
+     <width>100</width>
+     <height>100</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Setting</string>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

App/mainwindow.cpp

@@ -19,6 +19,22 @@ MainWindow::MainWindow(QWidget *parent)
     inspectui->hide();
 
 
+    toolsui = new ToolsUI(this);
+    toolsui->hide();
+
+
+    about = new About();
+    about->hide();
+
+    help = new Help();
+    help->hide();
+
+    setting = new Setting();
+    setting->hide();
+
+
+
+
 
     dlink = new DLink();
 
@@ -55,7 +71,7 @@ MainWindow::MainWindow(QWidget *parent)
     nav->addItem(tr("Inspector"),icon);// mavlink param
     nav->addItem(tr("Command"),icon);//cmd console
     nav->addItem(tr("Data"),icon);//all data
-    nav->addItem(tr("Setting"),icon);//soft setting  help about
+    nav->addItem(tr("Tools"),icon);//soft setting  help about
 
     connect(nav,SIGNAL(ItemChanged(int)),
             this,SLOT(onTabIndexChanged(int)));
@@ -72,6 +88,16 @@ MainWindow::MainWindow(QWidget *parent)
 
     updateTimer->start(200);
 
+    //=======信号和槽========
+    connect(linkui,&LinkUI::clicked,
+            this,&MainWindow::subui);
+
+    connect(inspectui,&InspectUI::clicked,
+            this,&MainWindow::subui);
+
+    connect(toolsui,&ToolsUI::clicked,
+            this,&MainWindow::subui);
+
 }
 
 MainWindow::~MainWindow()
@@ -82,9 +108,7 @@ MainWindow::~MainWindow()
     copk->deleteLater();
     delete  copk;
 
-
-
-    QCoreApplication::quit();//退出所有
+    QCoreApplication::quit();//退出所有窗口
 }
 
 
@@ -225,6 +249,41 @@ void MainWindow::keyPressEvent(QKeyEvent *event)   //键盘按下事件
 }
 
 
+void MainWindow::subui(QString arg)//子界面管理
+{
+     if(arg == tr("Serial Port"))
+     {
+         dlink_triggered();
+     }
+     else if(arg == tr("UDP"))
+     {
+         client_triggered();
+     }
+     else if(arg == tr("Mavlink"))
+     {
+         dlink->mavlinknode->mavlinkinspector->show();
+     }
+     else if(arg == tr("Parameter"))
+     {
+         dlink->mavlinknode->Parameter->paramInspect->show();
+     }
+     else if(arg == tr("About"))
+     {
+         about->show();
+     }
+     else if(arg == tr("Setting"))
+     {
+         help->show();
+     }
+     else if(arg == tr("Help"))
+     {
+         setting->show();
+     }
+
+
+}
+
+
 void MainWindow::onTabIndexChanged(const int &index)//界面选择管理
 {
     if((index == 0)||(index == 1))//隐藏
@@ -239,43 +298,33 @@ void MainWindow::onTabIndexChanged(const int &index)//界面选择管理
     }
 
 
-    if(index == 2)
+    if(index == 2) linkui->show();
+    else           linkui->hide();
+
+    if(index == 3) inspectui->show();
+    else           inspectui->hide();
+
+    if(index == 4)
     {
-        linkui->show();
+        qDebug() << "index:" << index;
     }
     else
     {
-        linkui->hide();
+
     }
 
-    if(index == 3)
+    if(index == 5)
     {
-        inspectui->show();
+         qDebug() << "index:" << index;
     }
     else
     {
-        inspectui->hide();
-    }
-
-
-    switch(index)
-    {
-    case 4:{//cmd console
-         dlink->mavlinknode->Parameter->paramInspect->show();
-    }break;
-    case 5:{//all data
-         dlink->mavlinknode->Parameter->paramInspect->show();
-    }break;
-    case 6:{//soft setting  help about
-         dlink->mavlinknode->Parameter->paramInspect->show();
-    }break;
-
 
     }
 
 
-
-
+    if(index == 6) toolsui->show();
+    else           toolsui->hide();
 }
 
 

App/mainwindow.h

@@ -24,6 +24,12 @@
 //ui include
 #include "LinkUI/LinkUI.h"
 #include "InspectUI/InspectUI.h"
+#include "ToolsUI/ToolsUI.h"
+
+//sub widget
+#include "About/About.h"
+#include "Help/Help.h"
+#include "Setting/Setting.h"
 
 #pragma execution_character_set("utf-8")
 
@@ -51,6 +57,10 @@ protected:
     void resizeEvent(QResizeEvent *event);
     void keyPressEvent(QKeyEvent *event);
 
+
+    void subui(QString arg);
+
+
 private slots:
     void onTabIndexChanged(const int &index);
 
@@ -70,8 +80,13 @@ protected:
 
     LinkUI *linkui = nullptr;
     InspectUI *inspectui = nullptr;
+    ToolsUI *toolsui = nullptr;
 
 
+    About *about = nullptr;
+    Help *help = nullptr;
+    Setting *setting = nullptr;
+
 
 
 

MavLinkNode/ParameterInspector/ParameterInspector.cpp

@@ -383,7 +383,11 @@ void ParameterInspector::on_treeWidget_itemDoubleClicked(QTreeWidgetItem *item,
 
 void ParameterInspector::on_clearButton_clicked()
 {
-    //这个清除方式过于粗暴，导致清除后无法再次进入读取
-
+    //清除所有的存储数据，包括显示
     clearview();
 }
+
+void ParameterInspector::on_WriteButton_clicked()
+{
+     //读取是哪设备，是哪个参数，然后发送出去
+}

MavLinkNode/ParameterInspector/ParameterInspector.h

@@ -149,6 +149,8 @@ private slots:
 
 
 
+    void on_WriteButton_clicked();
+
 private: