Compare commits

..

No commits in common. "master" and "2.0" have entirely different histories.
master ... 2.0

26 changed files with 554 additions and 709 deletions

View File

@ -348,7 +348,7 @@ void CBoardSetting::PushData()
QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
'%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
'%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',95,8,'','',0);").\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
arg("NULL").arg(0).arg("true").arg("ACCELEROMETER").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("CTC-AC102").arg("false").arg(0).arg("false").arg(0).arg("").\
arg("true").arg(strMAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("15000").arg("0.5").arg(30).arg("5000").arg("").arg(0).arg(0).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(1024).arg("").arg("").arg(timeStamp).\
@ -368,7 +368,7 @@ void CBoardSetting::PushData()
QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
'%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
'%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',95,8,'','',0);").\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
arg("NULL").arg(0).arg("true").arg("ACCELEROMETER").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("CTC-AC102").arg("false").arg(0).arg("false").arg(0).arg("").\
arg("true").arg(strMAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("15000").arg("0.5").arg(12).arg("5000").arg("").arg(0).arg(0).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(1024).arg("").arg("").arg(timeStamp).\
@ -387,7 +387,7 @@ void CBoardSetting::PushData()
QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
'%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
'%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',97,8,'','',0);").\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
arg("NULL").arg(0).arg("true").arg("PULSE_CURRENT").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("电流变送器").arg("false").arg(0).arg("false").arg(0).arg("").\
arg("true").arg(MAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("").arg("").arg(20).arg("5000").arg("").arg(0).arg(0).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(1024).arg("").arg("").arg(timeStamp).\
@ -407,7 +407,7 @@ void CBoardSetting::PushData()
QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
'%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
'%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',97,8,'','',0);").\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
arg("NULL").arg(0).arg("true").arg("SLOW_CURRENT").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("电流变送器").arg("false").arg(0).arg("false").arg(0).arg("").\
arg("true").arg(MAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("").arg("").arg(20).arg("5000").arg("").arg(0).arg(0).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(64).arg("").arg("").arg(timeStamp).\
@ -801,7 +801,7 @@ void CBoardSetting::on_pushButton_Init_clicked()
QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
'%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
'%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',95,8,'','',0);").\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
arg("NULL").arg(0).arg("true").arg("ACCELEROMETER").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("CTC-AC102").arg("false").arg(0).arg("false").arg(0).arg("").\
arg("true").arg(strMAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("15000").arg("0.5").arg(10).arg("5000").arg("").arg(1).arg(1).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(1024).arg("").arg("").arg(timeStamp).\
@ -820,7 +820,7 @@ void CBoardSetting::on_pushButton_Init_clicked()
QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
'%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
'%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',97,8,'','',0);").\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
arg("NULL").arg(0).arg("true").arg("PULSE_CURRENT").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("电流变送器").arg("false").arg(0).arg("false").arg(0).arg("").\
arg("true").arg(MAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("").arg("").arg(20).arg("5000").arg("").arg(1).arg(1).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(1024).arg("").arg("").arg(timeStamp).\
@ -840,7 +840,7 @@ void CBoardSetting::on_pushButton_Init_clicked()
QString str = QString(" values('%1','%2','%3','%4',%5,'%6','%7',%8,'%9',%10,'%11',%12,'%13',%14,'%15',%16,'%17',%18,%19,%20,'%21',%22,'%23',%24,\
'%25',%26,'%27','%28','%29','%30',%31,'%32',%33,'%34','%35',%36,'%37',%38,'%39','%40',%41,'%42',%43,'%44',\
'%45','%46',%47,%48,%49,'%50','%51','%52',%53,'%54','%55',%56,%57,'%58','%59',%60,'%61','%62','%63',%64,'%65','%66','%67',\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',97,8,'','',0);").\
'%68','%69','%70',%71,%72,%73,'%74','%75','%76','%77','%78','%79','%80','%81','%82','%83','%84',%85,'%86','%87','%88','%89','%90','%91','%92','%93','%94','%95','',98,1,'','',0);").\
arg("NULL").arg(0).arg("true").arg("SLOW_CURRENT").arg("0").arg("Bottom").arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg("false").arg(0).arg(0).arg(0).arg("false").
arg(0).arg("false").arg(0).arg("false").arg(0).arg(strChannelID).arg("NONE").arg(strChannelName).arg("false").arg(0).arg("false").arg(0).arg("RMSValue").arg("").arg(0).arg("false").arg(0).arg("电流变送器").arg("false").arg(0).arg("false").arg(0).arg("").\
arg("true").arg(MAC).arg(0).arg(1000).arg(0).arg("Hamming").arg("").arg("").arg(20).arg("5000").arg("").arg(0).arg(0).arg("0").arg("60000").arg(0).arg("NONE").arg("").arg("0").arg(64).arg("").arg("").arg(timeStamp).\

View File

@ -166,6 +166,7 @@ void CChannelList::iniUi()
ui->tableView->setColumnWidth(i, 130);
}
}
}
void CChannelList::iniConnect()
@ -496,6 +497,7 @@ void CChannelList::putJson()
QVector<channelBaseInfo>().swap(g_ChannelBaseInfo);
QMap<QString,QMap<QString,QString>>().swap(g_MapChannel);
g_channelSetting = g_SqliteDB->GetDataMultiLine("t_ChannelSetting");
for (int i = 0; i < g_channelSetting.size(); i++)
{

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>771</width>
<height>581</height>
<width>1052</width>
<height>659</height>
</rect>
</property>
<property name="windowTitle">
@ -136,7 +136,7 @@ color: rgb(27, 30, 35);</string>
<item>
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
<number>0</number>
<number>18</number>
</property>
<item>
<widget class="QRadioButton" name="radioButton_11">
@ -227,19 +227,6 @@ color: rgb(27, 30, 35);</string>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>复制通道</string>
<string>Form</string>
</property>
<property name="styleSheet">
<string notr="true">font: 10pt &quot;黑体&quot;;

View File

@ -3,6 +3,8 @@
#include <QWidget>
#include <QUrl>
#include <QtFtp/qftp.h>
#include <QtFtp/qurlinfo.h>
#include <QTreeWidgetItem>
#include <QStandardItemModel>
#include <QFile>
@ -50,6 +52,7 @@ private:
Ui::CCopyDatFile *ui;
QHash<QString, bool> isDirectory;
void connectToFtp();
QFtp *ftp = nullptr;
QStandardItemModel *model;
QString m_strFilePath;
QString m_strDistPath;

View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>894</width>
<height>613</height>
<height>729</height>
</rect>
</property>
<property name="windowTitle">
@ -20,13 +20,13 @@ color: rgb(27, 30, 35);
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="topMargin">
<number>10</number>
<number>30</number>
</property>
<property name="rightMargin">
<number>20</number>
<number>30</number>
</property>
<property name="bottomMargin">
<number>5</number>
<number>30</number>
</property>
<item>
<widget class="QWidget" name="widget" native="true">

View File

@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets sql printsupport
TARGET = DataWatch3500_GUI
TEMPLATE = app
# win32:CONFIG += console
win32:CONFIG += console
# The following define makes your compiler emit warnings if you use
# any feature of Qt which has been marked as deprecated (the exact warnings
# depend on your compiler). Please consult the documentation of the

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>683</width>
<height>586</height>
<width>669</width>
<height>531</height>
</rect>
</property>
<property name="windowTitle">
@ -17,9 +17,6 @@
<string notr="true">font: 10pt &quot;黑体&quot;;color: rgb(27, 30, 35);</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_17">
<property name="spacing">
<number>0</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
@ -34,7 +31,7 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
<height>50</height>
</size>
</property>
<property name="maximumSize">

View File

@ -6,16 +6,10 @@
<rect>
<x>0</x>
<y>0</y>
<width>945</width>
<width>1148</width>
<height>533</height>
</rect>
</property>
<property name="maximumSize">
<size>
<width>945</width>
<height>16777215</height>
</size>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
@ -95,7 +89,7 @@ color: rgb(27, 30, 35);</string>
<widget class="QComboBox" name="comboBox_channel">
<property name="minimumSize">
<size>
<width>150</width>
<width>200</width>
<height>0</height>
</size>
</property>
@ -126,7 +120,7 @@ color: rgb(27, 30, 35);</string>
<widget class="QPushButton" name="pushButton_search">
<property name="minimumSize">
<size>
<width>70</width>
<width>96</width>
<height>28</height>
</size>
</property>
@ -155,7 +149,7 @@ color: rgb(27, 30, 35);</string>
<widget class="QPushButton" name="pushButton_delete">
<property name="minimumSize">
<size>
<width>70</width>
<width>96</width>
<height>28</height>
</size>
</property>

View File

@ -24,8 +24,8 @@ CRealTimeAlarm::CRealTimeAlarm(QWidget *parent) :
ui->tableView->setModel(model);
ui->tableView->setColumnWidth(0, 50);
ui->tableView->setColumnWidth(1, 50);
ui->tableView->setColumnWidth(2, 300);
ui->tableView->setColumnWidth(3, 150);
ui->tableView->setColumnWidth(2, 370);
ui->tableView->setColumnWidth(3, 200);
ui->tableView->setAlternatingRowColors(true);
ui->tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
@ -555,7 +555,6 @@ void CRealTimeAlarm::Details(const QModelIndex &index)
int y = this->geometry().center().y() - downloadProgressDialog->height() / 2;
downloadProgressDialog->move(x, y);
}
qDebug() << "strFileName" << strFileName ;
ScpClient scp;
connect(downloadProgressDialog, &QProgressDialog::canceled, [&scp]() {
// 执行停止下载的操作
@ -565,7 +564,7 @@ void CRealTimeAlarm::Details(const QModelIndex &index)
connect(&scp, SIGNAL(progress(qint64 , qint64 )), this,SLOT(downloadProcess_Slot(qint64 , qint64 )));
connect(&scp, SIGNAL(error(const QString &)), this,SLOT(downloadError_Slot(const QString &)));
connect(&scp, SIGNAL(finished()), this,SLOT(downloadFinished_Slot()));
scp.connectToHost(IP, 22, "root", "@#cidw!@123456");
scp.connectToHost(IP, 22, "root", "cidw!@123456");
scp.download(strFileName, strPath);
qDebug() << "filename_list" << strPath;
}

View File

@ -10,12 +10,6 @@
<height>405</height>
</rect>
</property>
<property name="maximumSize">
<size>
<width>850</width>
<height>16777215</height>
</size>
</property>
<property name="windowTitle">
<string>Form</string>
</property>

View File

@ -159,11 +159,6 @@ void CSlowSpeedChannelSetting::displayChannelSetting()
if(channelSetting.samplingRate == 16384)
ui->comboBox_sampleRate->setCurrentText("16kHz");
QString string_sectionNum = QString("%1").arg(channelSetting.sectionNum);
ui->lineEdit_sectionNum->setText(string_sectionNum);
QString string_confidenceDegree = QString("%1").arg(channelSetting.confidenceDegree);
ui->lineEdit_confidenceDegree->setText(string_confidenceDegree);
}
void CSlowSpeedChannelSetting::on_lineEdit_engineeringUnit_editingFinished()
@ -210,8 +205,7 @@ void CSlowSpeedChannelSetting::on_pushButton_submit_clicked()
channelSetting.speedRefChannelName = "";
}
}
channelSetting.confidenceDegree = ui->lineEdit_confidenceDegree->text().toInt();
channelSetting.sectionNum = ui->lineEdit_sectionNum->text().toInt();
channelSetting.defaultDisplay = ui->comboBox_defaultDisplay->currentText();
channelSetting.firstPoleNum = ui->lineEdit_poleNum->text();

