From b309cce30be6642296b71e4a678b05755f789b4a Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Mon, 24 Apr 2017 21:36:28 -0400 Subject: [PATCH] Updated version number, added buttons for filter load/save in playback window --- config.h | 2 +- frameplaybackwindow.cpp | 2 ++ ui/frameplaybackwindow.ui | 32 +++++++++++++++++++++++++------- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/config.h b/config.h index 39da5a0..333b4f1 100644 --- a/config.h +++ b/config.h @@ -1,7 +1,7 @@ #ifndef CONFIG #define CONFIG -#define VERSION 165 +#define VERSION 166 //try to keep this in sync. //SavvyCAN will complain if you connect a GVRET board with a revision diff --git a/frameplaybackwindow.cpp b/frameplaybackwindow.cpp index 4145803..10e8dd4 100644 --- a/frameplaybackwindow.cpp +++ b/frameplaybackwindow.cpp @@ -64,6 +64,8 @@ FramePlaybackWindow::FramePlaybackWindow(const QVector *frames, QWidge connect(ui->btnLoadLive, SIGNAL(clicked(bool)), this, SLOT(btnLoadLive())); connect(ui->tblSequence, SIGNAL(cellPressed(int,int)), this, SLOT(seqTableCellClicked(int,int))); connect(ui->tblSequence, SIGNAL(cellChanged(int,int)), this, SLOT(seqTableCellChanged(int,int))); + connect(ui->btnLoadFilters, SIGNAL(clicked(bool)), this, SLOT(loadFilters())); + connect(ui->btnSaveFilters, SIGNAL(clicked(bool)), this, SLOT(saveFilters())); ui->listID->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->listID, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuFilters(QPoint))); diff --git a/ui/frameplaybackwindow.ui b/ui/frameplaybackwindow.ui index cff92d6..4055cfd 100644 --- a/ui/frameplaybackwindow.ui +++ b/ui/frameplaybackwindow.ui @@ -22,7 +22,7 @@ - + :/icons/images/NavBack.png:/icons/images/NavBack.png @@ -33,7 +33,7 @@ - + :/icons/images/PauseHS.png:/icons/images/PauseHS.png @@ -44,7 +44,7 @@ - + :/icons/images/ReverseHS.png:/icons/images/ReverseHS.png @@ -55,7 +55,7 @@ - + :/icons/images/StopHS.png:/icons/images/StopHS.png @@ -66,7 +66,7 @@ - + :/icons/images/PlayHS.png:/icons/images/PlayHS.png @@ -77,7 +77,7 @@ - + :/icons/images/NavForward.png:/icons/images/NavForward.png @@ -328,6 +328,24 @@ + + + + + + Load Filters + + + + + + + Save Filters + + + + + @@ -338,7 +356,7 @@ - +