Use SeerVar everywhere instead of SeerStruct.

ALT+V can call up SeerStruct.
This commit is contained in:
Ernie Pasveer
2022-09-05 14:03:51 -05:00
parent 2e7e3f407f
commit 2df0684ed2
4 changed files with 27 additions and 25 deletions
+4 -4
View File
@@ -151,7 +151,7 @@ SeerGdbWidget::SeerGdbWidget (QWidget* parent) : QWidget(parent) {
QObject::connect(editorManagerWidget, &SeerEditorManagerWidget::refreshVariableTrackerValues, this, &SeerGdbWidget::handleGdbDataListValues);
QObject::connect(editorManagerWidget, &SeerEditorManagerWidget::addMemoryVisualize, this, &SeerGdbWidget::handleGdbMemoryAddExpression);
QObject::connect(editorManagerWidget, &SeerEditorManagerWidget::addArrayVisualize, this, &SeerGdbWidget::handleGdbArrayAddExpression);
QObject::connect(editorManagerWidget, &SeerEditorManagerWidget::addStructVisualize, this, &SeerGdbWidget::handleGdbStructAddExpression);
QObject::connect(editorManagerWidget, &SeerEditorManagerWidget::addStructVisualize, this, &SeerGdbWidget::handleGdbVarAddExpression);
QObject::connect(editorManagerWidget, &SeerEditorManagerWidget::evaluateVariableExpression, this, &SeerGdbWidget::handleGdbDataEvaluateExpression);
QObject::connect(editorManagerWidget, &SeerEditorManagerWidget::evaluateVariableExpression, variableManagerWidget->variableLoggerBrowserWidget(), &SeerVariableLoggerBrowserWidget::handleEvaluateVariableExpression);
QObject::connect(editorManagerWidget, &SeerEditorManagerWidget::requestAssembly, this, &SeerGdbWidget::handleGdbGetAssembly);
@@ -175,14 +175,14 @@ SeerGdbWidget::SeerGdbWidget (QWidget* parent) : QWidget(parent) {
QObject::connect(stackManagerWidget->stackArgumentsBrowserWidget(), &SeerStackArgumentsBrowserWidget::addVariableTrackerExpression, this, &SeerGdbWidget::handleGdbDataAddExpression);
QObject::connect(stackManagerWidget->stackArgumentsBrowserWidget(), &SeerStackArgumentsBrowserWidget::addMemoryVisualize, this, &SeerGdbWidget::handleGdbMemoryAddExpression);
QObject::connect(stackManagerWidget->stackArgumentsBrowserWidget(), &SeerStackArgumentsBrowserWidget::addArrayVisualize, this, &SeerGdbWidget::handleGdbArrayAddExpression);
QObject::connect(stackManagerWidget->stackArgumentsBrowserWidget(), &SeerStackArgumentsBrowserWidget::addStructVisualize, this, &SeerGdbWidget::handleGdbStructAddExpression);
QObject::connect(stackManagerWidget->stackArgumentsBrowserWidget(), &SeerStackArgumentsBrowserWidget::addStructVisualize, this, &SeerGdbWidget::handleGdbVarAddExpression);
QObject::connect(stackManagerWidget->stackArgumentsBrowserWidget(), &SeerStackArgumentsBrowserWidget::refreshVariableTrackerValues, this, &SeerGdbWidget::handleGdbDataListExpressions);
QObject::connect(stackManagerWidget->stackLocalsBrowserWidget(), &SeerStackLocalsBrowserWidget::refreshStackLocals, this, &SeerGdbWidget::handleGdbStackListLocals);
QObject::connect(stackManagerWidget->stackLocalsBrowserWidget(), &SeerStackLocalsBrowserWidget::addVariableLoggerExpression, variableManagerWidget->variableLoggerBrowserWidget(), &SeerVariableLoggerBrowserWidget::addVariableExpression);
QObject::connect(stackManagerWidget->stackLocalsBrowserWidget(), &SeerStackLocalsBrowserWidget::addVariableTrackerExpression, this, &SeerGdbWidget::handleGdbDataAddExpression);
QObject::connect(stackManagerWidget->stackLocalsBrowserWidget(), &SeerStackLocalsBrowserWidget::addMemoryVisualize, this, &SeerGdbWidget::handleGdbMemoryAddExpression);
QObject::connect(stackManagerWidget->stackLocalsBrowserWidget(), &SeerStackLocalsBrowserWidget::addArrayVisualize, this, &SeerGdbWidget::handleGdbArrayAddExpression);
QObject::connect(stackManagerWidget->stackLocalsBrowserWidget(), &SeerStackLocalsBrowserWidget::addStructVisualize, this, &SeerGdbWidget::handleGdbStructAddExpression);
QObject::connect(stackManagerWidget->stackLocalsBrowserWidget(), &SeerStackLocalsBrowserWidget::addStructVisualize, this, &SeerGdbWidget::handleGdbVarAddExpression);
QObject::connect(stackManagerWidget->stackLocalsBrowserWidget(), &SeerStackLocalsBrowserWidget::refreshVariableTrackerValues, this, &SeerGdbWidget::handleGdbDataListExpressions);
QObject::connect(stackManagerWidget, &SeerStackManagerWidget::refreshThreadFrames, this, &SeerGdbWidget::handleGdbThreadListFrames);
@@ -1793,7 +1793,7 @@ void SeerGdbWidget::handleGdbVarAddExpression (QString expression) {
QObject::connect(w, &SeerVarVisualizerWidget::varObjAttributes, this, &SeerGdbWidget::handleGdbVarObjAttributes);
QObject::connect(w, &SeerVarVisualizerWidget::addMemoryVisualize, this, &SeerGdbWidget::handleGdbMemoryAddExpression);
QObject::connect(w, &SeerVarVisualizerWidget::addArrayVisualize, this, &SeerGdbWidget::handleGdbArrayAddExpression);
QObject::connect(w, &SeerVarVisualizerWidget::addStructVisualize, this, &SeerGdbWidget::handleGdbStructAddExpression);
QObject::connect(w, &SeerVarVisualizerWidget::addVarVisualize, this, &SeerGdbWidget::handleGdbVarAddExpression);
// Tell the visualizer what variable to use.
w->setVariableName(expression);
+3 -3
View File
@@ -81,7 +81,7 @@ SeerMainWindow::SeerMainWindow(QWidget* parent) : QMainWindow(parent) {
// Setup hidden Var Visualizer.
QShortcut* varVisualizerShotcut = new QShortcut(QKeySequence(tr("Alt+V")), this);
QObject::connect(varVisualizerShotcut, &QShortcut::activated, this, &SeerMainWindow::handleViewVarVisualizer);
QObject::connect(varVisualizerShotcut, &QShortcut::activated, this, &SeerMainWindow::handleViewStructVisualizer);
//
// Set up signals/slots.
@@ -91,7 +91,7 @@ SeerMainWindow::SeerMainWindow(QWidget* parent) : QMainWindow(parent) {
QObject::connect(actionFileQuit, &QAction::triggered, this, &SeerMainWindow::handleFileQuit);
QObject::connect(actionViewMemoryVisualizer, &QAction::triggered, this, &SeerMainWindow::handleViewMemoryVisualizer);
QObject::connect(actionViewArrayVisualizer, &QAction::triggered, this, &SeerMainWindow::handleViewArrayVisualizer);
QObject::connect(actionViewStructVisualizer, &QAction::triggered, this, &SeerMainWindow::handleViewStructVisualizer);
QObject::connect(actionViewStructVisualizer, &QAction::triggered, this, &SeerMainWindow::handleViewVarVisualizer);
QObject::connect(actionViewAssembly, &QAction::triggered, this, &SeerMainWindow::handleViewAssembly);
QObject::connect(actionConsoleNormal, &QAction::triggered, this, &SeerMainWindow::handleViewConsoleNormal);
QObject::connect(actionConsoleHidden, &QAction::triggered, this, &SeerMainWindow::handleViewConsoleHidden);
@@ -121,7 +121,7 @@ SeerMainWindow::SeerMainWindow(QWidget* parent) : QMainWindow(parent) {
QObject::connect(actionInterruptProcess, &QAction::triggered, gdbWidget, &SeerGdbWidget::handleGdbInterrupt);
QObject::connect(actionMemoryVisualizer, &QAction::triggered, gdbWidget, &SeerGdbWidget::handleGdbMemoryVisualizer);
QObject::connect(actionArrayVisualizer, &QAction::triggered, gdbWidget, &SeerGdbWidget::handleGdbArrayVisualizer);
QObject::connect(actionStructVisualizer, &QAction::triggered, gdbWidget, &SeerGdbWidget::handleGdbStructVisualizer);
QObject::connect(actionStructVisualizer, &QAction::triggered, gdbWidget, &SeerGdbWidget::handleGdbVarVisualizer);
QObject::connect(interruptAction, &QAction::triggered, gdbWidget, &SeerGdbWidget::handleGdbInterrupt);
QObject::connect(interruptActionSIGINT, &QAction::triggered, gdbWidget, &SeerGdbWidget::handleGdbInterruptSIGINT);
QObject::connect(interruptActionSIGKILL, &QAction::triggered, gdbWidget, &SeerGdbWidget::handleGdbInterruptSIGKILL);
+19 -17
View File
@@ -22,7 +22,7 @@ SeerVarVisualizerWidget::SeerVarVisualizerWidget (QWidget* parent) : QWidget(par
// Setup the widgets
setWindowIcon(QIcon(":/seer/resources/seergdb_64x64.png"));
setWindowTitle("Seer Var Visualizer");
setWindowTitle("Seer Struct Visualizer");
setAttribute(Qt::WA_DeleteOnClose);
variableNameLineEdit->setFocus();
@@ -43,7 +43,9 @@ SeerVarVisualizerWidget::SeerVarVisualizerWidget (QWidget* parent) : QWidget(par
variableTreeWidget->resizeColumnToContents(9); // editable
variableTreeWidget->clear();
// Show debug columns.
debugCheckBox->setChecked(false);
debugCheckBox->hide();
// Create edit delegate.
// The value column will allow editing of the cell. However, some cells can then
@@ -92,7 +94,7 @@ SeerVarVisualizerWidget::~SeerVarVisualizerWidget () {
void SeerVarVisualizerWidget::setVariableName (const QString& name) {
setWindowTitle("Seer Var Visualizer - '" + name + "'");
setWindowTitle("Seer Struct Visualizer - '" + name + "'");
variableNameLineEdit->setText(name);
@@ -494,9 +496,9 @@ void SeerVarVisualizerWidget::handleContextMenu (const QPoint& pos) {
QAction* addArrayVisualizerAction = new QAction(QString("\"%1\"").arg(variable));
QAction* addArrayAsteriskVisualizerAction = new QAction(QString("\"*%1\"").arg(variable));
QAction* addArrayAmpersandVisualizerAction = new QAction(QString("\"&&%1\"").arg(variable));
QAction* addStructVisualizerAction = new QAction(QString("\"%1\"").arg(variable));
QAction* addStructAsteriskVisualizerAction = new QAction(QString("\"*%1\"").arg(variable));
QAction* addStructAmpersandVisualizerAction = new QAction(QString("\"&&%1\"").arg(variable));
QAction* addVarVisualizerAction = new QAction(QString("\"%1\"").arg(variable));
QAction* addVarAsteriskVisualizerAction = new QAction(QString("\"*%1\"").arg(variable));
QAction* addVarAmpersandVisualizerAction = new QAction(QString("\"&&%1\"").arg(variable));
expandItemAction->setIcon(QIcon(":/seer/resources/RelaxLightIcons/list-add.svg"));
collapseItemAction->setIcon(QIcon(":/seer/resources/RelaxLightIcons/list-remove.svg"));
@@ -536,9 +538,9 @@ void SeerVarVisualizerWidget::handleContextMenu (const QPoint& pos) {
menu.addMenu(&arrayVisualizerMenu);
QMenu structVisualizerMenu("Add variable to a Struct Visualizer");
structVisualizerMenu.addAction(addStructVisualizerAction);
structVisualizerMenu.addAction(addStructAsteriskVisualizerAction);
structVisualizerMenu.addAction(addStructAmpersandVisualizerAction);
structVisualizerMenu.addAction(addVarVisualizerAction);
structVisualizerMenu.addAction(addVarAsteriskVisualizerAction);
structVisualizerMenu.addAction(addVarAmpersandVisualizerAction);
menu.addMenu(&structVisualizerMenu);
// Launch the menu. Get the response.
@@ -644,39 +646,39 @@ void SeerVarVisualizerWidget::handleContextMenu (const QPoint& pos) {
}
// Handle adding struct to visualize.
if (action == addStructVisualizerAction) {
if (action == addVarVisualizerAction) {
//qDebug() << "addStructVisualizer" << variable;
//qDebug() << "addVarVisualizer" << variable;
// Emit the signals.
if (variable != "") {
emit addStructVisualize(variable);
emit addVarVisualize(variable);
}
return;
}
// Handle adding struct to visualize.
if (action == addStructAsteriskVisualizerAction) {
if (action == addVarAsteriskVisualizerAction) {
//qDebug() << "addStructAsteriskVisualizer" << variable;
//qDebug() << "addVarAsteriskVisualizer" << variable;
// Emit the signals.
if (variable != "") {
emit addStructVisualize(QString("*") + variable);
emit addVarVisualize(QString("*") + variable);
}
return;
}
// Handle adding struct to visualize.
if (action == addStructAmpersandVisualizerAction) {
if (action == addVarAmpersandVisualizerAction) {
//qDebug() << "addStructAmpersandVisualizer" << variable;
//qDebug() << "addVarAmpersandVisualizer" << variable;
// Emit the signals.
if (variable != "") {
emit addStructVisualize(QString("&") + variable);
emit addVarVisualize(QString("&") + variable);
}
return;
+1 -1
View File
@@ -24,7 +24,7 @@ class SeerVarVisualizerWidget : public QWidget, protected Ui::SeerVarVisualizerW
void varObjAttributes (int objid, QString objname);
void addMemoryVisualize (QString expression);
void addArrayVisualize (QString expression);
void addStructVisualize (QString expression);
void addVarVisualize (QString expression);
public slots:
void handleText (const QString& text);