View File

@ -512,6 +512,8 @@ color: rgb(27, 30, 35);</string>
<property name="title">
<string>传感器设置</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
@ -1048,97 +1050,6 @@ color: rgb(27, 30, 35);</string>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_35">
<item>
<widget class="QLabel" name="label_48">
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>180</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string> 置信度:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_confidenceDegree">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>97</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_50">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>%</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_34">
<item>
<widget class="QLabel" name="label_49">
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>180</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string> 分段数:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_sectionNum">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>8</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
@ -1147,12 +1058,14 @@ color: rgb(27, 30, 35);</string>
<property name="sizeHint" stdset="0">
<size>
<width>461</width>
<height>20</height>
<height>33</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>

View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>831</width>
<height>538</height>
<height>618</height>
</rect>
</property>
<property name="windowTitle">
@ -31,7 +31,7 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
<height>50</height>
</size>
</property>
<property name="maximumSize">
@ -131,7 +131,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>30</height>
<height>40</height>
</size>
</property>
</spacer>
@ -270,7 +270,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>30</height>
<height>40</height>
</size>
</property>
</spacer>
@ -303,7 +303,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>30</height>
<height>40</height>
</size>
</property>
</spacer>
@ -424,7 +424,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>30</height>
<height>40</height>
</size>
</property>
</spacer>
@ -458,7 +458,7 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>40</height>
<height>100</height>
</size>
</property>
<property name="maximumSize">

