Commit 47ec7938 authored by Leon Do Castelo's avatar Leon Do Castelo
Browse files

Update parametragemodele.cpp

parent 9fb59243
Pipeline #79729 passed with stage
in 15 seconds
#include"parametragemodele.h" #include"parametragemodele.h"
#include <autocell.h> #include <autocell.h>
#include <Automate.h> #include <Automate.h>
<<<<<<< HEAD
#include<autosql.h> #include<autosql.h>
=======
#include <autosql.h>
>>>>>>> aa94038ad54c3aac4dd6ab4c2275b185fe3c1dfb
NouveauModele::NouveauModele(QWidget* parent) : QWidget() { NouveauModele::NouveauModele(QWidget* parent) : QWidget() {
Automate::getInstance().reset(); Automate::getInstance().reset();
...@@ -69,18 +64,6 @@ NouveauModele::NouveauModele(QWidget* parent) : QWidget() { ...@@ -69,18 +64,6 @@ NouveauModele::NouveauModele(QWidget* parent) : QWidget() {
//choisir une règle de transition //choisir une règle de transition
<<<<<<< HEAD
=======
//liste_regle_transition->addItem("--- select ---");
std::vector<QString> automates = Database::getInstance().getAutomates();
for(size_t i = 0 ; i<automates.size(); i++)
liste_regle_transition->addItem(automates[i]);
liste_regle_transition->addItem("Nouvelle fonction de transition");
>>>>>>> aa94038ad54c3aac4dd6ab4c2275b185fe3c1dfb
//connect(liste_regle_transition, SIGNAL(currentIndexChanged(int)), liste_voisinage, SLOT(setCurrentIndex(int))); //connect(liste_regle_transition, SIGNAL(currentIndexChanged(int)), liste_voisinage, SLOT(setCurrentIndex(int)));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment