From: Christoph Egger <Christoph.Egger@fau.de>
Date: Thu, 22 Jan 2015 18:54:23 +0000 (+0100)
Subject: Properly implement plane selection
X-Git-Tag: v0.1~117
X-Git-Url: https://git.siccegge.de//index.cgi?a=commitdiff_plain;h=e483d95e6b01bc5c6b97bb596409db0b35e213f7;p=frida%2Ffrida.git

Properly implement plane selection

Does no longer rely on proper indexes (corresponding index in the listWidget and
in the stackedWidget) but actually remebers which plane belongs to which
list entry
---

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index d929094..8a62ef8 100644
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -51,7 +51,7 @@ Mainwindow::Mainwindow(InformationManager* mgr)
 	setCentralWidget(stackedWidget);
 
 	connect(listWidget, SIGNAL(currentRowChanged(int)),
-	        stackedWidget, SLOT(setCurrentIndex(int)));
+	        this, SLOT(switchMainPlane(int)));
 
 	setWindowTitle(tr("FRIDA"));
 
@@ -80,6 +80,10 @@ void Mainwindow::open() {
 	manager->reset(fileName.toStdString());
 }
 
+void Mainwindow::switchMainPlane(int index) {
+	stackedWidget->setCurrentWidget(objects_list[listWidget->currentItem()]);
+}
+
 void Mainwindow::showListContextMenu(const QPoint& point) {
 	QListWidgetItem * item = listWidget->itemAt(point);
 	if (item) {
@@ -137,8 +141,9 @@ void Mainwindow::addFunction(Function* fun) {
 
 	w->addTab(t, "Listing");
 
-	listWidget->addItem(fun->getName().c_str());
+	QListWidgetItem * item = new QListWidgetItem(fun->getName().c_str(), listWidget);
 	stackedWidget->addWidget(w);
+	objects_list.insert(std::make_pair(item, w));
 }
 
 namespace {
diff --git a/src/gui/Mainwindow.hxx b/src/gui/Mainwindow.hxx
index 953b315..efc7d99 100644
--- a/src/gui/Mainwindow.hxx
+++ b/src/gui/Mainwindow.hxx
@@ -40,6 +40,7 @@ private:
 	QAction *openAction;
 
 	std::map<uint64_t, BasicBlockWidget*> blocks;
+	std::map<QListWidgetItem*, QWidget*> objects_list;
 	std::set<Function*> functions;
 	InformationManager* manager;
 
@@ -47,6 +48,7 @@ private:
 private Q_SLOTS:
 	void quit();
 	void open();
+	void switchMainPlane(int);
 	void showListContextMenu(const QPoint&);
 	void requestNewFunction();
 };