View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>875</width>
<width>1170</width>
<height>525</height>
</rect>
</property>
@ -337,7 +337,7 @@
<widget class="QPushButton" name="pushButton_1S">
<property name="minimumSize">
<size>
<width>70</width>
<width>96</width>
<height>28</height>
</size>
</property>
@ -369,7 +369,7 @@
<widget class="QPushButton" name="pushButton_4S">
<property name="minimumSize">
<size>
<width>70</width>
<width>96</width>
<height>28</height>
</size>
</property>
@ -401,7 +401,7 @@
<widget class="QPushButton" name="pushButton_refresh">
<property name="minimumSize">
<size>
<width>70</width>
<width>96</width>
<height>28</height>
</size>
</property>
@ -430,7 +430,7 @@
<widget class="QPushButton" name="pushButton_refreshauto">
<property name="minimumSize">
<size>
<width>70</width>
<width>96</width>
<height>28</height>
</size>
</property>

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>916</width>
<height>693</height>
<width>1398</width>
<height>775</height>
</rect>
</property>
<property name="windowTitle">
@ -71,7 +71,7 @@ color: rgb(27, 30, 35);</string>
<property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@ -151,7 +151,7 @@ color: rgb(27, 30, 35);</string>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>3</number>
<number>10</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
@ -640,6 +640,19 @@ color: rgb(27, 30, 35);</string>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QWidget" name="widget_3" native="true">
<property name="minimumSize">
@ -654,7 +667,7 @@ color: rgb(27, 30, 35);</string>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
<height>50</height>
</size>
</property>
<property name="maximumSize">

View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>812</width>
<height>792</height>
<height>754</height>
</rect>
</property>
<property name="windowTitle">
@ -531,7 +531,7 @@ color: rgb(27, 30, 35);</string>
</size>
</property>
<property name="text">
<string>95</string>
<string>98</string>
</property>
</widget>
</item>
@ -583,7 +583,7 @@ color: rgb(27, 30, 35);</string>
</size>
</property>
<property name="text">
<string>8</string>
<string>1</string>
</property>
</widget>
</item>
@ -841,7 +841,7 @@ color: rgb(27, 30, 35);</string>
<item>
<widget class="QComboBox" name="comboBox_sensorICP">
<property name="enabled">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
@ -3029,13 +3029,13 @@ color: rgb(27, 30, 35);</string>
<widget class="QPushButton" name="pushButton_copy">
<property name="minimumSize">
<size>
<width>100</width>
<width>96</width>
<height>28</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<width>96</width>
<height>28</height>
</size>
</property>

