diff --git a/global.h b/global.h index e1b8e02..51a0dbc 100644 --- a/global.h +++ b/global.h @@ -46,6 +46,8 @@ class ASyncReadData :public QSSASyncProcess{ public: ASyncReadData(QWidget *parent) :QSSASyncProcess(parent){ + mRuning = true; + } ~ASyncReadData(){ @@ -79,14 +81,12 @@ public: mPause = false; } void Run(void *v) override{ + qDebug()<<"start"<mForms[ui->lineEdit_2->text()] = p1; - - } diff --git a/mainwindow.h b/mainwindow.h index 4114eab..b6cac59 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -20,7 +20,6 @@ QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; } QT_END_NAMESPACE -using namespace QtCharts; class MainWindow : public QMainWindow { diff --git a/sub.ui b/sub.ui index a0e3550..44128a0 100644 --- a/sub.ui +++ b/sub.ui @@ -6,8 +6,8 @@ 0 0 - 602 - 381 + 1300 + 803 @@ -131,7 +131,7 @@ - + @@ -144,9 +144,9 @@ - QtCharts::QChartView + QChartView QGraphicsView -
QtCharts/QChartView
+
QChartView
diff --git a/subform.cpp b/subform.cpp index 6472732..734f372 100644 --- a/subform.cpp +++ b/subform.cpp @@ -24,7 +24,7 @@ SubForm::SubForm(QString addr,int baurate,int device_addr,int rate) QString *com = new QString(addr); qDebug()<<*com; mModel = new QStandardItemModel(this); - mModel->setHorizontalHeaderLabels(QStringList() << "Ĵַ" << "ֵ"<<"ȡʱ"<<""); +// mModel->setHorizontalHeaderLabels(QStringList() << "Ĵַ" << "ֵ"<<"ȡʱ"<<""); ui->tableView->setModel(mModel); ui->tableView->setSelectionMode(QAbstractItemView::ContiguousSelection); ui->tableView->setSelectionBehavior(QAbstractItemView::SelectRows); diff --git a/subform.h b/subform.h index c99f7d6..12335f5 100644 --- a/subform.h +++ b/subform.h @@ -19,7 +19,6 @@ QT_BEGIN_NAMESPACE namespace Ui { class Form; } QT_END_NAMESPACE -using namespace QtCharts; class SubForm :QWidget diff --git a/untitled.pro.user b/untitled.pro.user index efb2ed9..af93cfa 100644 --- a/untitled.pro.user +++ b/untitled.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 0 + 0 ProjectExplorer.Project.EditorSettings @@ -28,7 +28,7 @@ QmlJSGlobal - 2 + 2 GBK false 4 @@ -54,6 +54,7 @@ *.md, *.MD, Makefile false true + true @@ -75,6 +76,7 @@ true Builtin.DefaultTidyAndClazy 6 + false @@ -89,12 +91,176 @@ ProjectExplorer.Project.Target.0 Desktop - Desktop Qt 5.12.12 MSVC2017 64bit - Desktop Qt 5.12.12 MSVC2017 64bit + Desktop Qt 6.5.3 MSVC2019 64bit + Desktop Qt 6.5.3 MSVC2019 64bit + qt.qt6.653.win64_msvc2019_64_kit + 1 + 0 + 0 + + 0 + F:\project\build-untitled-Desktop_Qt_6_5_3_MSVC2019_64bit-Debug + F:/project/build-untitled-Desktop_Qt_6_5_3_MSVC2019_64bit-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + 构建 + 构建 + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + 清除 + 清除 + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + F:\project\build-untitled-Desktop_Qt_6_5_3_MSVC2019_64bit-Release + F:/project/build-untitled-Desktop_Qt_6_5_3_MSVC2019_64bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + 构建 + 构建 + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + 清除 + 清除 + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + F:\project\build-untitled-Desktop_Qt_6_5_3_MSVC2019_64bit-Profile + F:/project/build-untitled-Desktop_Qt_6_5_3_MSVC2019_64bit-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + 构建 + 构建 + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + 清除 + 清除 + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + 部署 + 部署 + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + true + + 2 + + false + Qt4ProjectManager.Qt4RunConfiguration:F:/project/modbus_rtu_test/untitled.pro + F:/project/modbus_rtu_test/untitled.pro + true + true + true + F:/project/build-untitled-Desktop_Qt_6_5_3_MSVC2019_64bit-Release + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop + Replacement for "Desktop Qt 5.12.12 MSVC2017 64bit" + Replacement for "Desktop Qt 5.12.12 MSVC2017 64bit" qt.qt5.51212.win64_msvc2017_64_kit - 0 - 0 - 0 + 1 + 0 + 0 0 F:\project\build-untitled-Desktop_Qt_5_12_12_MSVC2017_64bit-Debug @@ -110,9 +276,9 @@ true Qt4ProjectManager.MakeStep - 2 - Build - Build + 2 + 构建 + 构建 ProjectExplorer.BuildSteps.Build @@ -121,14 +287,15 @@ Qt4ProjectManager.MakeStep clean - 1 - Clean - Clean + 1 + 清除 + 清除 ProjectExplorer.BuildSteps.Clean 2 false + false Debug Qt4ProjectManager.Qt4BuildConfiguration @@ -148,9 +315,9 @@ true Qt4ProjectManager.MakeStep - 2 - Build - Build + 2 + 构建 + 构建 ProjectExplorer.BuildSteps.Build @@ -159,14 +326,15 @@ Qt4ProjectManager.MakeStep clean - 1 - Clean - Clean + 1 + 清除 + 清除 ProjectExplorer.BuildSteps.Clean 2 false + false Release Qt4ProjectManager.Qt4BuildConfiguration @@ -188,9 +356,9 @@ true Qt4ProjectManager.MakeStep - 2 - Build - Build + 2 + 构建 + 构建 ProjectExplorer.BuildSteps.Build @@ -199,14 +367,15 @@ Qt4ProjectManager.MakeStep clean - 1 - Clean - Clean + 1 + 清除 + 清除 ProjectExplorer.BuildSteps.Clean 2 false + false Profile Qt4ProjectManager.Qt4BuildConfiguration @@ -214,12 +383,12 @@ 0 0 - 3 + 3 - 0 - Deploy - Deploy + 0 + 部署 + 部署 ProjectExplorer.BuildSteps.Deploy 1 @@ -227,7 +396,7 @@ false ProjectExplorer.DefaultDeployConfiguration - 1 + 1 true true @@ -235,21 +404,184 @@ 2 + false Qt4ProjectManager.Qt4RunConfiguration:F:/project/modbus_rtu_test/untitled.pro F:/project/modbus_rtu_test/untitled.pro - false true true - false true - F:/project/build-untitled-Desktop_Qt_5_12_12_MSVC2017_64bit-Debug + F:/project/build-untitled-Desktop_Qt_5_12_12_MSVC2017_64bit-Release - 1 + 1 + + + + ProjectExplorer.Project.Target.2 + + Desktop + Desktop Qt 5.15.2 MSVC2019 64bit + Desktop Qt 5.15.2 MSVC2019 64bit + qt.qt5.5152.win64_msvc2019_64_kit + 0 + 0 + 0 + + 0 + F:\project\build-untitled-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug + F:/project/build-untitled-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + 构建 + 构建 + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + 清除 + 清除 + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + F:\project\build-untitled-Desktop_Qt_5_15_2_MSVC2019_64bit-Release + F:/project/build-untitled-Desktop_Qt_5_15_2_MSVC2019_64bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + 构建 + 构建 + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + 清除 + 清除 + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + F:\project\build-untitled-Desktop_Qt_5_15_2_MSVC2019_64bit-Profile + F:/project/build-untitled-Desktop_Qt_5_15_2_MSVC2019_64bit-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + 构建 + 构建 + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + 清除 + 清除 + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + 部署 + 部署 + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + true + + 2 + + false + Qt4ProjectManager.Qt4RunConfiguration:F:/project/modbus_rtu_test/untitled.pro + F:/project/modbus_rtu_test/untitled.pro + true + true + true + F:/project/build-untitled-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug + + 1 ProjectExplorer.Project.TargetCount - 1 + 3 ProjectExplorer.Project.Updater.FileVersion