Comment out Select Actb, Preb, Refb

This commit is contained in:
2021-08-27 12:18:34 +02:00
parent 484dbb2841
commit b0c5ec3b9e
5 changed files with 113 additions and 113 deletions

View File

@@ -173,29 +173,29 @@ shared_ptr<Transaction> TraceDB::getNextPrecharge(ID currentTransactionId)
return parseTransactionFromQuery(query);
}
shared_ptr<Transaction> TraceDB::getNextActb(ID currentTransactionId)
{
QSqlQuery query(database);
QString queryText = queryTexts.queryHead +
"WHERE TransactionID > :currentID AND PhaseName = 'ACTB' LIMIT 1";
// shared_ptr<Transaction> TraceDB::getNextActb(ID currentTransactionId)
// {
// QSqlQuery query(database);
// QString queryText = queryTexts.queryHead +
// "WHERE TransactionID > :currentID AND PhaseName = 'ACTB' LIMIT 1";
//
// query.prepare(queryText);
// query.bindValue(":currentID", currentTransactionId);
// executeQuery(query);
// return parseTransactionFromQuery(query);
// }
query.prepare(queryText);
query.bindValue(":currentID", currentTransactionId);
executeQuery(query);
return parseTransactionFromQuery(query);
}
shared_ptr<Transaction> TraceDB::getNextPreb(ID currentTransactionId)
{
QSqlQuery query(database);
QString queryText = queryTexts.queryHead +
"WHERE TransactionID > :currentID AND PhaseName = 'PREB' LIMIT 1";
query.prepare(queryText);
query.bindValue(":currentID", currentTransactionId);
executeQuery(query);
return parseTransactionFromQuery(query);
}
// shared_ptr<Transaction> TraceDB::getNextPreb(ID currentTransactionId)
// {
// QSqlQuery query(database);
// QString queryText = queryTexts.queryHead +
// "WHERE TransactionID > :currentID AND PhaseName = 'PREB' LIMIT 1";
//
// query.prepare(queryText);
// query.bindValue(":currentID", currentTransactionId);
// executeQuery(query);
// return parseTransactionFromQuery(query);
// }
shared_ptr<Transaction> TraceDB::getNextRefresh(ID currentTransactionId)
{
@@ -208,17 +208,17 @@ shared_ptr<Transaction> TraceDB::getNextRefresh(ID currentTransactionId)
return parseTransactionFromQuery(query);
}
shared_ptr<Transaction> TraceDB::getNextRefb(ID currentTransactionId)
{
QSqlQuery query(database);
QString queryText = queryTexts.queryHead +
"WHERE TransactionID > :currentID AND PhaseName = 'REFB' LIMIT 1";
query.prepare(queryText);
query.bindValue(":currentID", currentTransactionId);
executeQuery(query);
return parseTransactionFromQuery(query);
}
// shared_ptr<Transaction> TraceDB::getNextRefb(ID currentTransactionId)
// {
// QSqlQuery query(database);
// QString queryText = queryTexts.queryHead +
// "WHERE TransactionID > :currentID AND PhaseName = 'REFB' LIMIT 1";
//
// query.prepare(queryText);
// query.bindValue(":currentID", currentTransactionId);
// executeQuery(query);
// return parseTransactionFromQuery(query);
// }
ID TraceDB::getTransactionIDFromPhaseID(ID phaseID)
{

View File

@@ -89,9 +89,9 @@ public:
std::shared_ptr<Transaction> getNextPrecharge(ID currentTransactionId);
std::shared_ptr<Transaction> getNextActivate(ID currentTransactionId);
std::shared_ptr<Transaction> getNextRefresh(ID currentTransactionId);
std::shared_ptr<Transaction> getNextPreb(ID currentTransactionId);
std::shared_ptr<Transaction> getNextActb(ID currentTransactionId);
std::shared_ptr<Transaction> getNextRefb(ID currentTransactionId);
// std::shared_ptr<Transaction> getNextPreb(ID currentTransactionId);
// std::shared_ptr<Transaction> getNextActb(ID currentTransactionId);
// std::shared_ptr<Transaction> getNextRefb(ID currentTransactionId);
std::shared_ptr<Transaction> getTransactionByID(ID id);

View File

@@ -241,45 +241,45 @@ void TraceNavigator::selectNextPrecharge()
selectTransaction(nextPrecharge);
}
void TraceNavigator::selectNextActb()
{
shared_ptr<Transaction> nextActb;
if (!SelectedTransactions().empty())
nextActb = traceFile.getNextActb(SelectedTransactions().front()->id);
else
nextActb = traceFile.getNextActb(0);
if (nextActb)
selectTransaction(nextActb);
}
void TraceNavigator::selectNextPreb()
{
shared_ptr<Transaction> nextPreb;
if (!SelectedTransactions().empty())
nextPreb = traceFile.getNextPreb(
SelectedTransactions().front()->id);
else
nextPreb = traceFile.getNextPreb(0);
if (nextPreb)
selectTransaction(nextPreb);
}
void TraceNavigator::selectNextRefb()
{
shared_ptr<Transaction> n;
if (!SelectedTransactions().empty())
n = traceFile.getNextRefb(SelectedTransactions().front()->id);
else
n = traceFile.getNextRefb(0);
if (n)
selectTransaction(n);
}
// void TraceNavigator::selectNextActb()
// {
// shared_ptr<Transaction> nextActb;
//
// if (!SelectedTransactions().empty())
// nextActb = traceFile.getNextActb(SelectedTransactions().front()->id);
// else
// nextActb = traceFile.getNextActb(0);
//
// if (nextActb)
// selectTransaction(nextActb);
// }
//
// void TraceNavigator::selectNextPreb()
// {
// shared_ptr<Transaction> nextPreb;
//
// if (!SelectedTransactions().empty())
// nextPreb = traceFile.getNextPreb(
// SelectedTransactions().front()->id);
// else
// nextPreb = traceFile.getNextPreb(0);
//
// if (nextPreb)
// selectTransaction(nextPreb);
// }
//
// void TraceNavigator::selectNextRefb()
// {
// shared_ptr<Transaction> n;
//
// if (!SelectedTransactions().empty())
// n = traceFile.getNextRefb(SelectedTransactions().front()->id);
// else
// n = traceFile.getNextRefb(0);
//
// if (n)
// selectTransaction(n);
// }
bool TraceNavigator::transactionIsSelected(const shared_ptr<Transaction>
&transaction) const