Binary file not shown.

Binary file not shown.

View File

@ -1,21 +0,0 @@
###########################################################################
# libssh2 installation details
#
# Copyright (C) The libssh2 project and its contributors.
# SPDX-License-Identifier: BSD-3-Clause
###########################################################################
prefix=/opt/Tools/libssh2-1.11.1/install
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: libssh2
URL: https://libssh2.org/
Description: Library for SSH-based communication
Version: 1.11.1
Requires:
Requires.private: libcrypto,zlib
Libs: -L${libdir} -lssh2
Libs.private: -L/opt/Tools/openssl-3.0.18/install/lib64 -lssl -L/opt/Tools/openssl-3.0.18/install/lib64 -lcrypto -R/opt/Tools/openssl-3.0.18/install/lib64 -L/opt/Tools/zlib-1.3.1/install/lib -lz -R/opt/Tools/zlib-1.3.1/install/lib
Cflags: -I${includedir}

Binary file not shown.

Binary file not shown.

View File

@ -1,13 +0,0 @@
prefix=/opt/Tools/openssl-3.0.18/install
exec_prefix=${prefix}
libdir=${exec_prefix}/lib64
includedir=${prefix}/include
enginesdir=${libdir}/engines-3
modulesdir=${libdir}/ossl-modules
Name: OpenSSL-libcrypto
Description: OpenSSL cryptography library
Version: 3.0.18
Libs: -L${libdir} -lcrypto
Libs.private: -ldl -pthread
Cflags: -I${includedir}

View File

@ -1,11 +0,0 @@
prefix=/opt/Tools/openssl-3.0.18/install
exec_prefix=${prefix}
libdir=${exec_prefix}/lib64
includedir=${prefix}/include
Name: OpenSSL-libssl
Description: Secure Sockets Layer and cryptography libraries
Version: 3.0.18
Requires.private: libcrypto
Libs: -L${libdir} -lssl
Cflags: -I${includedir}

View File

@ -1,9 +0,0 @@
prefix=/opt/Tools/openssl-3.0.18/install
exec_prefix=${prefix}
libdir=${exec_prefix}/lib64
includedir=${prefix}/include
Name: OpenSSL
Description: Secure Sockets Layer and cryptography libraries and tools
Version: 3.0.18
Requires: libssl libcrypto

View File

@ -129,9 +129,7 @@ void MainWindow::initWindow()
ui->widgetLeft4->setProperty("nav", "left");
ui->widgetLeft4->setProperty("flag", "left");
this->resize(1024,767);
this->resize(1024,768);
QFont font;
font.setPixelSize(15);
@ -703,6 +701,8 @@ void MainWindow::mqttReceive_slot(QString strTopic,QByteArray payload)
}else if(TriggerObj.contains("cmd")){
qDebug() << TriggerObj << endl;
}
}else if(strTopic == m_triggerAlarmSatusTopic){
QString strReceive = QString(payload);
customLogMessageHandler(QtDebugMsg,strReceive);
@ -737,6 +737,7 @@ void MainWindow::mqttReceive_slot(QString strTopic,QByteArray payload)
}
}
}
}
}
@ -776,8 +777,10 @@ void MainWindow::slotNetMgr(QString sAddr, const QVariant &msg)
void MainWindow::on_pushButton_detail_clicked()
{
QJsonDocument jsonDoc;
QNetworkRequest req;
QString sUrl = QString("http://%1/cgi-bin/General.cgi/").arg(IP);
QJsonObject allObj,cmdBody;
allObj.insert("cmd", "87");
req.setUrl(sUrl);