[ref]同步711

2025-03-17 17:00:58 +08:00 · 2025-03-17 17:00:58 +08:00 · 30a870284e
commit 30a870284e
parent d198d1cdc6
29 changed files with 18806 additions and 28 deletions
--- a/product/src/gui/GraphTool/IconActTool/CFileOpt.cpp
+++ b/product/src/gui/GraphTool/IconActTool/CFileOpt.cpp
@ -1,4 +1,4 @@
-#include "CFileOpt.h"
+#include "CFileOpt.h"
 #include "public/pub_logger_api/logger.h"
 #include "public/pub_utility_api/FileUtil.h"
 #include <QFile>
--- a/product/src/gui/GraphTool/IconActTool/CFileOpt.h
+++ b/product/src/gui/GraphTool/IconActTool/CFileOpt.h
@ -1,4 +1,4 @@
-#ifndef CFILEOPT_H
+#ifndef CFILEOPT_H
 #define CFILEOPT_H

 #include <QMap>
--- a/product/src/gui/GraphTool/IconActTool/CIconActDialog.cpp
+++ b/product/src/gui/GraphTool/IconActTool/CIconActDialog.cpp
@ -1,4 +1,4 @@
-#include "CIconActDialog.h"
+#include "CIconActDialog.h"
 #include "ui_CIconActDialog.h"
 #include "public/pub_utility_api/FileUtil.h"
 #include "CTableModel.h"
--- a/product/src/gui/GraphTool/IconActTool/CIconActDialog.h
+++ b/product/src/gui/GraphTool/IconActTool/CIconActDialog.h
@ -1,4 +1,4 @@
-#ifndef CICONACTDIALOG_H
+#ifndef CICONACTDIALOG_H
 #define CICONACTDIALOG_H

 #include <QMap>
--- a/product/src/gui/GraphTool/IconActTool/CIconActPublic.h
+++ b/product/src/gui/GraphTool/IconActTool/CIconActPublic.h
@ -1,4 +1,4 @@
-#ifndef CICONACTPUBLIC_H
+#ifndef CICONACTPUBLIC_H
 #define CICONACTPUBLIC_H

 #include <QString>
--- a/product/src/gui/GraphTool/IconActTool/CLineEditWithBt.cpp
+++ b/product/src/gui/GraphTool/IconActTool/CLineEditWithBt.cpp
@ -1,4 +1,4 @@
-#include "CLineEditWithBt.h"
+#include "CLineEditWithBt.h"
 #include <QCoreApplication>
 #include <QEvent>
 #include <QHBoxLayout>
--- a/product/src/gui/GraphTool/IconActTool/CLineEditWithBt.h
+++ b/product/src/gui/GraphTool/IconActTool/CLineEditWithBt.h
@ -1,4 +1,4 @@
-#ifndef CLINEEDITWITHBT_H
+#ifndef CLINEEDITWITHBT_H
 #define CLINEEDITWITHBT_H

 #include <QWidget>
--- a/product/src/gui/GraphTool/IconActTool/CTableDelegate.cpp
+++ b/product/src/gui/GraphTool/IconActTool/CTableDelegate.cpp
@ -1,4 +1,4 @@
-#include "CTableDelegate.h"
+#include "CTableDelegate.h"
 #include "CLineEditWithBt.h"
 #include <QComboBox>
 #include <QLineEdit>
--- a/product/src/gui/GraphTool/IconActTool/CTableDelegate.h
+++ b/product/src/gui/GraphTool/IconActTool/CTableDelegate.h
@ -1,4 +1,4 @@
-#ifndef CTREEITEMDELEGATE_H
+#ifndef CTREEITEMDELEGATE_H
 #define CTREEITEMDELEGATE_H

 #include <QStyledItemDelegate>
--- a/product/src/gui/GraphTool/IconActTool/CTableModel.cpp
+++ b/product/src/gui/GraphTool/IconActTool/CTableModel.cpp
@ -1,4 +1,4 @@
-#include "CTableModel.h"
+#include "CTableModel.h"
 #include "CIconActDialog.h"

 CTableModel::CTableModel(QObject *parent)
