ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-21 12:26:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed useless information from tooltip and removed very slow data retrieving with afij (#1087)

Browse Source 
Now tooltip will show Disasm Preview and Highlights
This commit is contained in:
a1ext 2019-01-08 15:23:17 +03:00 committed by Itay Cohen
parent 975fd77116
commit 78fe3eb3c1
1 changed files with 52 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/widgets/FunctionsWidget.cpp
View File

@ -196,21 +196,6 @@ QVariant FunctionModel::data(const QModelIndex &index, int role) const
return static_cast<int>(Qt::AlignLeft | Qt::AlignVCenter); return static_cast<int>(Qt::AlignLeft | Qt::AlignVCenter);
case Qt::ToolTipRole: { case Qt::ToolTipRole: {
const QJsonArray &info = Core()->cmdj("afij @ " + function.name).array();
if (!info.isEmpty()) {
const QJsonObject &funcInfo = info[0].toObject();
static const QStringList kRequiredFields{ "size", "cc", "nbbs" };
for (const auto& key : kRequiredFields) {
if (!funcInfo.contains(key)) {
return QVariant();
}
}
const int size = funcInfo["size"].toInt();
const int complex = funcInfo["cc"].toInt();
const int bb = funcInfo["nbbs"].toInt();
QStringList disasmPreview;
QJsonArray jDisasmEntries; QJsonArray jDisasmEntries;
{ {
// temporarily simplify the disasm output to get it colorful and simple to read // temporarily simplify the disasm output to get it colorful and simple to read
@ -228,6 +213,7 @@ QVariant FunctionModel::data(const QModelIndex &index, int role) const
jDisasmEntries = Core()->cmdj(QString("pDJ %1 @ %2").arg(function.size).arg(function.offset)).array(); jDisasmEntries = Core()->cmdj(QString("pDJ %1 @ %2").arg(function.size).arg(function.offset)).array();
} }
QStringList disasmPreview;
for (const QJsonValue &value : jDisasmEntries) { for (const QJsonValue &value : jDisasmEntries) {
const QJsonObject &object = value.toObject(); const QJsonObject &object = value.toObject();
@ -255,12 +241,7 @@ QVariant FunctionModel::data(const QModelIndex &index, int role) const
QString toolTipContent = QString("<html><div style=\"font-family: %1; font-size: %2pt; white-space: nowrap;\">") QString toolTipContent = QString("<html><div style=\"font-family: %1; font-size: %2pt; white-space: nowrap;\">")
.arg(fnt.family()) .arg(fnt.family())
.arg(qMax(6, fnt.pointSize() - 1)) // slightly decrease font size, to keep more text in the same box .arg(qMax(6, fnt.pointSize() - 1)) // slightly decrease font size, to keep more text in the same box
+ tr("<div><strong>Summary</strong>:<br>") + tr("<div><strong>Disassembly preview</strong>:<br>%1</div>")
+ tr("Size:&nbsp;%1,&nbsp;Cyclomatic complexity:&nbsp;%2,&nbsp;Basic blocks:&nbsp;%3")
.arg(size)
.arg(complex)
.arg(bb)
+ tr("</div><div style=\"margin-top: 10px;\"><strong>Disassembly preview</strong>:<br>%1</div>")
.arg(disasmPreview.join("<br>")); .arg(disasmPreview.join("<br>"));
if (!highlights.isEmpty()) { if (!highlights.isEmpty()) {
@ -270,8 +251,6 @@ QVariant FunctionModel::data(const QModelIndex &index, int role) const
toolTipContent += "</div></html>"; toolTipContent += "</div></html>";
return toolTipContent; return toolTipContent;
} }
return QVariant();
}
case Qt::ForegroundRole: case Qt::ForegroundRole:
if (functionIsImport(function.offset)) if (functionIsImport(function.offset))