更新文档

control/battery/battery.cpp

@@ -230,7 +230,7 @@ void Battery::setValue(double value)
     }
 
     this->value = value;
-    emit valueChanged(value);
+    Q_EMIT valueChanged(value);
     if (animation) {
         timer->stop();
         timer->start();

control/cpumemorylabel/cpumemorylabel.cpp

@@ -214,8 +214,8 @@ void CpuMemoryLabel::setData()
         this->setText(msg);
     }
 
-    emit textChanged(msg);
-    emit valueChanged(cpuPercent, memoryPercent, memoryAll, memoryUse, memoryFree);
+    Q_EMIT textChanged(msg);
+    Q_EMIT valueChanged(cpuPercent, memoryPercent, memoryAll, memoryUse, memoryFree);
 }
 
 QSize CpuMemoryLabel::sizeHint() const

control/devicebutton/devicebutton.cpp

@@ -94,7 +94,7 @@ bool DeviceButton::eventFilter(QObject *watched, QEvent *event)
         if (mouseEvent->button() == Qt::LeftButton) {
             lastPoint = mouseEvent->pos();
             isPressed = true;
-            emit clicked();
+            Q_EMIT clicked();
             return true;
         }
     } else if (event->type() == QEvent::MouseMove) {
@@ -108,7 +108,7 @@ bool DeviceButton::eventFilter(QObject *watched, QEvent *event)
     } else if (event->type() == QEvent::MouseButtonRelease) {
         isPressed = false;
     } else if (event->type() == QEvent::MouseButtonDblClick) {
-        emit doubleClicked();
+        Q_EMIT doubleClicked();
     }
 
     return QWidget::eventFilter(watched, event);

control/devicesizetable/devicesizetable.cpp

@@ -72,17 +72,17 @@ void DeviceSizeTable::readData()
         } else if (result.startsWith("/dev/mmcblk1p")) {
             checkSize(result, "SD卡");
             QStringList list = result.split(" ");
-            emit sdcardReceive(list.at(0));
+            Q_EMIT sdcardReceive(list.at(0));
         } else if (result.startsWith("/dev/sd")) {
             checkSize(result, "U盘");
             QStringList list = result.split(" ");
-            emit udiskReceive(list.at(0));
+            Q_EMIT udiskReceive(list.at(0));
         }
 #else
         if (result.startsWith("/dev/sd")) {
             checkSize(result, "");
             QStringList list = result.split(" ");
-            emit udiskReceive(list.at(0));
+            Q_EMIT udiskReceive(list.at(0));
         }
 #endif
     }

control/imageswitch/imageswitch.cpp

@@ -18,7 +18,7 @@ void ImageSwitch::mousePressEvent(QMouseEvent *)
 {
     imgFile = isChecked ? imgOffFile : imgOnFile;
     isChecked = !isChecked;
-    emit checkedChanged(isChecked);
+    Q_EMIT checkedChanged(isChecked);
     this->update();
 }
 

control/lightbutton/lightbutton.cpp

@@ -52,7 +52,7 @@ bool LightButton::eventFilter(QObject *watched, QEvent *event)
         }
     } else if (mouseEvent->type() == QEvent::MouseButtonRelease && pressed) {
         pressed = false;
-        emit clicked();
+        Q_EMIT clicked();
     }
 
     return QWidget::eventFilter(watched, event);

control/savelog/savelog.cpp

@@ -196,7 +196,7 @@ void SaveLog::save(const QString &content)
 {
     //如果重定向输出到网络则通过网络发出去,否则输出到日志文件
     if (toNet) {
-        emit send(content);
+        Q_EMIT send(content);
     } else {
         //目录不存在则先新建目录
         QDir dir(path);

other/ntpclient/ntpclient.cpp

@@ -101,7 +101,7 @@ void NtpClient::readData()
 
     //有些时候返回的数据可能有误或者解析不正确,导致填充的时间不正确
     if (dateTime.isValid()) {
-        emit receiveTime(dateTime);
+        Q_EMIT receiveTime(dateTime);
     }
 }
 

video/videobox/videobox.cpp

@@ -17,20 +17,25 @@ VideoBox::VideoBox(QObject *parent) : QObject(parent)
     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");
-    types.insert(9, QStringList() << "1_9" << "9_17" << "18_26" << "27_35" << "36_42" << "43_50" << "51_59");
-    types.insert(13, QStringList() << "1_13" << "14_26" << "27_39" << "40_52" << "52_64");
-    types.insert(16, QStringList() << "1_16" << "17_32" << "33_48" << "49_64");
-    types.insert(25, QStringList() << "1_25");
-    types.insert(36, QStringList() << "1_36");
-    types.insert(64, QStringList() << "1_64");
+    //1_2表示通道1-通道2/前面是通道开始的索引/后面是通道结束的索引
+    //1_2x4表示通道1开始2x4行列布局画面(相当于通道1-8按照2行4列排列)
+    //9_2x4表示通道9开始2x4行列布局画面(相当于通道9-16按照2行4列排列)
+    types.insert("2", QStringList() << "1_2");
+    types.insert("3", QStringList() << "1_3");
+    //按照行列数生成的可以自行添加其他布局
+    types.insert("x", QStringList() << "1_4x1" << "1_2x4" << "9_2x4" << "1_4x2" << "9_4x2" << "1_2x5" << "10_2x5" << "1_5x2" << "1_6x2" << "1_7x2");
+    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");
+    types.insert("9", QStringList() << "1_9" << "9_17" << "18_26" << "27_35" << "36_42" << "43_50" << "51_59");
+    types.insert("13", QStringList() << "1_13" << "14_26" << "27_39" << "40_52" << "52_64");
+    types.insert("16", QStringList() << "1_16" << "17_32" << "33_48" << "49_64");
+    types.insert("25", QStringList() << "1_25");
+    types.insert("36", QStringList() << "1_36");
+    types.insert("64", QStringList() << "1_64");
 }
 
