Updated the program version tag, added ability to delete entries in the sequence in the playback window.
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
#ifndef CONFIG
|
#ifndef CONFIG
|
||||||
#define CONFIG
|
#define CONFIG
|
||||||
|
|
||||||
#define VERSION 113
|
#define VERSION 114
|
||||||
|
|
||||||
#endif // CONFIG
|
#endif // CONFIG
|
||||||
|
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ FramePlaybackWindow::FramePlaybackWindow(QVector<CANFrame> *frames, SerialWorker
|
|||||||
connect(ui->btnStepForward, SIGNAL(clicked(bool)), this, SLOT(btnFwdOneClick()));
|
connect(ui->btnStepForward, SIGNAL(clicked(bool)), this, SLOT(btnFwdOneClick()));
|
||||||
connect(ui->btnSelectAll, SIGNAL(clicked(bool)), this, SLOT(btnSelectAllClick()));
|
connect(ui->btnSelectAll, SIGNAL(clicked(bool)), this, SLOT(btnSelectAllClick()));
|
||||||
connect(ui->btnSelectNone, SIGNAL(clicked(bool)), this, SLOT(btnSelectNoneClick()));
|
connect(ui->btnSelectNone, SIGNAL(clicked(bool)), this, SLOT(btnSelectNoneClick()));
|
||||||
|
connect(ui->btnDelete, SIGNAL(clicked(bool)), this, SLOT(btnDeleteCurrSeq()));
|
||||||
connect(ui->spinPlaySpeed, SIGNAL(valueChanged(int)), this, SLOT(changePlaybackSpeed(int)));
|
connect(ui->spinPlaySpeed, SIGNAL(valueChanged(int)), this, SLOT(changePlaybackSpeed(int)));
|
||||||
//connect(ui->cbLoop, SIGNAL(clicked(bool)), this, SLOT(changeLooping(bool)));
|
//connect(ui->cbLoop, SIGNAL(clicked(bool)), this, SLOT(changeLooping(bool)));
|
||||||
connect(ui->comboCANBus, SIGNAL(currentIndexChanged(int)), this, SLOT(changeSendingBus(int)));
|
connect(ui->comboCANBus, SIGNAL(currentIndexChanged(int)), this, SLOT(changeSendingBus(int)));
|
||||||
@@ -159,6 +160,31 @@ void FramePlaybackWindow::fillIDHash(SequenceItem &item)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void FramePlaybackWindow::btnDeleteCurrSeq()
|
||||||
|
{
|
||||||
|
if (currentSeqNum == -1) return;
|
||||||
|
|
||||||
|
if (playbackActive)
|
||||||
|
{
|
||||||
|
playbackActive = false;
|
||||||
|
playbackTimer->stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
seqItems.removeAt(currentSeqNum);
|
||||||
|
ui->tblSequence->removeRow(currentSeqNum);
|
||||||
|
if (seqItems.count() > 0)
|
||||||
|
{
|
||||||
|
currentSeqNum = 0;
|
||||||
|
currentSeqItem = &seqItems[currentSeqNum];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
currentSeqNum = -1;
|
||||||
|
currentSeqItem = NULL;
|
||||||
|
}
|
||||||
|
updateFrameLabel();
|
||||||
|
}
|
||||||
|
|
||||||
void FramePlaybackWindow::btnLoadFile()
|
void FramePlaybackWindow::btnLoadFile()
|
||||||
{
|
{
|
||||||
QString filename;
|
QString filename;
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ private slots:
|
|||||||
void btnStopClick();
|
void btnStopClick();
|
||||||
void btnPlayClick();
|
void btnPlayClick();
|
||||||
void btnFwdOneClick();
|
void btnFwdOneClick();
|
||||||
|
void btnDeleteCurrSeq();
|
||||||
void changePlaybackSpeed(int newSpeed);
|
void changePlaybackSpeed(int newSpeed);
|
||||||
void changeLooping(bool check);
|
void changeLooping(bool check);
|
||||||
void changeSendingBus(int newIdx);
|
void changeSendingBus(int newIdx);
|
||||||
|
|||||||
@@ -287,6 +287,13 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="btnDelete">
|
||||||
|
<property name="text">
|
||||||
|
<string>Delete Selected</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
|||||||
Reference in New Issue
Block a user