Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Romain De Laage De Bellefaye
LO21-projet
Commits
47ec7938
Commit
47ec7938
authored
Jun 12, 2021
by
Leon Do Castelo
Browse files
Update parametragemodele.cpp
parent
9fb59243
Pipeline
#79729
passed with stage
in 15 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/parametragemodele.cpp
View file @
47ec7938
#include
"parametragemodele.h"
#include
<autocell.h>
#include
<Automate.h>
<<<<<<<
HEAD
#include
<autosql.h>
=======
#include
<autosql.h>
>>>>>>>
aa94038ad54c3aac4dd6ab4c2275b185fe3c1dfb
NouveauModele
::
NouveauModele
(
QWidget
*
parent
)
:
QWidget
()
{
Automate
::
getInstance
().
reset
();
...
...
@@ -69,18 +64,6 @@ NouveauModele::NouveauModele(QWidget* parent) : QWidget() {
//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)));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment