修改曲线，通讯数据强度，速率

App/Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp

@@ -19,7 +19,7 @@ ConnectDialog::ConnectDialog(QWidget *parent) :
     //载入上一次的连接数据
     //读取配置文件
     //配置文件是json，可扩展性比较好
-    readInfo();
+    //readInfo();
 
 
     //连接信号
@@ -61,13 +61,30 @@ void ConnectDialog::setDevice(QVariant value)
 
 void ConnectDialog::setInit(QVariant inter, QVariant device)
 {
-    m_Type = inter;
-    m_usrName = device;
+    //m_Type = inter;
+    //m_usrName = device;
 
     //根据名字查找上一次的连接，如果不存在，那么载入默认值
 
     //查上一次的数据
     bool isNew = true;
+
+
+    Config *config = new Config();
+
+    config->getConnet(device.toString(),
+                      &m_Type,&m_isAuto,
+                      &m_Param1,&m_Param2,&m_Param3,&m_Param4,&m_Param5);
+
+    qDebug() << m_usrName << m_Type << m_isAuto
+             << m_Param1 << m_Param2 << m_Param3 << m_Param4 << m_Param5;
+
+    if((m_Type == inter)&&(m_Param1.toString().size() > 0))//说明有数
+    {
+        isNew = false;
+    }
+
+    /*
     for(QJsonValue info: Connect_info) {
         if (info.isObject()) {
             if(info.toObject().value("Name") == m_usrName)
@@ -91,20 +108,25 @@ void ConnectDialog::setInit(QVariant inter, QVariant device)
             }
         }
     }
+    */
 
     if(isNew == true)//新建一个新的连接
     {
         //根据接口类型新建一个界面
-        if(m_Type.toString() == tr("SerialPort"))
+        if(inter.toString() == tr("SerialPort"))
         {
+            m_Type = inter;
+            m_usrName = device;
             m_Param1  = tr("COM1");//读取最新发现的串口
             m_Param2  = tr("115200");
             m_Param3  = tr("8");
             m_Param4  = tr("NONE");
             m_Param5  = tr("1");
         }
-        else if(m_Type.toString() == tr("UDP"))
+        else if(inter.toString() == tr("UDP"))
         {
+            m_Type = inter;
+            m_usrName = device;
             m_Param1  = tr("127.0.0.1");
             m_Param2  = tr("6060");
             m_Param3  = tr("127.0.0.1");
@@ -115,6 +137,13 @@ void ConnectDialog::setInit(QVariant inter, QVariant device)
 
 
     reBuildList();
+
+    if(m_isAuto.toBool() == true)
+    {
+        //qDebug() << "connect";
+        onConnectClicked();
+    }
+
 }
 
 //重建列表
@@ -569,6 +598,7 @@ void ConnectDialog::onConnectClicked(void)//关闭本条
 
        if(m_Type == tr("SerialPort"))
        {
+           qDebug() << "connect port";
            type = "SerialPort";
 
            QVariant Param4;
@@ -607,6 +637,7 @@ void ConnectDialog::onConnectClicked(void)//关闭本条
        QVariant type;
        if(m_Type == tr("SerialPort"))
        {
+
            type = "SerialPort";
 
            QVariant Param4;
@@ -658,7 +689,7 @@ void ConnectDialog::writeInfo(QVariant Name,
     Config *config = new Config();
 
 
-    config->setConnet(Name.toString(),Name,Type,
+    config->setConnet(Name.toString(),Type,
                       true,
                       Param1,Param2,Param3,
                       Param4,Param5);
@@ -736,7 +767,7 @@ void ConnectDialog::writeInfo(QVariant Name,
     */
 
     //重新刷新一下数组
-    readInfo();
+    //readInfo();
 }
 
 

App/Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.h

@@ -112,7 +112,7 @@ private:
 
     QVariant connectState = false;
 
-
+    QVariant m_isAuto;
     QVariant m_usrName;
     QVariant m_Type;
     QVariant m_Param1;