-void VideoBox::addMenu(QMenu *menu, int type)
+void VideoBox::addMenu(QMenu *menu, const QString &type)
 {
     //父菜单文字
     QString name = QString("切换到%1%2").arg(type).arg(menuFlag);
@@ -46,14 +51,23 @@ void VideoBox::addMenu(QMenu *menu, int type)
     }
 
     foreach (QString flag, flags) {
+        QString text;
         QStringList list = flag.split("_");
         QString start = list.at(0);
         QString end = list.at(1);
+        start = QString("%1").arg(start, 2, QChar('0'));
 
         //对应菜单文本
-        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 (type == "x") {
+            list = end.split("x");
+            text = QString("%1 x %2").arg(list.at(0)).arg(list.at(1));
+            text = QString("%1%2 (%3)").arg(actionFlag).arg(start).arg(text);
+        } else {
+            end = QString("%1").arg(end, 2, QChar('0'));
+            text = QString("%1%2-%1%3").arg(actionFlag).arg(start).arg(end);
+        }
+
+        //只有一个节点则子菜单文字=主菜单文字
         if (flags.count() == 1) {
             text = name;
         }
@@ -67,14 +81,19 @@ void VideoBox::addMenu(QMenu *menu, int type)
     }
 }
 
+QString VideoBox::getVideoType() const
+{
+    return this->videoType;
+}
+
 void VideoBox::setVideoType(const QString &videoType)
 {
     this->videoType = videoType;
 }
 
-void VideoBox::setLayout(QGridLayout *gridLayout)
+QWidgetList VideoBox::getWidgets() const
 {
-    this->gridLayout = gridLayout;
+    return this->widgets;
 }
 
 void VideoBox::setWidgets(QWidgetList widgets)
@@ -83,6 +102,11 @@ void VideoBox::setWidgets(QWidgetList widgets)
     this->videoCount = widgets.count();
 }
 
+void VideoBox::setLayout(QGridLayout *gridLayout)
+{
+    this->gridLayout = gridLayout;
+}
+
 void VideoBox::setEnableOther(bool enableOther)
 {
     this->enableOther = enableOther;
@@ -98,7 +122,7 @@ void VideoBox::setActionFlag(const QString &actionFlag)
     this->actionFlag = actionFlag;
 }
 
-void VideoBox::setTypes(const QMap<int, QStringList> &types)
+void VideoBox::setTypes(const QMap<QString, QStringList> &types)
 {
     this->types = types;
 }
