From 1b1c80db4b66d287743fff66c49ec97d2e9b384a Mon Sep 17 00:00:00 2001 From: feiyangqingyun Date: Mon, 16 May 2022 12:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/0gitee/bigscreen/index.html | 8 +++++ docs/0gitee/iotsystem/index.html | 8 +++++ docs/0gitee/video_system/index.html | 8 +++++ docs/0github/bigscreen/index.html | 8 +++++ docs/0github/iotsystem/index.html | 8 +++++ docs/0github/video_system/index.html | 8 +++++ docs/bigscreen/index.html | 2 +- docs/iotsystem/index.html | 2 +- docs/video_system/index.html | 2 +- third/qcustomplotdemo/frmcustom/frmcustom.pri | 5 ++- third/qcustomplotdemo/frmcustom/frmmain.cpp | 5 ++- .../frmcustom/frmmultiaxes.cpp | 1 + .../frmcustom/frmmultiplot.cpp | 18 +++++++++++ .../qcustomplotdemo/frmcustom/frmmultiplot.h | 26 +++++++++++++++ .../qcustomplotdemo/frmcustom/frmmultiplot.ui | 32 +++++++++++++++++++ 15 files changed, 136 insertions(+), 5 deletions(-) create mode 100644 docs/0gitee/bigscreen/index.html create mode 100644 docs/0gitee/iotsystem/index.html create mode 100644 docs/0gitee/video_system/index.html create mode 100644 docs/0github/bigscreen/index.html create mode 100644 docs/0github/iotsystem/index.html create mode 100644 docs/0github/video_system/index.html create mode 100644 third/qcustomplotdemo/frmcustom/frmmultiplot.cpp create mode 100644 third/qcustomplotdemo/frmcustom/frmmultiplot.h create mode 100644 third/qcustomplotdemo/frmcustom/frmmultiplot.ui diff --git a/docs/0gitee/bigscreen/index.html b/docs/0gitee/bigscreen/index.html new file mode 100644 index 0000000..f1ce071 --- /dev/null +++ b/docs/0gitee/bigscreen/index.html @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/docs/0gitee/iotsystem/index.html b/docs/0gitee/iotsystem/index.html new file mode 100644 index 0000000..78178c8 --- /dev/null +++ b/docs/0gitee/iotsystem/index.html @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/docs/0gitee/video_system/index.html b/docs/0gitee/video_system/index.html new file mode 100644 index 0000000..6f82a3b --- /dev/null +++ b/docs/0gitee/video_system/index.html @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/docs/0github/bigscreen/index.html b/docs/0github/bigscreen/index.html new file mode 100644 index 0000000..83f6cc3 --- /dev/null +++ b/docs/0github/bigscreen/index.html @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/docs/0github/iotsystem/index.html b/docs/0github/iotsystem/index.html new file mode 100644 index 0000000..f2a2519 --- /dev/null +++ b/docs/0github/iotsystem/index.html @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/docs/0github/video_system/index.html b/docs/0github/video_system/index.html new file mode 100644 index 0000000..1431684 --- /dev/null +++ b/docs/0github/video_system/index.html @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/docs/bigscreen/index.html b/docs/bigscreen/index.html index 959c8b7..f1ce071 100644 --- a/docs/bigscreen/index.html +++ b/docs/bigscreen/index.html @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/docs/iotsystem/index.html b/docs/iotsystem/index.html index 464cc3d..78178c8 100644 --- a/docs/iotsystem/index.html +++ b/docs/iotsystem/index.html @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/docs/video_system/index.html b/docs/video_system/index.html index 4246f6a..6f82a3b 100644 --- a/docs/video_system/index.html +++ b/docs/video_system/index.html @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/third/qcustomplotdemo/frmcustom/frmcustom.pri b/third/qcustomplotdemo/frmcustom/frmcustom.pri index c67d3e7..ace4320 100644 --- a/third/qcustomplotdemo/frmcustom/frmcustom.pri +++ b/third/qcustomplotdemo/frmcustom/frmcustom.pri @@ -1,13 +1,16 @@ FORMS += \ $$PWD/frmmain.ui \ - $$PWD/frmmultiaxes.ui + $$PWD/frmmultiaxes.ui \ + $$PWD/frmmultiplot.ui HEADERS += \ $$PWD/frmmain.h \ $$PWD/frmmultiaxes.h \ + $$PWD/frmmultiplot.h \ $$PWD/iconhelper.h SOURCES += \ $$PWD/frmmain.cpp \ $$PWD/frmmultiaxes.cpp \ + $$PWD/frmmultiplot.cpp \ $$PWD/iconhelper.cpp diff --git a/third/qcustomplotdemo/frmcustom/frmmain.cpp b/third/qcustomplotdemo/frmcustom/frmmain.cpp index 3ca0fef..6863470 100644 --- a/third/qcustomplotdemo/frmcustom/frmmain.cpp +++ b/third/qcustomplotdemo/frmcustom/frmmain.cpp @@ -31,6 +31,7 @@ #include "frminteraction.h" #include "frmscrollbar.h" #include "frmmultiaxes.h" +#include "frmmultiplot.h" frmMain::frmMain(QWidget *parent) : QWidget(parent), ui(new Ui::frmMain) { @@ -87,6 +88,7 @@ void frmMain::initWidget() ui->stackedWidget->addWidget(new frmInterAction); ui->stackedWidget->addWidget(new frmScrollBar); ui->stackedWidget->addWidget(new frmMultiAxes); + ui->stackedWidget->addWidget(new frmMultiPlot); } void frmMain::initNav() @@ -97,7 +99,8 @@ void frmMain::initNav() << "曲线条样式" << "日期数据图" << "纹理画刷图" << "双坐标曲线" << "对数曲线图" << "动态正弦图" << "环形曲线图" << "垂直柱状图" << "箱形盒须图" << "静态指示线" << "动态指示线" << "曲线样式图" << "高级坐标轴" << "颜色热力图" << "金融曲线图" - << "南丁格尔图" << "坐标轴指示" << "相互作用图" << "滚动条曲线" << "多坐标轴图"; + << "南丁格尔图" << "坐标轴指示" << "相互作用图" << "滚动条曲线" << "多坐标轴图" + << "多轴多曲线"; //自动生成按钮 for (int i = 0; i < names.count(); i++) { diff --git a/third/qcustomplotdemo/frmcustom/frmmultiaxes.cpp b/third/qcustomplotdemo/frmcustom/frmmultiaxes.cpp index 7a014d5..4ebd0b1 100644 --- a/third/qcustomplotdemo/frmcustom/frmmultiaxes.cpp +++ b/third/qcustomplotdemo/frmcustom/frmmultiaxes.cpp @@ -80,6 +80,7 @@ void frmMultiAxes::initPlot(QCustomPlot *customPlot, const QCPAxis::AxisType &ty connect(customPlot, SIGNAL(selectionChangedByUser()), this, SLOT(selectionChangedByUser())); //connect(customPlot->yAxis2, SIGNAL(rangeChanged(QCPRange)), customPlot->yAxis, SLOT(setRange(QCPRange))); + //左侧右侧坐标轴设置可见状态 if (type == QCPAxis::atLeft) { customPlot->yAxis->setVisible(true); customPlot->yAxis2->setVisible(false); diff --git a/third/qcustomplotdemo/frmcustom/frmmultiplot.cpp b/third/qcustomplotdemo/frmcustom/frmmultiplot.cpp new file mode 100644 index 0000000..c4b28d1 --- /dev/null +++ b/third/qcustomplotdemo/frmcustom/frmmultiplot.cpp @@ -0,0 +1,18 @@ +#include "frmmultiplot.h" +#include "ui_frmmultiplot.h" + +frmMultiPlot::frmMultiPlot(QWidget *parent) : QWidget(parent), ui(new Ui::frmMultiPlot) +{ + ui->setupUi(this); + this->initForm(); +} + +frmMultiPlot::~frmMultiPlot() +{ + delete ui; +} + +void frmMultiPlot::initForm() +{ + +} diff --git a/third/qcustomplotdemo/frmcustom/frmmultiplot.h b/third/qcustomplotdemo/frmcustom/frmmultiplot.h new file mode 100644 index 0000000..c17146c --- /dev/null +++ b/third/qcustomplotdemo/frmcustom/frmmultiplot.h @@ -0,0 +1,26 @@ +#ifndef FRMMULTIPLOT_H +#define FRMMULTIPLOT_H + +#include + +namespace Ui { +class frmMultiPlot; +} + +class frmMultiPlot : public QWidget +{ + Q_OBJECT + +public: + explicit frmMultiPlot(QWidget *parent = 0); + ~frmMultiPlot(); + +private: + Ui::frmMultiPlot *ui; + +private slots: + //初始化界面数据 + void initForm(); +}; + +#endif // FRMMULTIPLOT_H diff --git a/third/qcustomplotdemo/frmcustom/frmmultiplot.ui b/third/qcustomplotdemo/frmcustom/frmmultiplot.ui new file mode 100644 index 0000000..69b0b48 --- /dev/null +++ b/third/qcustomplotdemo/frmcustom/frmmultiplot.ui @@ -0,0 +1,32 @@ + + + frmMultiPlot + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + + + + + QCustomPlot + QWidget +
qcustomplot.h
+ 1 + + + + +