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
c884737e
Verified
Commit
c884737e
authored
Jun 10, 2021
by
Romain De Laage De Bellefaye
🌳
Browse files
Merge branch 'master' of gitlab.utc.fr:rdelaage/lo21-projet
parents
5fefc71f
2bbe2ca8
Changes
2
Hide whitespace changes
Inline
Side-by-side
includes/parametragemodele.h
View file @
c884737e
...
...
@@ -50,13 +50,14 @@ class NouveauModele : public QWidget {
QLabel
*
destination
;
QLabel
*
etatCourant
;
QC
heck
Box
*
valid_Etat
;
QC
ombo
Box
*
valid_Etat
;
QSpinBox
*
numEtatCourant
;
QSpinBox
*
etatDest
;
QPushButton
*
fin
,
next
;
QIntValidator
*
seuilValidator
;
QLineEdit
*
numSeuilMin
[
8
];
QLineEdit
*
numSeuilMax
[
8
];
//définition de la frame paramétrage du choix
QWidget
*
fenetre_param
;
...
...
@@ -80,8 +81,12 @@ public slots:
void
affGrille
();
void
modifGrille
(
const
QModelIndex
&
index
);
void
paramRegle
(
const
QString
&
choix_regle
);
<<<<<<<
HEAD
void
choisirEtatCourant
(
const
QString
&
validEtat
);
=======
void
choisirEtatCourant
(
bool
checked
);
void
parametrerEtats
();
>>>>>>>
b75009b4f263c0958c988e2906423ed9f3c2a961
};
...
...
src/parametragemodele.cpp
View file @
c884737e
...
...
@@ -143,35 +143,64 @@ void NouveauModele::paramRegle(const QString& choix_regle) {
destination
=
new
QLabel
(
"Destination : "
);
etatCourant
=
new
QLabel
(
"Etat Courant : "
);
valid_Etat
=
new
QCheckBox
;
etatDest
=
new
QSpinBox
;
etatDest
->
setRange
(
1
,
8
);
valid_Etat
=
new
QComboBox
;
valid_Etat
->
addItem
(
"Oui"
);
valid_Etat
->
addItem
(
"Non"
);
valid_Etat
->
setCurrentIndex
(
-
1
);
QHBoxLayout
*
layout
=
new
QHBoxLayout
;
if
(
choix_regle
==
"Nouvelle fonction de transition"
)
{
seuilValidator
=
new
QIntValidator
;
seuilValidator
->
setRange
(
0
,
1
);
for
(
unsigned
int
i
=
0
;
i
<
8
;
i
++
)
{
/*
for(unsigned int i=0; i<8; i++) {
numSeuilMin[i]=new QLineEdit;
numSeuilMin[i]->setFixedWidth(22);
numSeuilMin[i]->setMaxLength(1);
numSeuilMin[i]->setText("-1");
numSeuilMin[i]->setValidator(seuilValidator);
form_init->addWidget(numSeuilMin[i]);
}*/
form_choix
->
addRow
(
layout
);
layout
->
addWidget
(
seuilMin
);
for
(
unsigned
int
i
=
0
;
i
<
8
;
i
++
)
{
numSeuilMin
[
i
]
=
new
QLineEdit
;
numSeuilMin
[
i
]
->
setFixedWidth
(
22
);
numSeuilMin
[
i
]
->
setMaxLength
(
1
);
numSeuilMin
[
i
]
->
setText
(
"-1"
);
numSeuilMin
[
i
]
->
setValidator
(
seuilValidator
);
layout
->
addWidget
(
numSeuilMin
[
i
]);
}
form_choix
->
addRow
(
seuilMax
);
for
(
unsigned
int
i
=
0
;
i
<
8
;
i
++
)
{
numSeuilMax
[
i
]
=
new
QLineEdit
;
numSeuilMax
[
i
]
->
setFixedWidth
(
22
);
numSeuilMax
[
i
]
->
setMaxLength
(
2
);
numSeuilMax
[
i
]
->
setText
(
"-1"
);
numSeuilMax
[
i
]
->
setValidator
(
seuilValidator
);
form_choix
->
addWidget
(
numSeuilMax
[
i
]);
}
form_choix
->
addRow
(
destination
,
etatDest
);
form_choix
->
addRow
(
etatCourant
,
valid_Etat
);
connect
(
valid_Etat
,
SIGNAL
(
currentTextChanged
(
const
QString
&
)),
this
,
SLOT
(
choisirEtatCourant
(
const
QString
&
)));
}
form_choix
->
addRow
(
seuilMin
);
form_choix
->
addRow
(
seuilMax
);
form_choix
->
addRow
(
destination
,
etatDest
);
form_choix
->
addRow
(
etatCourant
,
valid_Etat
);
connect
(
etatDest
,
SIGNAL
(
toggled
(
bool
)),
this
,
SLOT
(
choisirEtatCourant
(
bool
)));
}
void
NouveauModele
::
choisirEtatCourant
(
bool
checked
){
numEtatCourant
=
new
QSpinBox
;
void
NouveauModele
::
choisirEtatCourant
(
const
QString
&
validEtat
){
if
(
validEtat
==
"Oui"
){
numEtatCourant
=
new
QSpinBox
;
numEtatCourant
->
setRange
(
1
,
8
);
form_choix
->
addRow
(
"Etat Courant :"
,
numEtatCourant
);
}
}
void
NouveauModele
::
affGrille
()
{
delete
grid
;
grid
=
new
QTableWidget
(
5
,
5
);
...
...
@@ -249,7 +278,7 @@ void NouveauModele::changerVoisinage(const QString& choix_regle){
liste_voisinage
->
addItem
(
"Voisinage arbitraire"
);
liste_voisinage
->
setCurrentIndex
(
-
1
);
}
else
if
(
choix_regle
==
"Brian's brain"
||
choix_regle
==
"Circulaire de Griffeath"
){
else
if
(
choix_regle
==
"Brian's brain"
||
choix_regle
==
"Circulaire de Griffeath"
||
choix_regle
==
"Nouvelle fonction de transition"
){
//liste_voisinage->addItem("--- select ---");
liste_voisinage
->
addItem
(
"Voisinage de Moore"
);
liste_voisinage
->
addItem
(
"Voisinage de von Neumann"
);
...
...
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