@@ -106,8 +130,9 @@ void VideoBox::setTypes(const QMap<int, QStringList> &types)
 void VideoBox::initMenu(QMenu *menu, const QList<bool> &enable)
 {
     if (enableOther) {
-        addMenu(menu, 2);
-        addMenu(menu, 3);
+        addMenu(menu, "2");
+        addMenu(menu, "3");
+        addMenu(menu, "x");
     }
 
     //通过菜单是否可见设置每个菜单可见与否
@@ -116,38 +141,45 @@ void VideoBox::initMenu(QMenu *menu, const QList<bool> &enable)
     }
 
     if (enable.at(0)) {
-        addMenu(menu, 4);
+        addMenu(menu, "4");
     }
     if (enable.at(1)) {
-        addMenu(menu, 6);
+        addMenu(menu, "6");
     }
     if (enable.at(2)) {
-        addMenu(menu, 8);
+        addMenu(menu, "8");
     }
     if (enable.at(3)) {
-        addMenu(menu, 9);
+        addMenu(menu, "9");
     }
     if (enable.at(4)) {
-        addMenu(menu, 13);
+        addMenu(menu, "13");
     }
     if (enable.at(5)) {
-        addMenu(menu, 16);
+        addMenu(menu, "16");
     }
     if (enable.at(6)) {
-        addMenu(menu, 25);
+        addMenu(menu, "25");
     }
     if (enable.at(7)) {
-        addMenu(menu, 36);
+        addMenu(menu, "36");
     }
     if (enable.at(8)) {
-        addMenu(menu, 64);
+        addMenu(menu, "64");
     }
 }
 
 void VideoBox::show_video(int type, int index)
 {
     //根据不同的父菜单类型执行对应的函数
-    if (type == 1) {
+    if (type == 0) {
+        //取出行列
+        QString text = videoType.split("_").last();
+        QStringList list = text.split("x");
+        int row = list.at(0).toInt();
+        int column = list.at(1).toInt();
+        change_video_normal(index, row, column);
+    } else if (type == 1) {
         change_video_1(index);
     } else if (type == 2) {
         change_video_2(index);
@@ -173,7 +205,7 @@ void VideoBox::show_video(int type, int index)
         change_video_64(index);
     }
 
-    emit changeVideo(type, videoType, false);
+    Q_EMIT changeVideo(type, videoType, false);
 }
 
 void VideoBox::show_video()
@@ -199,14 +231,14 @@ void VideoBox::show_video_all()
     if (videoType.startsWith("0_")) {
         int index = videoType.split("_").last().toInt() - 1;
         change_video_1(index);
-        emit changeVideo(type, videoType, true);
+        Q_EMIT changeVideo(type, videoType, true);
     } else {
         int index = videoType.split("_").first().toInt() - 1;
-        QMap<int, QStringList>::iterator iter = types.begin();
+        QMap<QString, QStringList>::iterator iter = types.begin();
         while (iter != types.end()) {
             QStringList flags = iter.value();
             if (flags.contains(videoType)) {
-                type = iter.key();
+                type = iter.key().toInt();
                 show_video(type, index);
                 break;
             }
@@ -223,31 +255,34 @@ void VideoBox::hide_video_all()
     }
 }
 
-void VideoBox::change_video_normal(int index, int flag)
+//行列数一致的比如 2*2 3*3 4*4 5*5 等可以直接套用通用的公式
+//按照这个函数还可以非常容易的拓展出 10*10 16*16=256 通道界面
+void VideoBox::change_video_normal(int index, int row, int column)
 {
+    int size = 0;
+    int rowCount = 0;
+    int columnCount = 0;
+
     //首先隐藏所有通道
     hide_video_all();
-    int size = 0;
-    int row = 0;
-    int column = 0;
 
-    //行列数一致的比如 2*2 3*4 4*4 5*5 等可以直接套用通用的公式
-    //按照这个函数还可以非常容易的拓展出 10*10 16*16=256 通道界面
+    //按照指定的行列数逐个添加
     for (int i = 0; i < videoCount; ++i) {
         if (i >= index) {
             //添加到对应布局并设置可见
-            gridLayout->addWidget(widgets.at(i), row, column);
+            gridLayout->addWidget(widgets.at(i), rowCount, columnCount);
             widgets.at(i)->setVisible(true);
 
             size++;
-            column++;
-            if (column == flag) {
-                row++;
-                column = 0;
+            columnCount++;
+            if (columnCount == column) {
+                rowCount++;
+                columnCount = 0;
             }
         }
 
-        if (size == (flag * flag)) {
+        //到了规定的数量则不用继续
+        if (size == (row * column)) {
             break;
         }
     }
@@ -270,6 +305,14 @@ void VideoBox::change_video_custom(int index, int type)
     }
 }
 
+void VideoBox::change_video_visible(int start, int end)
+{
+    //设置通道控件可见
+    for (int i = start; i <= end; ++i) {
+        widgets.at(i)->setVisible(true);
+    }
+}
+
 void VideoBox::change_video_6(const QList<int> &indexs)
 {
     //过滤防止索引越界
@@ -287,9 +330,7 @@ void VideoBox::change_video_6(const QList<int> &indexs)
     gridLayout->addWidget(widgets.at(indexs.at(4)), 2, 1, 1, 1);
     gridLayout->addWidget(widgets.at(indexs.at(5)), 2, 0, 1, 1);
     //设置通道控件可见
-    for (int i = indexs.first(); i <= indexs.last(); ++i) {
-        widgets.at(i)->setVisible(true);
-    }
+    change_video_visible(indexs.first(), indexs.last());
 }
 
 void VideoBox::change_video_8(const QList<int> &indexs)
@@ -311,9 +352,7 @@ void VideoBox::change_video_8(const QList<int> &indexs)
     gridLayout->addWidget(widgets.at(indexs.at(6)), 3, 1, 1, 1);
     gridLayout->addWidget(widgets.at(indexs.at(7)), 3, 0, 1, 1);
     //设置通道控件可见
-    for (int i = indexs.first(); i <= indexs.last(); ++i) {
-        widgets.at(i)->setVisible(true);
-    }
+    change_video_visible(indexs.first(), indexs.last());
 }
 
 void VideoBox::change_video_13(const QList<int> &indexs)
@@ -340,9 +379,7 @@ void VideoBox::change_video_13(const QList<int> &indexs)
     gridLayout->addWidget(widgets.at(indexs.at(11)), 3, 2, 1, 1);
     gridLayout->addWidget(widgets.at(indexs.at(12)), 3, 3, 1, 1);
     //设置通道控件可见
-    for (int i = indexs.first(); i <= indexs.last(); ++i) {
-        widgets.at(i)->setVisible(true);
-    }
+    change_video_visible(indexs.first(), indexs.last());
 }
 
 void VideoBox::change_video_1(int index)