View File

@@ -114,23 +114,23 @@ void TracePlot::setUpActions()
QObject::connect(selectNextPrecharge, SIGNAL(triggered()), this,
SLOT(on_selectNextPrecharge()));
selectNextActb = new QAction("Select next atcb", this);
selectNextActb->setShortcut(QKeySequence("alt+b"));
addAction(selectNextActb);
QObject::connect(selectNextActb, SIGNAL(triggered()), this,
SLOT(on_selectNextActb()));
selectNextPreb = new QAction("Select next preb", this);
selectNextPreb->setShortcut(QKeySequence("alt+q"));
addAction(selectNextPreb);
QObject::connect(selectNextPreb, SIGNAL(triggered()), this,
SLOT(on_selectNextPreb()));
selectNextRefb = new QAction("Select next refb", this);
selectNextRefb->setShortcut(QKeySequence("alt+s"));
addAction(selectNextRefb);
QObject::connect(selectNextRefb, SIGNAL(triggered()), this,
SLOT(on_selectNextRefb()));
// selectNextActb = new QAction("Select next atcb", this);
// selectNextActb->setShortcut(QKeySequence("alt+b"));
// addAction(selectNextActb);
// QObject::connect(selectNextActb, SIGNAL(triggered()), this,
// SLOT(on_selectNextActb()));
//
// selectNextPreb = new QAction("Select next preb", this);
// selectNextPreb->setShortcut(QKeySequence("alt+q"));
// addAction(selectNextPreb);
// QObject::connect(selectNextPreb, SIGNAL(triggered()), this,
// SLOT(on_selectNextPreb()));
//
// selectNextRefb = new QAction("Select next refb", this);
// selectNextRefb->setShortcut(QKeySequence("alt+s"));
// addAction(selectNextRefb);
// QObject::connect(selectNextRefb, SIGNAL(triggered()), this,
// SLOT(on_selectNextRefb()));
setColorGroupingPhase = new QAction("Group by Phase", this);
addAction(setColorGroupingPhase);
@@ -169,7 +169,7 @@ void TracePlot::setUpContextMenu()
contextMenu->addMenu(goToSubMenu);
QMenu *selectSubMenu = new QMenu("Select", contextMenu);
selectSubMenu->addActions({selectNextRefresh, selectNextActivate, selectNextPrecharge, selectNextActb, selectNextPreb, selectNextRefb});
selectSubMenu->addActions({selectNextRefresh, selectNextActivate, selectNextPrecharge /*, selectNextActb, selectNextPreb, selectNextRefb */});
contextMenu->addMenu(selectSubMenu);
contextMenu->addActions({showQueryEditor, insertComment, exportToPdf});
@@ -440,20 +440,20 @@ void TracePlot::on_selectNextPrecharge()
navigator->selectNextPrecharge();
}
void TracePlot::on_selectNextActb()
{
navigator->selectNextActb();
}
void TracePlot::on_selectNextPreb()
{
navigator->selectNextPreb();
}
void TracePlot::on_selectNextRefb()
{
navigator->selectNextRefb();
}
// void TracePlot::on_selectNextActb()
// {
// navigator->selectNextActb();
// }
//
// void TracePlot::on_selectNextPreb()
// {
// navigator->selectNextPreb();
// }
//
// void TracePlot::on_selectNextRefb()
// {
// navigator->selectNextRefb();
// }
void TracePlot::on_colorGroupingPhase()
{

View File

@@ -101,9 +101,9 @@ private Q_SLOTS:
void on_selectNextRefresh();
void on_selectNextActivate();
void on_selectNextPrecharge();
void on_selectNextActb();
void on_selectNextPreb();
void on_selectNextRefb();
// void on_selectNextActb();
// void on_selectNextPreb();
// void on_selectNextRefb();
void on_colorGroupingPhase();
void on_colorGroupingTransaction();
void on_colorGroupingThread();
@@ -168,9 +168,9 @@ private:
QAction *selectNextRefresh;
QAction *selectNextActivate;
QAction *selectNextPrecharge;
QAction *selectNextActb;
QAction *selectNextPreb;
QAction *selectNextRefb;
// QAction *selectNextActb;
// QAction *selectNextPreb;
// QAction *selectNextRefb;
QAction *setColorGroupingPhase;
QAction *setColorGroupingTransaction;
QAction *setColorGroupingThread;