Merge pull request #174 from docsteer/overall_snapshot_ind

Add overall Snapshot match indicator
docsteer · Dec 16, 2018 · be788ac · be788ac
2 parents cc3b498 + f59d652
commit be788ac
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 5 deletions.
diff --git a/src/clssnapshot.cpp b/src/clssnapshot.cpp
@@ -220,13 +220,14 @@ void clsSnapshot::levelsChanged()
 
     if ((background == m_levelData) != m_backgroundMatches)
     {
+        m_backgroundMatches = (background == m_levelData);
+
         if (background == m_levelData)
             emit snapshotMatches();
         else
             emit snapshotDiffers();
     }
 
-    m_backgroundMatches = (background == m_levelData);
     updateIcons();
 }
 
diff --git a/src/clssnapshot.h b/src/clssnapshot.h
@@ -36,6 +36,8 @@ class clsSnapshot : public QWidget
     QSpinBox *getSbPriority() {return m_sbPriority;}
     QWidget *getControlWidget() {return m_controlWidget;}
 
+    bool isMatching() const {return m_backgroundMatches;}
+
     enum e_icons {
         ICON_NONE,
         ICON_PLAY,

diff --git a/src/gridwidget.cpp b/src/gridwidget.cpp
@@ -31,7 +31,7 @@
 GridWidget::GridWidget(QWidget *parent)
     : QWidget(parent)
     , m_selectedAddress(-1)
-    , m_colors(CELL_COUNT, Qt::white)
+    , m_colors(CELL_COUNT, this->palette().color(QPalette::Base))
     , m_cellHeight(CELL_HEIGHT)
 {
     for(int i=0; i<CELL_COUNT; i++)

diff --git a/src/snapshot.cpp b/src/snapshot.cpp
@@ -108,8 +108,8 @@ void Snapshot::on_btnAddRow_clicked()
     connect(snap, SIGNAL(senderStopped()), this, SLOT(senderStopped()));
     connect(snap, SIGNAL(senderTimedOut()), this, SLOT(senderTimedOut()));
     connect(snap, &clsSnapshot::snapshotTaken, [this]() { ui->btnPlay->setEnabled(true); });
-    connect(snap, SIGNAL(snapshotMatches()), this, SLOT(snapshotMatches()));
-    connect(snap, SIGNAL(snapshotDiffers()), this, SLOT(snapshotDiffers()));
+    connect(snap, SIGNAL(snapshotMatches()), this, SLOT(updateMatchIcon()));
+    connect(snap, SIGNAL(snapshotDiffers()), this, SLOT(updateMatchIcon()));
     ui->tableWidget->setCellWidget(row, COL_BUTTON, snap->getControlWidget());
     ui->tableWidget->setCellWidget(row, COL_UNIVERSE, snap->getSbUniverse());
     ui->tableWidget->setCellWidget(row, COL_PRIORITY, snap->getSbPriority());
@@ -159,6 +159,8 @@ void Snapshot::setState(state s)
     // Play Button Text and Icon
     btnPlay_update();
 
+    updateMatchIcon();
+
     switch(s)
     {
     case stSetup:
@@ -311,3 +313,28 @@ void Snapshot::on_tableWidget_itemSelectionChanged()
     else
        ui->btnRemoveRow->setEnabled(false);
 }
+
+void Snapshot::updateMatchIcon()
+{
+    if(m_state == stPlayback)
+    {
+        bool allmatch = true;
+        foreach(auto s, m_snapshots)
+        {
+            allmatch &= s->isMatching();
+        }
+        if(allmatch)
+        {
+            ui->lblMatching->setPixmap(QPixmap(":/icons/ledgreen.png"));
+            ui->lblMatching->setToolTip(tr("All sources <i>match</i> the background levels"));
+        }
+        else
+        {
+            ui->lblMatching->setPixmap(QPixmap(":/icons/ledred.png"));
+            ui->lblMatching->setToolTip(tr("Not all sources match the background levels"));
+        }
+    }
+    else {
+        ui->lblMatching->setPixmap(QPixmap());
+    }
+}
diff --git a/src/snapshot.h b/src/snapshot.h
@@ -60,6 +60,7 @@ protected slots:
     void senderTimedOut();
     void senderStopped();
     void senderStarted();
+    void updateMatchIcon();
 protected:
     virtual void resizeEvent(QResizeEvent *event);
 

diff --git a/ui/snapshot.ui b/ui/snapshot.ui
@@ -80,17 +80,52 @@
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::MinimumExpanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="lblMatching">
+       <property name="minimumSize">
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::MinimumExpanding</enum>
+       </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>