From 039568ecda898d4eda30c0586e241703eb7eacdc Mon Sep 17 00:00:00 2001
From: yboucher <yann.boucher@etu.utc.fr>
Date: Sat, 12 Jun 2021 21:16:04 +0200
Subject: [PATCH] Solved a bug with Neighborhooddialog
---
include/propertyvisitors.hpp | 1 -
src/uibuildervisitor.cpp | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/propertyvisitors.hpp b/include/propertyvisitors.hpp
index 1651f9c..a3255b7 100644
--- a/include/propertyvisitors.hpp
+++ b/include/propertyvisitors.hpp
@@ -52,7 +52,6 @@ private:
QWidget* current_widget();
void push_array_widget(const Property& prop);
QWidget *pop_widget();
- NeighborhoodDialog* neighborhoodDialog;
private:
void visit(StringProperty& str);
diff --git a/src/uibuildervisitor.cpp b/src/uibuildervisitor.cpp
index 8e79de8..99a81c5 100644
--- a/src/uibuildervisitor.cpp
+++ b/src/uibuildervisitor.cpp
@@ -202,15 +202,15 @@ void UIBuilderVisitor::visit(PropertyList &list)
add_button->setEnabled(true);
}
});
- QObject::connect(widgetGridNeighborhoodButton, &QPushButton::pressed, [this, &list, list_widget]() {
+ QObject::connect(widgetGridNeighborhoodButton, &QPushButton::pressed, [&list, list_widget]() {
Neighborhood currentNeighborhood = list.to_neighborhood();
- neighborhoodDialog = new NeighborhoodDialog(currentNeighborhood);
+ NeighborhoodDialog neighborhoodDialog(currentNeighborhood);
- if( neighborhoodDialog->exec() ) {
+ if( neighborhoodDialog.exec() ) {
//std::cout << "sacreubleu" << endl;
fflush(stdout);
list.clear();
- Neighborhood* newNeighborhood = neighborhoodDialog->getNeighborhood();
+ Neighborhood* newNeighborhood = neighborhoodDialog.getNeighborhood();
list.load_from_neighborhood(*newNeighborhood);
delete newNeighborhood;
UIBuilderVisitor visit(list_widget);
--
GitLab