@@ -351,7 +388,7 @@ void VideoBox::change_video_1(int index)
     hide_video_all();
     //添加通道到布局
     gridLayout->addWidget(widgets.at(index), 0, 0);
-    //设置可见
+    //设置通道控件可见
     widgets.at(index)->setVisible(true);
 }
 
@@ -360,11 +397,10 @@ 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);
+    gridLayout->addWidget(widgets.at(index), 0, 0);
+    gridLayout->addWidget(widgets.at(index + 1), 0, 1);
+    //设置通道控件可见
+    change_video_visible(index, index + 1);
 }
 
 void VideoBox::change_video_3(int index)
@@ -372,18 +408,16 @@ 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);
+    gridLayout->addWidget(widgets.at(index), 0, 0, 1, 2);
+    gridLayout->addWidget(widgets.at(index + 1), 1, 0);
+    gridLayout->addWidget(widgets.at(index + 2), 1, 1);
+    //设置通道控件可见
+    change_video_visible(index, index + 2);
 }
 
 void VideoBox::change_video_4(int index)
 {
-    change_video_normal(index, 2);
+    change_video_normal(index, 2, 2);
 }
 
 void VideoBox::change_video_6(int index)
@@ -398,7 +432,7 @@ void VideoBox::change_video_8(int index)
 
 void VideoBox::change_video_9(int index)
 {
-    change_video_normal(index, 3);
+    change_video_normal(index, 3, 3);
 }
 
 void VideoBox::change_video_13(int index)
@@ -408,20 +442,20 @@ void VideoBox::change_video_13(int index)
 
 void VideoBox::change_video_16(int index)
 {
-    change_video_normal(index, 4);
+    change_video_normal(index, 4, 4);
 }
 
 void VideoBox::change_video_25(int index)
 {
-    change_video_normal(index, 5);
+    change_video_normal(index, 5, 5);
 }
 
 void VideoBox::change_video_36(int index)
 {
-    change_video_normal(index, 6);
+    change_video_normal(index, 6, 6);
 }
 
 void VideoBox::change_video_64(int index)
 {
-    change_video_normal(index, 8);
+    change_video_normal(index, 8, 8);
 }

video/videobox/videobox.h

@@ -51,17 +51,20 @@ private:
     QString actionFlag;
 
     //布局方案标识集合
-    QMap<int, QStringList> types;
-    void addMenu(QMenu *menu, int type);
+    QMap<QString, QStringList> types;
+    void addMenu(QMenu *menu, const QString &type);
 
 public Q_SLOTS:
-    //设置当前画面类型
+    //获取和设置当前画面类型
+    QString getVideoType() const;
     void setVideoType(const QString &videoType);
-    //设置表格布局
-    void setLayout(QGridLayout *gridLayout);
-    //设置视频控件集合
+
+    //获取和设置视频控件集合
+    QWidgetList getWidgets() const;
     void setWidgets(QWidgetList widgets);
 
+    //设置表格布局
+    void setLayout(QGridLayout *gridLayout);
     //设置启用其他通道画面
     void setEnableOther(bool enableOther);
 
@@ -69,8 +72,8 @@ public Q_SLOTS:
     void setMenuFlag(const QString &menuFlag);
     void setActionFlag(const QString &actionFlag);
 
-    //设置子菜单类型集合
-    void setTypes(const QMap<int, QStringList> &types);
+    //设置菜单类型集合
+    void setTypes(const QMap<QString, QStringList> &types);
     //初始化菜单
     void initMenu(QMenu *menu, const QList<bool> &enable);
 
@@ -84,9 +87,12 @@ public Q_SLOTS:
     void hide_video_all();
 
     //常规及异形通道布局
-    void change_video_normal(int index, int flag);
+    void change_video_normal(int index, int row, int column);
     void change_video_custom(int index, int type);
 
+    //设置可见
+    void change_video_visible(int start, int end);
+
     //异形布局
     void change_video_6(const QList<int> &indexs);
     void change_video_8(const QList<int> &indexs);

video/videopanel/videobox.cpp

@@ -17,20 +17,25 @@ VideoBox::VideoBox(QObject *parent) : QObject(parent)
     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");
