ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-02-22 06:33:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix #93 + cleaning

Browse Source
This commit is contained in:
xarkes 2017-11-05 16:08:17 +01:00
parent e8b2cf3fea
commit 7c8e0b708c
2 changed files with 16 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/widgets/DisassemblerGraphView.cpp
View File

@ -49,19 +49,6 @@ DisassemblerGraphView::DisassemblerGraphView(QWidget *parent)
this->blocks.clear(); this->blocks.clear();
this->saveGraph = false; this->saveGraph = false;
//Create timer to automatically refresh view when it needs to be updated
//this->updateTimer = new QTimer();
//this->updateTimer->setInterval(1000); // TODO Probably too slow
//this->updateTimer->setSingleShot(false);
//connect(this->updateTimer, SIGNAL(timeout()), this, SLOT(updateTimerEvent()));
//this->updateTimer->start();
// Remove above comments?
// Draw the first graph after 1s
this->updateTimer = new QTimer();
this->updateTimer->setSingleShot(true);
connect(this->updateTimer, SIGNAL(timeout()), this, SLOT(updateTimerEvent()));
this->updateTimer->start(1000);
this->initFont(); this->initFont();
//Initialize scroll bars //Initialize scroll bars
@ -87,7 +74,8 @@ DisassemblerGraphView::DisassemblerGraphView(QWidget *parent)
}); });
//Connect to bridge //Connect to bridge
connect(Core(), SIGNAL(seekChanged(RVA)), this, SLOT(on_seekChanged(RVA))); connect(Core(), SIGNAL(seekChanged(RVA)), this, SLOT(onSeekChanged(RVA)));
connect(Core(), SIGNAL(commentsChanged()), this, SLOT(refreshView()));
//connect(Bridge::getBridge(), SIGNAL(loadGraph(BridgeCFGraphList*, duint)), this, SLOT(loadGraphSlot(BridgeCFGraphList*, duint))); //connect(Bridge::getBridge(), SIGNAL(loadGraph(BridgeCFGraphList*, duint)), this, SLOT(loadGraphSlot(BridgeCFGraphList*, duint)));
//connect(Bridge::getBridge(), SIGNAL(graphAt(duint)), this, SLOT(graphAtSlot(duint))); //connect(Bridge::getBridge(), SIGNAL(graphAt(duint)), this, SLOT(graphAtSlot(duint)));
//connect(Bridge::getBridge(), SIGNAL(updateGraph()), this, SLOT(updateGraphSlot())); //connect(Bridge::getBridge(), SIGNAL(updateGraph()), this, SLOT(updateGraphSlot()));
@ -1420,46 +1408,6 @@ void DisassemblerGraphView::renderFunction(Function & func)
//puts("Finished"); //puts("Finished");
} }
void DisassemblerGraphView::updateTimerEvent()
{
qDebug() << "Update timer";
on_seekChanged(0);
return;
// TODO: Remove it if not used anymore
//qDebug() << status << this->status << this->function << this->ready << this->update_id << this->analysis.update_id;
// TODO status is useless (for now at least)
auto status = this->analysis.status;
if(status != this->status)
{
this->status = status;
this->viewport()->update();
}
if(this->function == 0)
{
loadCurrentGraph();
return;
}
if(this->ready)
{
//Check for updated code
if(this->update_id != this->analysis.update_id)
this->renderFunction(this->analysis.functions[this->function]);
return;
}
//View not up to date, check to see if active function is ready
if(this->analysis.functions.count(this->function))
{
if(this->analysis.functions[this->function].ready)
{
//Active function now ready, generate graph
this->renderFunction(this->analysis.functions[this->function]);
}
}
}
void DisassemblerGraphView::show_cur_instr(bool force) void DisassemblerGraphView::show_cur_instr(bool force)
{ {
for(auto & blockIt : this->blocks) for(auto & blockIt : this->blocks)
@ -1609,7 +1557,7 @@ void DisassemblerGraphView::loadCurrentGraph()
if (op["comment"].toString().length()) { if (op["comment"].toString().length()) {
RichTextPainter::CustomRichText_t comment; RichTextPainter::CustomRichText_t comment;
comment.text = QString(" ; %1").arg(QByteArray::fromBase64(op["comment"].toString().toLocal8Bit()).data()); comment.text = QString(" ; %1").arg(QByteArray::fromBase64(op["comment"].toString().toLocal8Bit()).data());
comment.textColor = ConfigColor("comment"); comment.textColor = mCommentColor;
comment.flags = RichTextPainter::FlagColor; comment.flags = RichTextPainter::FlagColor;
richText.insert(richText.end(), comment); richText.insert(richText.end(), comment);
} }
@ -1650,12 +1598,16 @@ void DisassemblerGraphView::loadCurrentGraph()
} }
*/ */
void DisassemblerGraphView::on_seekChanged(RVA addr) void DisassemblerGraphView::refreshView()
{
loadCurrentGraph();
this->renderFunction(this->analysis.functions[this->function]);
}
void DisassemblerGraphView::onSeekChanged(RVA addr)
{ {
Q_UNUSED(addr); Q_UNUSED(addr);
loadCurrentGraph(); refreshView();
this->renderFunction(this->analysis.functions[this->function]);
} }
void DisassemblerGraphView::graphAtSlot(duint addr) void DisassemblerGraphView::graphAtSlot(duint addr)
@ -1824,6 +1776,9 @@ void DisassemblerGraphView::colorsUpdatedSlot()
jmpColor = ConfigColor("graph.trufae"); jmpColor = ConfigColor("graph.trufae");
brtrueColor = ConfigColor("graph.true"); brtrueColor = ConfigColor("graph.true");
brfalseColor = ConfigColor("graph.false"); brfalseColor = ConfigColor("graph.false");
mCommentColor = ConfigColor("comment");
mCommentBackgroundColor = disassemblyBackgroundColor;
/*disassemblyBackgroundColor = ConfigColor("GraphNodeBackgroundColor"); /*disassemblyBackgroundColor = ConfigColor("GraphNodeBackgroundColor");
if(!disassemblyBackgroundColor.alpha()) if(!disassemblyBackgroundColor.alpha())
disassemblyBackgroundColor = ConfigColor("DisassemblyBackgroundColor"); disassemblyBackgroundColor = ConfigColor("DisassemblyBackgroundColor");

5
src/widgets/DisassemblerGraphView.h
View File

@ -259,8 +259,8 @@ signals:
void currentInstructionUpdated(duint); void currentInstructionUpdated(duint);
public slots: public slots:
void updateTimerEvent(); void refreshView();
void on_seekChanged(RVA); void onSeekChanged(RVA);
//void loadGraphSlot(BridgeCFGraphList* graph, duint addr); //void loadGraphSlot(BridgeCFGraphList* graph, duint addr);
void graphAtSlot(duint addr); void graphAtSlot(duint addr);
void updateGraphSlot(); void updateGraphSlot();
@ -292,7 +292,6 @@ private:
QString status; QString status;
Analysis analysis; Analysis analysis;
duint function; duint function;
QTimer* updateTimer;
int baseline; int baseline;
qreal charWidth; qreal charWidth;
int charHeight; int charHeight;