Merge branch 'master' of https://gitee.com/x-tools-author/x-tools

x-tools-author · Oct 12, 2024 · 3ba2d99 · 3ba2d99
2 parents d595ca6 + 8706b24
commit 3ba2d99
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ Private
 private
 CMakePresets.json
 CMakeUserPresets.json
+compile_commands.json
diff --git a/Source/IO/UI/DataVisualization/2D/ChartsUi.cpp b/Source/IO/UI/DataVisualization/2D/ChartsUi.cpp
@@ -23,11 +23,11 @@ ChartsUi::ChartsUi(QWidget *parent)
     , ui(new Ui::ChartsUi)
 {
     ui->setupUi(this);
-    for (int i = 0; i < 8; i++) {
-        QCheckBox *checkBox = new QCheckBox(this);
-        checkBox->setText(tr("Channel") + " " + QString::number(i + 1));
-        ui->verticalLayoutControl->addWidget(checkBox);
-    }
+    // for (int i = 0; i < 8; i++) {
+    //     QCheckBox *checkBox = new QCheckBox(this);
+    //     checkBox->setText(tr("Channel") + " " + QString::number(i + 1));
+    //     ui->verticalLayoutControl->addWidget(checkBox);
+    // }
 }
 
 ChartsUi::~ChartsUi()

diff --git a/Source/IOPage/IOPage.cpp b/Source/IOPage/IOPage.cpp
@@ -12,6 +12,7 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QWidgetAction>
+#include <QToolButton>
 
 #include "IO/IO/Communication/Communication.h"
 #include "IO/IO/IOFactory.h"

diff --git a/Source/IOPage/IOPage.h b/Source/IOPage/IOPage.h
@@ -13,7 +13,6 @@
 #include <QSettings>
 #include <QTabWidget>
 #include <QTimer>
-#include <QToolButton>
 #include <QVariantMap>
 #include <QWidget>