-    types.insert(9, QStringList() << "1_9" << "9_17" << "18_26" << "27_35" << "36_42" << "43_50" << "51_59");
-    types.insert(13, QStringList() << "1_13" << "14_26" << "27_39" << "40_52" << "52_64");
-    types.insert(16, QStringList() << "1_16" << "17_32" << "33_48" << "49_64");
-    types.insert(25, QStringList() << "1_25");
-    types.insert(36, QStringList() << "1_36");
-    types.insert(64, QStringList() << "1_64");
+    //1_2表示通道1-通道2/前面是通道开始的索引/后面是通道结束的索引
+    //1_2x4表示通道1开始2x4行列布局画面(相当于通道1-8按照2行4列排列)
+    //9_2x4表示通道9开始2x4行列布局画面(相当于通道9-16按照2行4列排列)
+    types.insert("2", QStringList() << "1_2");
+    types.insert("3", QStringList() << "1_3");
+    //按照行列数生成的可以自行添加其他布局
+    types.insert("x", QStringList() << "1_4x1" << "1_2x4" << "9_2x4" << "1_4x2" << "9_4x2" << "1_2x5" << "10_2x5" << "1_5x2" << "1_6x2" << "1_7x2");
+    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");
+    types.insert("9", QStringList() << "1_9" << "9_17" << "18_26" << "27_35" << "36_42" << "43_50" << "51_59");
+    types.insert("13", QStringList() << "1_13" << "14_26" << "27_39" << "40_52" << "52_64");
+    types.insert("16", QStringList() << "1_16" << "17_32" << "33_48" << "49_64");
+    types.insert("25", QStringList() << "1_25");
+    types.insert("36", QStringList() << "1_36");
+    types.insert("64", QStringList() << "1_64");
 }
 
-void VideoBox::addMenu(QMenu *menu, int type)
+void VideoBox::addMenu(QMenu *menu, const QString &type)
 {
     //父菜单文字
     QString name = QString("切换到%1%2").arg(type).arg(menuFlag);
@@ -46,14 +51,23 @@ void VideoBox::addMenu(QMenu *menu, int type)
     }
 
     foreach (QString flag, flags) {
+        QString text;
         QStringList list = flag.split("_");
         QString start = list.at(0);
         QString end = list.at(1);
+        start = QString("%1").arg(start, 2, QChar('0'));
 
         //对应菜单文本
-        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 (type == "x") {
+            list = end.split("x");
+            text = QString("%1 x %2").arg(list.at(0)).arg(list.at(1));
+            text = QString("%1%2 (%3)").arg(actionFlag).arg(start).arg(text);
+        } else {
+            end = QString("%1").arg(end, 2, QChar('0'));
+            text = QString("%1%2-%1%3").arg(actionFlag).arg(start).arg(end);
+        }
+
+        //只有一个节点则子菜单文字=主菜单文字
         if (flags.count() == 1) {
             text = name;
         }
@@ -67,14 +81,19 @@ void VideoBox::addMenu(QMenu *menu, int type)
     }
 }
 
+QString VideoBox::getVideoType() const
+{
+    return this->videoType;
+}
+
 void VideoBox::setVideoType(const QString &videoType)
 {
     this->videoType = videoType;
 }
 
-void VideoBox::setLayout(QGridLayout *gridLayout)
+QWidgetList VideoBox::getWidgets() const
 {
-    this->gridLayout = gridLayout;
+    return this->widgets;
 }
 
 void VideoBox::setWidgets(QWidgetList widgets)
@@ -83,6 +102,11 @@ void VideoBox::setWidgets(QWidgetList widgets)
     this->videoCount = widgets.count();
 }
 
+void VideoBox::setLayout(QGridLayout *gridLayout)
+{
+    this->gridLayout = gridLayout;
+}
+
 void VideoBox::setEnableOther(bool enableOther)
 {
     this->enableOther = enableOther;
@@ -98,7 +122,7 @@ void VideoBox::setActionFlag(const QString &actionFlag)
     this->actionFlag = actionFlag;
 }
 
-void VideoBox::setTypes(const QMap<int, QStringList> &types)
+void VideoBox::setTypes(const QMap<QString, QStringList> &types)
 {
     this->types = types;
 }
