From fb9e34eb03b9c226b973db12b9044a365b1a5e51 Mon Sep 17 00:00:00 2001 From: feiyangqingyun Date: Sat, 15 Jul 2023 08:58:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 21 +++++++------- control/lightbutton.zip | Bin 0 -> 7005 bytes video/videobox/videobox.cpp | 52 +++++++++++++++++++++++++++++++--- video/videobox/videobox.h | 10 ++++++- video/videopanel/videobox.cpp | 52 +++++++++++++++++++++++++++++++--- video/videopanel/videobox.h | 10 ++++++- 6 files changed, 125 insertions(+), 20 deletions(-) create mode 100644 control/lightbutton.zip diff --git a/README.md b/README.md index 0dc2939..82320fb 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,16 @@ ## 0 前言说明 -1. **项目作品：[https://blog.csdn.net/feiyangqingyun/article/details/97565652](https://blog.csdn.net/feiyangqingyun/article/details/97565652)** -2. **网店地址：https://shop244026315.taobao.com/** -3. **联系方式：QQ（517216493）微信（feiyangqingyun）推荐加微信。** -4. **公 众 号：Qt教程（民间） Qt软件（官方）** -5. **版本支持：所有项目已经全部支持Qt4/5/6所有版本以及后续版本。** -6. 监控作品体验：[https://pan.baidu.com/s/1d7TH_GEYl5nOecuNlWJJ7g](https://pan.baidu.com/s/1d7TH_GEYl5nOecuNlWJJ7g) 提取码：01jf -7. 其他作品体验：[https://pan.baidu.com/s/1ZxG-oyUKe286LPMPxOrO2A](https://pan.baidu.com/s/1ZxG-oyUKe286LPMPxOrO2A) 提取码：o05q -8. 监控系统在线文档：[https://feiyangqingyun.gitee.io/QWidgetDemo/video_system/](https://feiyangqingyun.gitee.io/QWidgetDemo/video_system/) -9. 大屏系统在线文档：[https://feiyangqingyun.gitee.io/QWidgetDemo/bigscreen/](https://feiyangqingyun.gitee.io/QWidgetDemo/bigscreen/) -10. 物联网系统在线文档：[https://feiyangqingyun.gitee.io/QWidgetDemo/iotsystem/](https://feiyangqingyun.gitee.io/QWidgetDemo/iotsystem/) +1. **项目作品：[https://qtchina.blog.csdn.net/article/details/97565652](https://qtchina.blog.csdn.net/article/details/97565652)** +2. **视频主页: [https://space.bilibili.com/687803542](https://space.bilibili.com/687803542)** +3. **网店地址：[https://shop244026315.taobao.com](https://shop244026315.taobao.com)** +4. **联系方式：QQ（517216493）微信（feiyangqingyun）推荐加微信。** +5. **公 众 号：Qt教程（民间） Qt软件（官方）** +6. **版本支持：所有项目已经全部支持Qt4/5/6所有版本以及后续版本。** +7. 监控作品体验：[https://pan.baidu.com/s/1d7TH_GEYl5nOecuNlWJJ7g](https://pan.baidu.com/s/1d7TH_GEYl5nOecuNlWJJ7g) 提取码：01jf +8. 其他作品体验：[https://pan.baidu.com/s/1ZxG-oyUKe286LPMPxOrO2A](https://pan.baidu.com/s/1ZxG-oyUKe286LPMPxOrO2A) 提取码：o05q +9. 监控系统在线文档：[https://feiyangqingyun.gitee.io/QWidgetDemo/video_system/](https://feiyangqingyun.gitee.io/QWidgetDemo/video_system/) +10. 大屏系统在线文档：[https://feiyangqingyun.gitee.io/QWidgetDemo/bigscreen/](https://feiyangqingyun.gitee.io/QWidgetDemo/bigscreen/) +11. 物联网系统在线文档：[https://feiyangqingyun.gitee.io/QWidgetDemo/iotsystem/](https://feiyangqingyun.gitee.io/QWidgetDemo/iotsystem/) ## 1 特别说明 1. 可以选择打开QWidgetDemo.pro一次性编译所有的，也可以到目录下打开pro编译。 diff --git a/control/lightbutton.zip b/control/lightbutton.zip new file mode 100644 index 0000000000000000000000000000000000000000..a9cc4590098c963d7bf43a81fd6593bd182a0134 GIT binary patch literal 7005 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 literal 0 HcmV?d00001 diff --git a/video/videobox/videobox.cpp b/video/videobox/videobox.cpp index 91c970b..472f3f4 100644 --- a/video/videobox/videobox.cpp +++ b/video/videobox/videobox.cpp @@ -12,11 +12,13 @@ VideoBox::VideoBox(QObject *parent) : QObject(parent) videoCount = 64; videoType = "1_16"; + enableOther = false; menuFlag = "画面"; actionFlag = "通道"; - //通过这里设置好数据下面只需要循环添加和判断就行 - //灵活性大大增强,只需要这里改动下就行 + //通过这里设置好数据下面只需要循环添加和判断就行(灵活性大大增强/只需要这里改动下就行) + types.insert(2, QStringList() << "1_2"); + types.insert(3, QStringList() << "1_3"); types.insert(4, QStringList() << "1_4" << "5_8" << "9_12" << "13_16" << "17_20" << "21_24" << "25_28" << "29_32" << "33_36"); types.insert(6, QStringList() << "1_6" << "7_12" << "13_18" << "19_24" << "25_30" << "31_36"); types.insert(8, QStringList() << "1_8" << "9_16" << "17_24" << "25_32" << "33_40" << "41_48" << "49_57" << "57_64"); @@ -49,6 +51,8 @@ void VideoBox::addMenu(QMenu *menu, int type) QString end = list.at(1); //对应菜单文本 + start = QString("%1").arg(start, 2, QChar('0')); + end = QString("%1").arg(end, 2, QChar('0')); QString text = QString("%1%2-%1%3").arg(actionFlag).arg(start).arg(end); if (flags.count() == 1) { text = name; @@ -79,6 +83,11 @@ void VideoBox::setWidgets(QWidgetList widgets) this->videoCount = widgets.count(); } +void VideoBox::setEnableOther(bool enableOther) +{ + this->enableOther = enableOther; +} + void VideoBox::setMenuFlag(const QString &menuFlag) { this->menuFlag = menuFlag; @@ -96,6 +105,11 @@ void VideoBox::setTypes(const QMap &types) void VideoBox::initMenu(QMenu *menu, const QList &enable) { + if (enableOther) { + addMenu(menu, 2); + addMenu(menu, 3); + } + //通过菜单是否可见设置每个菜单可见与否 if (enable.count() < 9) { return; @@ -135,6 +149,10 @@ void VideoBox::show_video(int type, int index) //根据不同的父菜单类型执行对应的函数 if (type == 1) { change_video_1(index); + } else if (type == 2) { + change_video_2(index); + } else if (type == 3) { + change_video_3(index); } else if (type == 4) { change_video_4(index); } else if (type == 6) { @@ -332,9 +350,35 @@ void VideoBox::change_video_1(int index) //首先隐藏所有通道 hide_video_all(); //添加通道到布局 - gridLayout->addWidget(widgets.at(index), 0, 0); + gridLayout->addWidget(widgets.at(0), 0, 0); //设置可见 - widgets.at(index)->setVisible(true); + widgets.at(0)->setVisible(true); +} + +void VideoBox::change_video_2(int index) +{ + //首先隐藏所有通道 + hide_video_all(); + //添加通道到布局 + gridLayout->addWidget(widgets.at(0), 0, 0); + gridLayout->addWidget(widgets.at(1), 0, 1); + //设置可见 + widgets.at(0)->setVisible(true); + widgets.at(1)->setVisible(true); +} + +void VideoBox::change_video_3(int index) +{ + //首先隐藏所有通道 + hide_video_all(); + //添加通道到布局 + gridLayout->addWidget(widgets.at(0), 0, 0, 1, 2); + gridLayout->addWidget(widgets.at(1), 1, 0); + gridLayout->addWidget(widgets.at(2), 1, 1); + //设置可见 + widgets.at(0)->setVisible(true); + widgets.at(1)->setVisible(true); + widgets.at(2)->setVisible(true); } void VideoBox::change_video_4(int index) diff --git a/video/videobox/videobox.h b/video/videobox/videobox.h index 6d6474c..ac65216 100644 --- a/video/videobox/videobox.h +++ b/video/videobox/videobox.h @@ -4,7 +4,7 @@ /** * 监控画面切换控件 作者:feiyangqingyun(QQ:517216493) 2021-11-08 * 1. 将所有通道切换处理全部集中到一个类。 - * 2. 通用整数倍数布局切换函数，可方便拓展到100、255通道等。 + * 2. 通用整数倍数布局切换函数，可方便拓展到100/255通道等。 * 3. 通用异形布局切换函数，可以参考进行自定义异形布局。 * 4. 通道布局切换发出信号通知。 * 5. 可控每种布局切换菜单是否启用。 @@ -43,6 +43,9 @@ private: //当前画面类型 QString videoType; + //启用其他通道画面(2画面/3画面) + bool enableOther; + //主菜单子菜单文字标识 QString menuFlag; QString actionFlag; @@ -59,6 +62,9 @@ public Q_SLOTS: //设置视频控件集合 void setWidgets(QWidgetList widgets); + //设置启用其他通道画面 + void setEnableOther(bool enableOther); + //设置主菜单子菜单文字标识 void setMenuFlag(const QString &menuFlag); void setActionFlag(const QString &actionFlag); @@ -88,6 +94,8 @@ public Q_SLOTS: //具体通道切换函数 void change_video_1(int index); + void change_video_2(int index); + void change_video_3(int index); void change_video_4(int index); void change_video_6(int index); void change_video_8(int index); diff --git a/video/videopanel/videobox.cpp b/video/videopanel/videobox.cpp index 91c970b..472f3f4 100644 --- a/video/videopanel/videobox.cpp +++ b/video/videopanel/videobox.cpp @@ -12,11 +12,13 @@ VideoBox::VideoBox(QObject *parent) : QObject(parent) videoCount = 64; videoType = "1_16"; + enableOther = false; menuFlag = "画面"; actionFlag = "通道"; - //通过这里设置好数据下面只需要循环添加和判断就行 - //灵活性大大增强,只需要这里改动下就行 + //通过这里设置好数据下面只需要循环添加和判断就行(灵活性大大增强/只需要这里改动下就行) + types.insert(2, QStringList() << "1_2"); + types.insert(3, QStringList() << "1_3"); types.insert(4, QStringList() << "1_4" << "5_8" << "9_12" << "13_16" << "17_20" << "21_24" << "25_28" << "29_32" << "33_36"); types.insert(6, QStringList() << "1_6" << "7_12" << "13_18" << "19_24" << "25_30" << "31_36"); types.insert(8, QStringList() << "1_8" << "9_16" << "17_24" << "25_32" << "33_40" << "41_48" << "49_57" << "57_64"); @@ -49,6 +51,8 @@ void VideoBox::addMenu(QMenu *menu, int type) QString end = list.at(1); //对应菜单文本 + start = QString("%1").arg(start, 2, QChar('0')); + end = QString("%1").arg(end, 2, QChar('0')); QString text = QString("%1%2-%1%3").arg(actionFlag).arg(start).arg(end); if (flags.count() == 1) { text = name; @@ -79,6 +83,11 @@ void VideoBox::setWidgets(QWidgetList widgets) this->videoCount = widgets.count(); } +void VideoBox::setEnableOther(bool enableOther) +{ + this->enableOther = enableOther; +} + void VideoBox::setMenuFlag(const QString &menuFlag) { this->menuFlag = menuFlag; @@ -96,6 +105,11 @@ void VideoBox::setTypes(const QMap &types) void VideoBox::initMenu(QMenu *menu, const QList &enable) { + if (enableOther) { + addMenu(menu, 2); + addMenu(menu, 3); + } + //通过菜单是否可见设置每个菜单可见与否 if (enable.count() < 9) { return; @@ -135,6 +149,10 @@ void VideoBox::show_video(int type, int index) //根据不同的父菜单类型执行对应的函数 if (type == 1) { change_video_1(index); + } else if (type == 2) { + change_video_2(index); + } else if (type == 3) { + change_video_3(index); } else if (type == 4) { change_video_4(index); } else if (type == 6) { @@ -332,9 +350,35 @@ void VideoBox::change_video_1(int index) //首先隐藏所有通道 hide_video_all(); //添加通道到布局 - gridLayout->addWidget(widgets.at(index), 0, 0); + gridLayout->addWidget(widgets.at(0), 0, 0); //设置可见 - widgets.at(index)->setVisible(true); + widgets.at(0)->setVisible(true); +} + +void VideoBox::change_video_2(int index) +{ + //首先隐藏所有通道 + hide_video_all(); + //添加通道到布局 + gridLayout->addWidget(widgets.at(0), 0, 0); + gridLayout->addWidget(widgets.at(1), 0, 1); + //设置可见 + widgets.at(0)->setVisible(true); + widgets.at(1)->setVisible(true); +} + +void VideoBox::change_video_3(int index) +{ + //首先隐藏所有通道 + hide_video_all(); + //添加通道到布局 + gridLayout->addWidget(widgets.at(0), 0, 0, 1, 2); + gridLayout->addWidget(widgets.at(1), 1, 0); + gridLayout->addWidget(widgets.at(2), 1, 1); + //设置可见 + widgets.at(0)->setVisible(true); + widgets.at(1)->setVisible(true); + widgets.at(2)->setVisible(true); } void VideoBox::change_video_4(int index) diff --git a/video/videopanel/videobox.h b/video/videopanel/videobox.h index 6d6474c..ac65216 100644 --- a/video/videopanel/videobox.h +++ b/video/videopanel/videobox.h @@ -4,7 +4,7 @@ /** * 监控画面切换控件 作者:feiyangqingyun(QQ:517216493) 2021-11-08 * 1. 将所有通道切换处理全部集中到一个类。 - * 2. 通用整数倍数布局切换函数，可方便拓展到100、255通道等。 + * 2. 通用整数倍数布局切换函数，可方便拓展到100/255通道等。 * 3. 通用异形布局切换函数，可以参考进行自定义异形布局。 * 4. 通道布局切换发出信号通知。 * 5. 可控每种布局切换菜单是否启用。 @@ -43,6 +43,9 @@ private: //当前画面类型 QString videoType; + //启用其他通道画面(2画面/3画面) + bool enableOther; + //主菜单子菜单文字标识 QString menuFlag; QString actionFlag; @@ -59,6 +62,9 @@ public Q_SLOTS: //设置视频控件集合 void setWidgets(QWidgetList widgets); + //设置启用其他通道画面 + void setEnableOther(bool enableOther); + //设置主菜单子菜单文字标识 void setMenuFlag(const QString &menuFlag); void setActionFlag(const QString &actionFlag); @@ -88,6 +94,8 @@ public Q_SLOTS: //具体通道切换函数 void change_video_1(int index); + void change_video_2(int index); + void change_video_3(int index); void change_video_4(int index); void change_video_6(int index); void change_video_8(int index);