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

Fix couple of issues regarding Graph Overview (#1228)

Browse Source
This commit is contained in:
Vanellope 2019-03-09 03:57:57 +09:00 committed by xarkes
parent 0dff413e17
commit 7ea1f0b281
6 changed files with 65 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/core/MainWindow.cpp
View File

@ -197,6 +197,12 @@ void MainWindow::initUI()
overviewDock = new OverviewWidget(this, ui->actionOverview);
overviewDock->hide();
graphDock = new GraphWidget(this, ui->actionGraph);
connect(ui->actionOverview, &QAction::toggled, [this](bool checked) {
if (checked) {
overviewDock->userClosed = false;
adjustOverview();
}
});
sectionsDock = new SectionsWidget(this, ui->actionSections);
segmentsDock = new SegmentsWidget(this, ui->actionSegments);
entrypointDock = new EntrypointWidget(this, ui->actionEntrypoints);
@ -287,28 +293,39 @@ void MainWindow::toggleOverview(bool visibility, GraphWidget *targetGraph)
if (!overviewDock) {
return;
}
targetGraphDock = targetGraph;
enableOverviewMenu(visibility);
if (visibility && !core->isGraphEmpty()) {
connect(targetGraphDock->graphView, SIGNAL(refreshBlock()), this, SLOT(adjustOverview()));
connect(targetGraphDock->graphView, SIGNAL(viewZoomed()), this, SLOT(adjustOverview()));
connect(targetGraphDock, &GraphWidget::graphClose, [this]() {
overviewDock->hide();
});
connect(targetGraphDock, &GraphWidget::graphEmpty, [this]() {
overviewDock->hide();
});
connect(overviewDock->graphView, SIGNAL(mouseMoved()), this, SLOT(adjustGraph()));
connect(overviewDock, &QDockWidget::dockLocationChanged, this, &MainWindow::adjustOverview);
connect(overviewDock, SIGNAL(resized()), this, SLOT(adjustOverview()));
overviewDock->show();
} else {
disconnect(targetGraphDock->graphView, SIGNAL(refreshBlock()), this, SLOT(adjustOverview()));
disconnect(targetGraphDock->graphView, SIGNAL(viewZoomed()), this, SLOT(adjustOverview()));
disconnect(overviewDock->graphView, SIGNAL(mouseMoved()), this, SLOT(adjustGraph()));
disconnect(overviewDock, &QDockWidget::dockLocationChanged, this, &MainWindow::adjustOverview);
disconnect(overviewDock, SIGNAL(resized()), this, SLOT(adjustOverview()));
ui->actionOverview->setEnabled(visibility);
if (overviewDock->userClosed || !visibility) {
return;
}
targetGraphDock = targetGraph;
connect(targetGraphDock->graphView, SIGNAL(refreshBlock()), this, SLOT(adjustOverview()));
connect(targetGraphDock->graphView, SIGNAL(viewRefreshed()), this, SLOT(adjustOverview()));
connect(targetGraphDock->graphView, SIGNAL(viewZoomed()), this, SLOT(adjustOverview()));
connect(targetGraphDock, &GraphWidget::graphClose, [this]() {
disconnectOverview();
enableOverviewMenu(false);
overviewDock->hide();
});
connect(overviewDock->graphView, SIGNAL(mouseMoved()), this, SLOT(adjustGraph()));
connect(overviewDock, &QDockWidget::dockLocationChanged, this, &MainWindow::adjustOverview);
connect(overviewDock, &OverviewWidget::graphClose, [this]() {
ui->actionOverview->setChecked(false);
if (!core->isGraphEmpty()) {
overviewDock->userClosed = true;
}
});
connect(overviewDock, SIGNAL(resized()), this, SLOT(adjustOverview()));
}
void MainWindow::disconnectOverview()
{
disconnect(targetGraphDock->graphView, SIGNAL(refreshBlock()), this, SLOT(adjustOverview()));
disconnect(targetGraphDock->graphView, SIGNAL(viewRefreshed()), this, SLOT(adjustOverview()));
disconnect(targetGraphDock->graphView, SIGNAL(viewZoomed()), this, SLOT(adjustOverview()));
disconnect(overviewDock->graphView, SIGNAL(mouseMoved()), this, SLOT(adjustGraph()));
disconnect(overviewDock, &QDockWidget::dockLocationChanged, this, &MainWindow::adjustOverview);
disconnect(overviewDock, SIGNAL(resized()), this, SLOT(adjustOverview()));
disconnect(overviewDock, &QDockWidget::visibilityChanged, this, nullptr);
}
void MainWindow::setOverviewData()
@ -319,7 +336,12 @@ void MainWindow::setOverviewData()
void MainWindow::adjustOverview()
{
if (!overviewDock) {
if (!overviewDock || overviewDock->userClosed) {
return;
}
if (core->isGraphEmpty()) {
enableOverviewMenu(false);
overviewDock->hide();
return;
}
setOverviewData();
@ -336,6 +358,8 @@ void MainWindow::adjustOverview()
overviewDock->graphView->rangeRect = QRectF(rangeRectX, rangeRectY, w, h);
overviewDock->graphView->viewport()->update();
enableOverviewMenu(true);
overviewDock->show();
}
void MainWindow::adjustGraph()

1
src/core/MainWindow.h
View File

@ -137,6 +137,7 @@ public slots:
void openNewFileFailed();
void toggleOverview(bool visibility, GraphWidget *targetGraph);
void disconnectOverview();
void adjustOverview();
void adjustGraph();

3
src/widgets/GraphWidget.cpp
View File

@ -36,9 +36,6 @@ GraphWidget::GraphWidget(MainWindow *main, QAction *action) :
connect(Core(), &CutterCore::raisePrioritizedMemoryWidget,
this, [ = ](CutterCore::MemoryWidgetType type) {
bool emptyGraph = (type == CutterCore::MemoryWidgetType::Graph && Core()->isGraphEmpty());
if (emptyGraph) {
emit graphEmpty();
}
if (type == CutterCore::MemoryWidgetType::Graph && !emptyGraph) {
this->raise();
this->graphView->setFocus();

1
src/widgets/GraphWidget.h
View File

@ -20,7 +20,6 @@ private:
signals:
void graphClose();
void graphEmpty();
};
#endif // GRAPHWIDGET_H

6
src/widgets/OverviewWidget.cpp
View File

@ -37,3 +37,9 @@ void OverviewWidget::updateContents()
}
graphView->refreshView();
}
void OverviewWidget::closeEvent(QCloseEvent *event)
{
CutterDockWidget::closeEvent(event);
emit graphClose();
}

12
src/widgets/OverviewWidget.h
View File

@ -15,6 +15,10 @@ public:
~OverviewWidget();
OverviewView *graphView;
/*
* @brief if user closed this widget explicitly
*/
bool userClosed = false;
private:
RefreshDeferrer *refreshDeferrer;
/**
@ -27,12 +31,20 @@ private slots:
* @brief update the overview
*/
void updateContents();
/*
* @brief override closeEvent to emit graphClose
*/
void closeEvent(QCloseEvent *event) override;
signals:
/**
* @brief emit signal to update the rect
*/
void resized();
/*
* @brief emit signal to notify when this widget is closed
*/
void graphClose();
};
#endif // OverviewWIDGET_H