@@ -106,8 +130,9 @@ void VideoBox::setTypes(const QMap<int, QStringList> &types)
 void VideoBox::initMenu(QMenu *menu, const QList<bool> &enable)
 {
     if (enableOther) {
-        addMenu(menu, 2);
-        addMenu(menu, 3);
+        addMenu(menu, "2");
+        addMenu(menu, "3");
+        addMenu(menu, "x");
     }
 
     //通过菜单是否可见设置每个菜单可见与否
@@ -116,38 +141,45 @@ void VideoBox::initMenu(QMenu *menu, const QList<bool> &enable)
     }
 
     if (enable.at(0)) {
-        addMenu(menu, 4);
+        addMenu(menu, "4");
     }
     if (enable.at(1)) {
-        addMenu(menu, 6);
+        addMenu(menu, "6");
     }
     if (enable.at(2)) {
-        addMenu(menu, 8);
+        addMenu(menu, "8");
     }
     if (enable.at(3)) {
-        addMenu(menu, 9);
+        addMenu(menu, "9");
     }
     if (enable.at(4)) {
-        addMenu(menu, 13);
+        addMenu(menu, "13");
     }
     if (enable.at(5)) {
-        addMenu(menu, 16);
+        addMenu(menu, "16");
     }
     if (enable.at(6)) {
-        addMenu(menu, 25);
+        addMenu(menu, "25");
     }
     if (enable.at(7)) {
-        addMenu(menu, 36);
+        addMenu(menu, "36");
     }
     if (enable.at(8)) {
-        addMenu(menu, 64);
+        addMenu(menu, "64");
     }
 }
 
 void VideoBox::show_video(int type, int index)
 {
     //根据不同的父菜单类型执行对应的函数
-    if (type == 1) {
+    if (type == 0) {
+        //取出行列
+        QString text = videoType.split("_").last();
+        QStringList list = text.split("x");
+        int row = list.at(0).toInt();
+        int column = list.at(1).toInt();
+        change_video_normal(index, row, column);
+    } else if (type == 1) {
         change_video_1(index);
     } else if (type == 2) {
         change_video_2(index);
@@ -173,7 +205,7 @@ void VideoBox::show_video(int type, int index)
         change_video_64(index);
     }
 
-    emit changeVideo(type, videoType, false);
+    Q_EMIT changeVideo(type, videoType, false);
 }
 
 void VideoBox::show_video()
@@ -199,14 +231,14 @@ void VideoBox::show_video_all()
     if (videoType.startsWith("0_")) {
         int index = videoType.split("_").last().toInt() - 1;
         change_video_1(index);
-        emit changeVideo(type, videoType, true);
+        Q_EMIT changeVideo(type, videoType, true);
     } else {
         int index = videoType.split("_").first().toInt() - 1;
-        QMap<int, QStringList>::iterator iter = types.begin();
+        QMap<QString, QStringList>::iterator iter = types.begin();
         while (iter != types.end()) {
             QStringList flags = iter.value();
             if (flags.contains(videoType)) {
-                type = iter.key();
+                type = iter.key().toInt();
                 show_video(type, index);
                 break;
             }
@@ -223,31 +255,34 @@ void VideoBox::hide_video_all()
     }
 }
 
-void VideoBox::change_video_normal(int index, int flag)
+//行列数一致的比如 2*2 3*3 4*4 5*5 等可以直接套用通用的公式
+//按照这个函数还可以非常容易的拓展出 10*10 16*16=256 通道界面
+void VideoBox::change_video_normal(int index, int row, int column)
 {
+    int size = 0;
+    int rowCount = 0;
+    int columnCount = 0;
+
     //首先隐藏所有通道
     hide_video_all();
-    int size = 0;
-    int row = 0;
-    int column = 0;
 
-    //行列数一致的比如 2*2 3*4 4*4 5*5 等可以直接套用通用的公式
-    //按照这个函数还可以非常容易的拓展出 10*10 16*16=256 通道界面
+    //按照指定的行列数逐个添加
     for (int i = 0; i < videoCount; ++i) {
         if (i >= index) {
             //添加到对应布局并设置可见
-            gridLayout->addWidget(widgets.at(i), row, column);
+            gridLayout->addWidget(widgets.at(i), rowCount, columnCount);
             widgets.at(i)->setVisible(true);
 
             size++;
-            column++;
-            if (column == flag) {
-                row++;
-                column = 0;
+            columnCount++;
+            if (columnCount == column) {
+                rowCount++;
+                columnCount = 0;
             }
         }
 
-        if (size == (flag * flag)) {
+        //到了规定的数量则不用继续
+        if (size == (row * column)) {
             break;
         }
     }
@@ -270,6 +305,14 @@ void VideoBox::change_video_custom(int index, int type)
     }
 }
 
+void VideoBox::change_video_visible(int start, int end)
+{
+    //设置通道控件可见
+    for (int i = start; i <= end; ++i) {
+        widgets.at(i)->setVisible(true);
+    }
+}
+
 void VideoBox::change_video_6(const QList<int> &indexs)
 {
     //过滤防止索引越界
@@ -287,9 +330,7 @@ void VideoBox::change_video_6(const QList<int> &indexs)
     gridLayout->addWidget(widgets.at(indexs.at(4)), 2, 1, 1, 1);
     gridLayout->addWidget(widgets.at(indexs.at(5)), 2, 0, 1, 1);
     //设置通道控件可见
-    for (int i = indexs.first(); i <= indexs.last(); ++i) {
-        widgets.at(i)->setVisible(true);
-    }
+    change_video_visible(indexs.first(), indexs.last());
 }
 
 void VideoBox::change_video_8(const QList<int> &indexs)
@@ -311,9 +352,7 @@ void VideoBox::change_video_8(const QList<int> &indexs)
     gridLayout->addWidget(widgets.at(indexs.at(6)), 3, 1, 1, 1);
     gridLayout->addWidget(widgets.at(indexs.at(7)), 3, 0, 1, 1);
     //设置通道控件可见
-    for (int i = indexs.first(); i <= indexs.last(); ++i) {
-        widgets.at(i)->setVisible(true);
-    }
+    change_video_visible(indexs.first(), indexs.last());
 }
 
 void VideoBox::change_video_13(const QList<int> &indexs)
@@ -340,9 +379,7 @@ void VideoBox::change_video_13(const QList<int> &indexs)
     gridLayout->addWidget(widgets.at(indexs.at(11)), 3, 2, 1, 1);
     gridLayout->addWidget(widgets.at(indexs.at(12)), 3, 3, 1, 1);
     //设置通道控件可见
-    for (int i = indexs.first(); i <= indexs.last(); ++i) {
-        widgets.at(i)->setVisible(true);
-    }
+    change_video_visible(indexs.first(), indexs.last());
 }
 
 void VideoBox::change_video_1(int index)
