Skip to content

Commit

Permalink
Merge pull request #183 from epasveer/178-suggestion-struct-visualize…
Browse files Browse the repository at this point in the history 
…r-in-locals-tab

178 suggestion struct visualizer in locals tab
  • Loading branch information
@epasveer
epasveer authored Nov 19, 2023
2 parents da31f07 + dea3f0f commit a8f9262
Show file tree
Hide file tree
Showing 7 changed files with 451 additions and 80 deletions.
211 changes: 197 additions & 14 deletions src/SeerStackArgumentsBrowserWidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@ SeerStackArgumentsBrowserWidget::SeerStackArgumentsBrowserWidget (QWidget* paren
argumentsTreeWidget->resizeColumnToContents(0); // level
argumentsTreeWidget->resizeColumnToContents(1); // Name
argumentsTreeWidget->resizeColumnToContents(2); // Value

argumentsTreeWidget->resizeColumnToContents(3); // used
argumentsTreeWidget->setColumnHidden(3, true); // Hide the 'used' column.
argumentsTreeWidget->clear();

// Connect things.
QObject::connect(argumentsTreeWidget, &QTreeWidget::customContextMenuRequested, this, &SeerStackArgumentsBrowserWidget::handleContextMenu);
QObject::connect(argumentsTreeWidget, &QTreeWidget::itemCollapsed, this, &SeerStackArgumentsBrowserWidget::handleItemCollapsed);
QObject::connect(argumentsTreeWidget, &QTreeWidget::itemExpanded, this, &SeerStackArgumentsBrowserWidget::handleItemExpanded);
QObject::connect(argumentsTreeWidget, &QTreeWidget::itemEntered, this, &SeerStackArgumentsBrowserWidget::handleItemEntered);
}

