Verified Commit e0374063 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 26482b92 0661f92e
......@@ -1163,23 +1163,167 @@ INSERT INTO regles_transition VALUES(
);
-- 201422
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, 1, 1, NULL, 1, NULL, NULL, NULL,
1, 1, 1, NULL, 1, NULL, NULL, NULL,
2, 2
);
-- 201722
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, 1, 1, NULL, NULL, NULL, NULL, 1,
1, 1, 1, NULL, NULL, NULL, NULL, 1,
2, 2
);
-- 202022
INSERT INTO regles_transition VALUES(
"Langton s loop",
2, NULL, 2, NULL, NULL, NULL, NULL, NULL,
2, NULL, 2, NULL, NULL, NULL, NULL, NULL,
2, 2
);
-- 202032
INSERT INTO regles_transition VALUES(
"Langton s loop",
2, NULL, 1, 1, NULL, NULL, NULL, NULL,
2, NULL, 1, 1, NULL, NULL, NULL, NULL,
2, 2
);
-- 202052
INSERT INTO regles_transition VALUES(
"Langton s loop",
2, NULL, 1, NULL, NULL, 1, NULL, NULL,
2, NULL, 1, NULL, NULL, 1, NULL, NULL,
2, 2
);
-- 202073
INSERT INTO regles_transition VALUES(
"Langton s loop",
2, NULL, 1, NULL, NULL, NULL, NULL, 1,
2, NULL, 1, NULL, NULL, NULL, NULL, 1,
2, 3
);
-- 202122
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, 1, 2, NULL, NULL, NULL, NULL, NULL,
1, 1, 2, NULL, NULL, NULL, NULL, NULL,
2, 2
);
-- 202152
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, 1, 1, NULL, NULL, 1, NULL, NULL,
1, 1, 1, NULL, NULL, 1, NULL, NULL,
2, 2
);
-- 202212
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, 1, 2, NULL, NULL, NULL, NULL, NULL,
1, 1, 2, NULL, NULL, NULL, NULL, NULL,
2, 2
);
-- 202222
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, NULL, 3, NULL, NULL, NULL, NULL, NULL,
1, NULL, 3, NULL, NULL, NULL, NULL, NULL,
2, 2
);
-- 202272
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, NULL, 2, NULL, NULL, NULL, NULL, 1,
1, NULL, 2, NULL, NULL, NULL, NULL, 1,
2, 2
);
-- 202321
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, NULL, 2, 1, NULL, NULL, NULL, NULL,
1, NULL, 2, 1, NULL, NULL, NULL, NULL,
2, 1
);
-- 202422
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, NULL, 2, NULL, 1, NULL, NULL, NULL,
1, NULL, 2, NULL, 1, NULL, NULL, NULL,
2, 2
);
-- 202452
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, NULL, 1, NULL, 1, 1, NULL, NULL,
1, NULL, 1, NULL, 1, 1, NULL, NULL,
2, 2
);
-- 202520
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, NULL, 2, NULL, NULL, 1, NULL, NULL,
1, NULL, 2, NULL, NULL, 1, NULL, NULL,
2, 0
);
-- 202552
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, NULL, 1, NULL, NULL, 2, NULL, NULL,
1, NULL, 1, NULL, NULL, 2, NULL, NULL,
2, 2
);
-- 202622
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, NULL, 2, NULL, NULL, NULL, 1, NULL,
1, NULL, 2, NULL, NULL, NULL, 1, NULL,
2, 2
);
-- 202722
INSERT INTO regles_transition VALUES(
"Langton s loop",
1, NULL, 2, NULL, NULL, NULL, NULL, 1,
1, NULL, 2, NULL, NULL, NULL, NULL, 1,
2, 2
);
-- 203122
-- 203216
-- 203226
......
......@@ -181,7 +181,7 @@ AutoCell::AutoCell(QWidget* parent):QWidget(parent)
button_save_grid = new QPushButton("sauvegarder");
button_save_grid->setFixedWidth(90);
connect(button_save_grid,SIGNAL(clicked()),this,SLOT(sauvergarderGrille()));
connect(button_save_grid,SIGNAL(clicked()),this,SLOT(sauvegarderGrille()));
grid_run_control->addWidget(lab_sauv_grille,4,0,1,3, Qt::AlignBottom);
grid_run_control->addWidget(edit_nom_grille,5,0, Qt::AlignBottom);
......
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