@@ -351,7 +388,7 @@ void VideoBox::change_video_1(int index)
     hide_video_all();
     //添加通道到布局
     gridLayout->addWidget(widgets.at(index), 0, 0);
-    //设置可见
+    //设置通道控件可见
     widgets.at(index)->setVisible(true);
 }
 
@@ -360,11 +397,10 @@ 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);
+    gridLayout->addWidget(widgets.at(index), 0, 0);
+    gridLayout->addWidget(widgets.at(index + 1), 0, 1);
+    //设置通道控件可见
+    change_video_visible(index, index + 1);
 }
 
 void VideoBox::change_video_3(int index)
@@ -372,18 +408,16 @@ 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);
+    gridLayout->addWidget(widgets.at(index), 0, 0, 1, 2);
+    gridLayout->addWidget(widgets.at(index + 1), 1, 0);
+    gridLayout->addWidget(widgets.at(index + 2), 1, 1);
+    //设置通道控件可见
+    change_video_visible(index, index + 2);
 }
 
 void VideoBox::change_video_4(int index)
 {
-    change_video_normal(index, 2);
+    change_video_normal(index, 2, 2);
 }
 
 void VideoBox::change_video_6(int index)
@@ -398,7 +432,7 @@ void VideoBox::change_video_8(int index)
 
 void VideoBox::change_video_9(int index)
 {
-    change_video_normal(index, 3);
+    change_video_normal(index, 3, 3);
 }
 
 void VideoBox::change_video_13(int index)
@@ -408,20 +442,20 @@ void VideoBox::change_video_13(int index)
 
 void VideoBox::change_video_16(int index)
 {
-    change_video_normal(index, 4);
+    change_video_normal(index, 4, 4);
 }
 
 void VideoBox::change_video_25(int index)
 {
-    change_video_normal(index, 5);
+    change_video_normal(index, 5, 5);
 }
 
 void VideoBox::change_video_36(int index)
 {
-    change_video_normal(index, 6);
+    change_video_normal(index, 6, 6);
 }
 
 void VideoBox::change_video_64(int index)
 {
-    change_video_normal(index, 8);
+    change_video_normal(index, 8, 8);
 }

video/videopanel/videobox.h

@@ -51,17 +51,20 @@ private:
     QString actionFlag;
 
     //布局方案标识集合
-    QMap<int, QStringList> types;
-    void addMenu(QMenu *menu, int type);
+    QMap<QString, QStringList> types;
+    void addMenu(QMenu *menu, const QString &type);
 
 public Q_SLOTS:
-    //设置当前画面类型
+    //获取和设置当前画面类型
+    QString getVideoType() const;
     void setVideoType(const QString &videoType);
-    //设置表格布局
-    void setLayout(QGridLayout *gridLayout);
-    //设置视频控件集合
+
+    //获取和设置视频控件集合
+    QWidgetList getWidgets() const;
     void setWidgets(QWidgetList widgets);
 
+    //设置表格布局
+    void setLayout(QGridLayout *gridLayout);
     //设置启用其他通道画面
     void setEnableOther(bool enableOther);
 
@@ -69,8 +72,8 @@ public Q_SLOTS:
     void setMenuFlag(const QString &menuFlag);
     void setActionFlag(const QString &actionFlag);
 
-    //设置子菜单类型集合
-    void setTypes(const QMap<int, QStringList> &types);
+    //设置菜单类型集合
+    void setTypes(const QMap<QString, QStringList> &types);
     //初始化菜单
     void initMenu(QMenu *menu, const QList<bool> &enable);
 
@@ -84,9 +87,12 @@ public Q_SLOTS:
     void hide_video_all();
 
     //常规及异形通道布局
-    void change_video_normal(int index, int flag);
+    void change_video_normal(int index, int row, int column);
     void change_video_custom(int index, int type);
 
+    //设置可见
+    void change_video_visible(int start, int end);
+
     //异形布局
     void change_video_6(const QList<int> &indexs);
     void change_video_8(const QList<int> &indexs);

video/videopanel/videopanel.cpp

@@ -124,10 +124,10 @@ void VideoPanel::initMenu()
 void VideoPanel::full()
 {
     if (actionFull->text() == "切换全屏模式") {
-        emit fullScreen(true);
+        Q_EMIT fullScreen(true);
         actionFull->setText("切换正常模式");
     } else {
-        emit fullScreen(false);
+        Q_EMIT fullScreen(false);
         actionFull->setText("切换全屏模式");
     }
 

video/videopanel/videopanel.h

@@ -58,9 +58,9 @@ private slots:
 private slots:
     void play_video_all();
     void snapshot_video_one();
-    void snapshot_video_all(); 
+    void snapshot_video_all();
 
-signals:
+Q_SIGNALS:
     //全屏切换信号
     void fullScreen(bool full);
 };

video/videowindow/videowindow.cpp

@@ -214,7 +214,7 @@ void VideoWindow::dropEvent(QDropEvent *event)
     }
 
     if (!url.isEmpty()) {
-        emit fileDrag(url);
+        Q_EMIT fileDrag(url);
         this->restart(url);
     }
 }
@@ -601,7 +601,7 @@ void VideoWindow::checkVideo()
 void VideoWindow::btnClicked()
 {
     QPushButton *btn = (QPushButton *)sender();
-    emit btnClicked(btn->objectName());
+    Q_EMIT btnClicked(btn->objectName());
 }
 
 uint VideoWindow::getLength()

video/videowindow/videowindow.h

@@ -219,7 +219,7 @@ private slots:
     //处理按钮单击
     void btnClicked();
 
-signals:
+Q_SIGNALS:
     //播放成功
     void receivePlayStart();
     //播放失败
@@ -241,7 +241,7 @@ signals:
     //工具栏单击
     void btnClicked(const QString &objName);
 
-public slots:
+public Q_SLOTS:
     //获取长度
     uint getLength();
     //获取当前播放位置

widget/framelesswidget/framelesscore/framelessdialog.cpp

@@ -67,7 +67,7 @@ void FramelessDialog::doWindowStateChange(QEvent *event)
     }
 
     //发出最大化最小化等改变事件,以便界面上更改对应的信息比如右上角图标和文字
-    emit windowStateChange(!moveEnable);
+    Q_EMIT windowStateChange(!moveEnable);
 
     //解决mac系统上无边框最小化失效的bug
 #ifdef Q_OS_MACOS
@@ -248,9 +248,9 @@ bool FramelessDialog::eventFilter(QObject *watched, QEvent *event)
         //下面的 *result = HTCAPTION; 标志位也会自动识别双击标题栏
 #ifndef Q_OS_WIN
         if (event->type() == QEvent::MouseButtonDblClick) {
-            emit titleDblClick();
+            Q_EMIT titleDblClick();
         } else if (event->type() == QEvent::NonClientAreaMouseButtonDblClick) {
-            emit titleDblClick();
+            Q_EMIT titleDblClick();
         }
 #endif
     }

widget/framelesswidget/framelesscore/framelessmainwindow.cpp

@@ -67,7 +67,7 @@ void FramelessMainWindow::doWindowStateChange(QEvent *event)
     }
 
     //发出最大化最小化等改变事件,以便界面上更改对应的信息比如右上角图标和文字
-    emit windowStateChange(!moveEnable);
+    Q_EMIT windowStateChange(!moveEnable);
 
     //解决mac系统上无边框最小化失效的bug
 #ifdef Q_OS_MACOS
@@ -248,9 +248,9 @@ bool FramelessMainWindow::eventFilter(QObject *watched, QEvent *event)
         //下面的 *result = HTCAPTION; 标志位也会自动识别双击标题栏
 #ifndef Q_OS_WIN
         if (event->type() == QEvent::MouseButtonDblClick) {
-            emit titleDblClick();
+            Q_EMIT titleDblClick();
         } else if (event->type() == QEvent::NonClientAreaMouseButtonDblClick) {
-            emit titleDblClick();
+            Q_EMIT titleDblClick();
         }
 #endif
     }

widget/framelesswidget/framelesscore/framelesswidget.cpp

@@ -67,7 +67,7 @@ void FramelessWidget::doWindowStateChange(QEvent *event)
     }
 
     //发出最大化最小化等改变事件,以便界面上更改对应的信息比如右上角图标和文字
-    emit windowStateChange(!moveEnable);
+    Q_EMIT windowStateChange(!moveEnable);
 
     //解决mac系统上无边框最小化失效的bug
 #ifdef Q_OS_MACOS
@@ -248,9 +248,9 @@ bool FramelessWidget::eventFilter(QObject *watched, QEvent *event)
         //下面的 *result = HTCAPTION; 标志位也会自动识别双击标题栏
 #ifndef Q_OS_WIN
         if (event->type() == QEvent::MouseButtonDblClick) {
-            emit titleDblClick();
+            Q_EMIT titleDblClick();
         } else if (event->type() == QEvent::NonClientAreaMouseButtonDblClick) {
-            emit titleDblClick();
+            Q_EMIT titleDblClick();
         }
 #endif
     }

widget/lunarcalendarwidget/lunarcalendaritem.cpp

@@ -61,7 +61,7 @@ void LunarCalendarItem::mousePressEvent(QMouseEvent *)
     pressed = true;
     this->update();
 
-    emit clicked(date, dayType);
+    Q_EMIT clicked(date, dayType);
 }
 
 void LunarCalendarItem::mouseReleaseEvent(QMouseEvent *)

widget/lunarcalendarwidget/lunarcalendarwidget.cpp

@@ -412,9 +412,9 @@ void LunarCalendarWidget::dayChanged(const QDate &date)
     }
 
     //发送日期单击信号
-    emit clicked(date);
+    Q_EMIT clicked(date);
     //发送日期更新信号
-    emit selectionChanged();
+    Q_EMIT selectionChanged();
 }
 
 void LunarCalendarWidget::dateChanged(int year, int month, int day)