Verified Commit f5093613 authored by Romain De Laage De Bellefaye's avatar Romain De Laage De Bellefaye 🌳
Browse files

Merge branch 'master' of gitlab.utc.fr:rdelaage/lo21-projet

parents 23ae30b2 2f41fea3
Pipeline #79760 passed with stage
in 15 seconds
......@@ -88,7 +88,7 @@ this->setWindowTitle("Automate cellulaire");
//définition de la frame initialisation
win_init = new QWidget;
win_init->setFixedWidth(400);
win_init->setFixedWidth(500);
lab_init = new QLabel("Configuration du modèle :");
form_init = new QGridLayout(win_init);
......@@ -100,6 +100,7 @@ this->setWindowTitle("Automate cellulaire");
form_init->addLayout(form_config, 1,0);
list_grids = new QComboBox;
list_grids->setFixedWidth(150);
check_load_grid = new QCheckBox;
edit_largeur = new QLineEdit;
......@@ -380,7 +381,6 @@ void AutoCell::chargerGrilles(){
text = liste->currentText();
list_grids->clear();
list_grids->setFixedWidth(90);
vector<QString> noms = Database::getInstance().getListeReseaux(text);
nb.setNum(noms.size());
......
......@@ -5,17 +5,6 @@
NouveauModele::NouveauModele(QWidget* parent) : QWidget() {
Automate::getInstance().reset();
//create dumb ensembleetat
Automate::getInstance().getEnsemble().ajouterEtat(0, "État 1", 0, 0, 0);
Automate::getInstance().getEnsemble().ajouterEtat(1, "État 2", 10, 10, 30);
Automate::getInstance().getEnsemble().ajouterEtat(2, "État 3", 10, 30, 10);
Automate::getInstance().getEnsemble().ajouterEtat(3, "État 4", 30, 10, 10);
Automate::getInstance().getEnsemble().ajouterEtat(4, "État 5", 100, 70, 70);
Automate::getInstance().getEnsemble().ajouterEtat(5, "État 6", 70, 100, 70);
Automate::getInstance().getEnsemble().ajouterEtat(6, "État 7", 70, 70, 100);
Automate::getInstance().getEnsemble().ajouterEtat(7, "État 8", 200, 200, 200);
// fonction.reset(new Fonction(Automate::getInstance().getEnsemble().getEtat(0)));
this->setWindowTitle("Paramétrage d'un nouveau modèle");
this->setMinimumSize(850, 650);
......@@ -487,12 +476,10 @@ void NouveauModele::changerRegle(){
liste_regle_transition->setPlaceholderText("--- select ---");
//liste_regle_transition->addItem("--- select ---");
/*std::vector<QString> automates = Database::getInstance().getAutomates();
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("Game Life");
}
liste_regle_transition->addItem("Nouvelle fonction de transition");
liste_regle_transition->setCurrentIndex(-1);
......
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