--- a/product/src/gui/GraphTool/IconActTool/CTableModel.h
+++ b/product/src/gui/GraphTool/IconActTool/CTableModel.h
@ -1,4 +1,4 @@
-#ifndef CTABLEMODEL_H
+#ifndef CTABLEMODEL_H
 #define CTABLEMODEL_H

 #include <QAbstractTableModel>
--- a/product/src/gui/GraphTool/IconActTool/main.cpp
+++ b/product/src/gui/GraphTool/IconActTool/main.cpp
@ -1,4 +1,4 @@
-
+
 #include <QApplication>
 #include <QTextCodec>
 #include "common/QtAppGlobalSet.h"
--- a/product/src/gui/GraphTool/NavigationApi/CJsonOpt.cpp
+++ b/product/src/gui/GraphTool/NavigationApi/CJsonOpt.cpp
@ -1,4 +1,4 @@
-#include "gui/GraphTool/NavigationApi/CJsonOpt.h"
+#include "gui/GraphTool/NavigationApi/CJsonOpt.h"
 #include "public/pub_utility_api/FileUtil.h"
 #include "public/pub_logger_api/logger.h"
 #include <QDir>
--- a/product/src/gui/GraphTool/NavigationTool/CLineEditWithBt.cpp
+++ b/product/src/gui/GraphTool/NavigationTool/CLineEditWithBt.cpp
@ -1,4 +1,4 @@
-#include "CLineEditWithBt.h"
+#include "CLineEditWithBt.h"
 #include <QCoreApplication>
 #include <QEvent>
 #include <QHBoxLayout>
--- a/product/src/gui/GraphTool/NavigationTool/CLineEditWithBt.h
+++ b/product/src/gui/GraphTool/NavigationTool/CLineEditWithBt.h
@ -1,4 +1,4 @@
-#ifndef CLINEEDITWITHBT_H
+#ifndef CLINEEDITWITHBT_H
 #define CLINEEDITWITHBT_H

 #include <QWidget>
--- a/product/src/gui/GraphTool/NavigationTool/CNavigationDialog.cpp
+++ b/product/src/gui/GraphTool/NavigationTool/CNavigationDialog.cpp
@ -1,4 +1,4 @@
-#include "CNavigationDialog.h"
+#include "CNavigationDialog.h"
 #include "ui_CNavigationDialog.h"
 #include "CTreeItemDelegate.h"
 #include "public/pub_utility_api/FileUtil.h"
--- a/product/src/gui/GraphTool/NavigationTool/CNavigationDialog.h
+++ b/product/src/gui/GraphTool/NavigationTool/CNavigationDialog.h
@ -1,4 +1,4 @@
-#ifndef CNAVIGATIONDIALOG_H
+#ifndef CNAVIGATIONDIALOG_H
 #define CNAVIGATIONDIALOG_H

 #include "gui/GraphTool/NavigationApi/CJsonOpt.h"
--- a/product/src/gui/GraphTool/NavigationTool/CTreeItemDelegate.cpp
+++ b/product/src/gui/GraphTool/NavigationTool/CTreeItemDelegate.cpp
@ -1,4 +1,4 @@
-#include "CTreeItemDelegate.h"
+#include "CTreeItemDelegate.h"
 #include "CLineEditWithBt.h"
 #include "gui/GraphTool/NavigationApi/CJsonOpt.h"
 #include <QComboBox>
--- a/product/src/gui/GraphTool/NavigationTool/CTreeItemDelegate.h
+++ b/product/src/gui/GraphTool/NavigationTool/CTreeItemDelegate.h
@ -1,4 +1,4 @@
-#ifndef CTREEITEMDELEGATE_H
+#ifndef CTREEITEMDELEGATE_H
 #define CTREEITEMDELEGATE_H

 #include <QStyledItemDelegate>