Expand All @@ -42,9 +45,7 @@ void SeerStackArgumentsBrowserWidget::handleText (const QString& text) {

if (text.startsWith("^done,stack-args=[") && text.endsWith("]")) {

argumentsTreeWidget->clear();

//qDebug() << text;
//argumentsTreeWidget->clear();

// ^done,stack-args=[
// frame={level="0",args=[
Expand All @@ -63,6 +64,15 @@ void SeerStackArgumentsBrowserWidget::handleText (const QString& text) {

//qDebug() << frame_list.count() << frame_list;

// Mark each entry initially as "unused".
// Later, some will be marked as "reused" or "new". Then the "unused" ones will
// be deleted.
QTreeWidgetItemIterator it(argumentsTreeWidget);
while (*it) {
(*it)->setText(3, "unused");
++it;
}

for ( const auto& frame_text : frame_list ) {

//qDebug() << frame_text;
Expand All @@ -75,30 +85,62 @@ void SeerStackArgumentsBrowserWidget::handleText (const QString& text) {

QStringList namevalue_list = Seer::parse(args_text, "", '{', '}', false);

// Add the level to the tree.
QTreeWidgetItem* topItem = new QTreeWidgetItem;
topItem->setText(0, level_text);
QList<QTreeWidgetItem*> matches = argumentsTreeWidget->findItems(level_text, Qt::MatchExactly, 0);

argumentsTreeWidget->addTopLevelItem(topItem);
QTreeWidgetItem* topItem = 0;

// Use an existing level.
if (matches.count() > 0) {
topItem = matches[0];
topItem->setText(3, "reused");

// Add the new level to the tree.
}else{
topItem = new QTreeWidgetItem;
topItem->setText(0, level_text);
topItem->setText(3, "new");

argumentsTreeWidget->addTopLevelItem(topItem);
}

// Get the argument names and values for the level.
for ( const auto& namevalue_text : namevalue_list ) {

QString name_text = Seer::parseFirst(namevalue_text, "name=", '"', '"', false);
QString value_text = Seer::parseFirst(namevalue_text, "value=", '"', '"', false);

QTreeWidgetItem* item = new QTreeWidgetItem;
item->setText(1, name_text); // Set the name and value. Don't set the level.
item->setText(2, Seer::filterEscapes(value_text));
item->setFont(2, QFontDatabase::systemFont(QFontDatabase::FixedFont));

topItem->addChild(item);
// Populate the tree.
handleItemCreate(topItem, "", name_text, value_text);
}

// Expand all items for the level.
argumentsTreeWidget->expandItem(topItem);
}

// At this point, there are some new entries, some reused entries, and some unused ones.
// Delete the unused ones. They are obsolete.
// Don't use qDeleteAll() here. It doesn't work as expected for items that are "found".
// Instead, get a list of matches and delete them from the bottom up.
QList<QTreeWidgetItem*> matches = argumentsTreeWidget->findItems("unused", Qt::MatchExactly|Qt::MatchRecursive, 3);

while (matches.isEmpty() == false) {
foreach (QTreeWidgetItem* item, matches) {
if (item->childCount() == 0) {
QTreeWidgetItem* parent = item->parent();
if (parent) {
parent->removeChild(item);
}

bool f = matches.removeOne(item);
Q_ASSERT(f != false);

delete item;

break;
}
}
}

}else if (text.startsWith("^error,msg=\"No registers.\"")) {
argumentsTreeWidget->clear();

Expand All @@ -109,6 +151,7 @@ void SeerStackArgumentsBrowserWidget::handleText (const QString& text) {
argumentsTreeWidget->resizeColumnToContents(0);
argumentsTreeWidget->resizeColumnToContents(1);
argumentsTreeWidget->resizeColumnToContents(2);
argumentsTreeWidget->resizeColumnToContents(3);

QApplication::restoreOverrideCursor();
}
Expand Down Expand Up @@ -444,6 +487,26 @@ void SeerStackArgumentsBrowserWidget::handleContextMenu (const QPoint& pos) {
}
}

void SeerStackArgumentsBrowserWidget::handleItemExpanded (QTreeWidgetItem* item) {

Q_UNUSED(item);

argumentsTreeWidget->resizeColumnToContents(0);
argumentsTreeWidget->resizeColumnToContents(1);
argumentsTreeWidget->resizeColumnToContents(2);
argumentsTreeWidget->resizeColumnToContents(3);
}

void SeerStackArgumentsBrowserWidget::handleItemCollapsed (QTreeWidgetItem* item) {

Q_UNUSED(item);

argumentsTreeWidget->resizeColumnToContents(0);
argumentsTreeWidget->resizeColumnToContents(1);
argumentsTreeWidget->resizeColumnToContents(2);
argumentsTreeWidget->resizeColumnToContents(3);
}

void SeerStackArgumentsBrowserWidget::handleItemEntered (QTreeWidgetItem* item, int column) {

Q_UNUSED(column);
Expand All @@ -466,6 +529,126 @@ void SeerStackArgumentsBrowserWidget::handleItemEntered (QTreeWidgetItem* item,
}
}

void SeerStackArgumentsBrowserWidget::handleItemCreate (QTreeWidgetItem* parentItem, const QString& level_text, const QString& name_text, const QString& value_text) {

// Instead of creating a new tree each time, we will reuse existing items, if they are there.
// This allows the expanded items to remain expanded. We start by looking for matches that
// may already be there. If there are matches, the code will reuse it. If not, a new item
// is created by the code. Note, when searching, we only look at the current level. Not any
// children.
QList<QTreeWidgetItem*> matches;

if (parentItem == 0) {
Q_ASSERT(parentItem != NULL);
return;
}else{
for (int i=0; i<parentItem->childCount(); i++) {
if (parentItem->child(i)->text(1) == name_text) {
matches.append(parentItem->child(i));
}
}
}

// Parse bookmarks.
QString capture0; // With const address.
QString capture1; // Without.

QRegularExpression withaddress_re("^@0[xX][0-9a-fA-F]+: \\{(.*?)\\}$");
QRegularExpressionMatch withaddress_match = withaddress_re.match(value_text, 0, QRegularExpression::PartialPreferCompleteMatch);

if (withaddress_match.hasMatch()) {
capture0 = withaddress_match.captured(0);
capture1 = withaddress_match.captured(1);

}else{
QRegularExpression noaddress_re("^\\{(.*?)\\}$");
QRegularExpressionMatch noaddress_match = noaddress_re.match(value_text, 0, QRegularExpression::PartialPreferCompleteMatch);

if (noaddress_match.hasMatch()) {
capture0 = noaddress_match.captured(0);
capture1 = noaddress_match.captured(1);
}
}

// Add the complex entry to the tree. Reuse, if possible.
if (capture0 != "" && capture1 != "") {

// Remove bookends
QString text = capture1;

QTreeWidgetItem* item = 0;

// Use the privously created item. Or create a new one.
if (matches.size() > 0) {
item = matches[0];
item->setText(3, "reused");

}else{
item = new QTreeWidgetItem;
item->setText(3, "new");

// If we're dealing with a top-level item, attach it to the tree.
// Otherwise, attach it to the parent.
if (parentItem) {
parentItem->addChild(item);
}else{
argumentsTreeWidget->addTopLevelItem(item);
}
}

// Set the flatvalue text.
item->setText(0, level_text);
item->setText(1, name_text);
item->setText(2, Seer::filterEscapes(text));
item->setFont(2, QFontDatabase::systemFont(QFontDatabase::FixedFont));

// Convert to a list of name/value pairs.
QStringList nv_pairs = Seer::parseCommaList(text, '{', '}');

// Go through each pair and add the name and its value to the tree.
for (const auto& nv : nv_pairs) {

QStringPair pair = Seer::parseNameValue(nv, '=');

handleItemCreate(item, level_text, pair.first, pair.second);
}

// Add the simple entry to the tree. Reuse, if possible.
}else{
QTreeWidgetItem* item = 0;

// Use the privously created item. Or create a new one.
if (matches.size() > 0) {
item = matches[0];
item->setText(3, "reused");

}else{
item = new QTreeWidgetItem;
item->setText(3, "new");

// If we're dealing with a top-level item, attach it to the tree.
// Otherwise, attach it to the parent.
if (parentItem) {
parentItem->addChild(item);
}else{
argumentsTreeWidget->addTopLevelItem(item);
}
}

// Simple entries don't have children. Delete them.
QList<QTreeWidgetItem*> children = item->takeChildren();
if (matches.size() > 0) {
qDeleteAll(children);
}

// Populate the item.
item->setText(0, level_text);
item->setText(1, name_text);
item->setText(2, Seer::filterEscapes(value_text));
item->setFont(2, QFontDatabase::systemFont(QFontDatabase::FixedFont));
}
}

void SeerStackArgumentsBrowserWidget::showEvent (QShowEvent* event) {

QWidget::showEvent(event);
Expand Down
3 changes: 3 additions & 0 deletions src/SeerStackArgumentsBrowserWidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ class SeerStackArgumentsBrowserWidget : public QWidget, protected Ui::SeerStackA

protected slots:
void handleContextMenu (const QPoint& pos);
void handleItemExpanded (QTreeWidgetItem* item);
void handleItemCollapsed (QTreeWidgetItem* item);
void handleItemEntered (QTreeWidgetItem* item, int column);

signals:
Expand All @@ -31,6 +33,7 @@ class SeerStackArgumentsBrowserWidget : public QWidget, protected Ui::SeerStackA
void addStructVisualize (QString expression);

protected:
void handleItemCreate (QTreeWidgetItem* parentItem, const QString& level_text, const QString& name_text, const QString& value_text);
void showEvent (QShowEvent* event);

private:
Expand Down
7 changes: 6 additions & 1 deletion src/SeerStackArgumentsBrowserWidget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<item row="0" column="0" colspan="2">
<widget class="QTreeWidget" name="argumentsTreeWidget">
<property name="columnCount">
<number>3</number>
<number>4</number>
</property>
<column>
<property name="text">
Expand All @@ -34,6 +34,11 @@
<string>Value</string>
</property>
</column>
<column>
<property name="text">
<string>Used</string>
</property>
</column>
</widget>
</item>
</layout>
Expand Down
Loading

0 comments on commit a8f9262

Please sign in to comment.