--- a/product/src/gui/GraphTool/NavigationTool/CTreeWidget.cpp
+++ b/product/src/gui/GraphTool/NavigationTool/CTreeWidget.cpp
@ -1,4 +1,4 @@
-#include "CTreeWidget.h"
+#include "CTreeWidget.h"
 #include <QMouseEvent>

 CTreeWidget::CTreeWidget(QWidget *parent)
--- a/product/src/gui/GraphTool/NavigationTool/CTreeWidget.h
+++ b/product/src/gui/GraphTool/NavigationTool/CTreeWidget.h
@ -1,4 +1,4 @@
-#ifndef CTREEWIDGET_H
+#ifndef CTREEWIDGET_H
 #define CTREEWIDGET_H

 #include <QTreeWidget>
--- a/product/src/gui/GraphTool/NavigationTool/main.cpp
+++ b/product/src/gui/GraphTool/NavigationTool/main.cpp
@ -1,4 +1,4 @@
-
+
 #include <QApplication>
 #include "common/QtAppGlobalSet.h"
 #include "CNavigationDialog.h"
--- a/product/src/gui/GraphTool/fileSync/CConfirmDialog.cpp
+++ b/product/src/gui/GraphTool/fileSync/CConfirmDialog.cpp
@ -1,4 +1,4 @@
-#include "CConfirmDialog.h"
+#include "CConfirmDialog.h"
 #include "ui_CConfirmDialog.h"

 CConfirmDialog::CConfirmDialog(QWidget *parent) :
--- a/product/src/gui/GraphTool/fileSync/CConfirmDialog.h
+++ b/product/src/gui/GraphTool/fileSync/CConfirmDialog.h
@ -1,4 +1,4 @@
-#ifndef CCONFIRMDIALOG_H
+#ifndef CCONFIRMDIALOG_H
 #define CCONFIRMDIALOG_H

 #include <QDialog>
--- a/product/src/gui/GraphTool/fileSync/CFileSyncDialog.cpp
+++ b/product/src/gui/GraphTool/fileSync/CFileSyncDialog.cpp
@ -1,4 +1,4 @@
-#include "CFileSyncDialog.h"
+#include "CFileSyncDialog.h"
 #include "ui_CFileSyncDialog.h"
 #include "CConfirmDialog.h"
 #include "../include/public/pub_utility_api/I18N.h"
--- a/product/src/gui/GraphTool/fileSync/CFileSyncDialog.h
+++ b/product/src/gui/GraphTool/fileSync/CFileSyncDialog.h
@ -1,4 +1,4 @@
-#ifndef CFILESYNCDIALOG_H
+#ifndef CFILESYNCDIALOG_H
 #define CFILESYNCDIALOG_H

 #include "../../include/sys/sys_svn_file_sync_api/CSysFileSyncApi.h"
--- a/product/src/gui/GraphTool/fileSync/main.cpp
+++ b/product/src/gui/GraphTool/fileSync/main.cpp
@ -1,4 +1,4 @@
-
+
 #include <QApplication>
 #include "common/QtAppGlobalSet.h"
 #include "CFileSyncDialog.h"
--- a/product/src/gui/plugin/plugin.pro
+++ b/product/src/gui/plugin/plugin.pro
@ -54,6 +54,18 @@ SUBDIRS+= \
        ChanStatusWidget \
        SerialDevStatusWidget \
        WebBrowserWidget \
-        BusbarTemperatureWidget
+        BusbarTemperatureWidget \
+        ChanParaWidget \
+        CNTPTimeWidget \
+        SecondReportWidget \
+        SysParamWidget  \
+        TrendCurves_pad \
+        AlarmWidget_pad \
+        EventWidget_pad \
+        ChanRealStatusWidget\
+        SecondNavigationWidget\
+        SecondButtonGroupWidget\
+        BatchOperation\
+        StrategyControlWidget

 SequenceManageWidget.depends = SequenceWidget
--- a/product/src/gui/product_en.ts
+++ b/product/src/gui/product_en.ts