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
3751cc2f
Verified
Commit
3751cc2f
authored
Jun 10, 2021
by
Romain De Laage De Bellefaye
🌳
Browse files
Merge branch 'master' of gitlab.utc.fr:rdelaage/lo21-projet
parents
1235ab97
995fc40b
Changes
2
Hide whitespace changes
Inline
Side-by-side
includes/parametragemodele.h
View file @
3751cc2f
...
...
@@ -49,6 +49,7 @@ class NouveauModele : public QWidget {
QLabel
*
seuilMin
;
QLabel
*
destination
;
QLabel
*
etatCourant
;
QLabel
*
etatCourant2
;
QComboBox
*
valid_Etat
;
QSpinBox
*
numEtatCourant
;
...
...
src/parametragemodele.cpp
View file @
3751cc2f
...
...
@@ -65,6 +65,7 @@ NouveauModele::NouveauModele(QWidget* parent) : QWidget() {
bouton_valide
=
new
QPushButton
(
"Valider"
);
bouton_valide
->
setFixedWidth
(
50
);
//connect(bouton_valide, SIGNAL(clicked()), SLOT(affParametrage()));
//ajout regle :
...
...
@@ -80,11 +81,6 @@ NouveauModele::NouveauModele(QWidget* parent) : QWidget() {
form_choix
->
addWidget
(
bouton_valide
);
general
->
addWidget
(
fenetre_init
,
0
,
0
,
9
,
1
);
//définition de la frame contenant la grille de sélection du voisinage
...
...
@@ -150,69 +146,67 @@ void NouveauModele::paramRegle(const QString& choix_regle) {
valid_Etat
->
addItem
(
"Non"
);
valid_Etat
->
setCurrentIndex
(
-
1
);
QVBoxLayout
*
layoutv
=
new
QVBoxLayout
;
QHBoxLayout
*
layouth1
=
new
QHBoxLayout
;
QHBoxLayout
*
layouth2
=
new
QHBoxLayout
;
QHBoxLayout
*
layouth3
=
new
QHBoxLayout
;
QHBoxLayout
*
layouth4
=
new
QHBoxLayout
;
if
(
choix_regle
==
"Nouvelle fonction de transition"
)
{
seuilValidator
=
new
QIntValidator
;
seuilValidator
->
setRange
(
0
,
1
);
/*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
(
layoutv
);
layoutv
->
addLayout
(
layouth1
);
layouth1
->
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
);
layouth1
->
addWidget
(
numSeuilMin
[
i
]);
}
layoutv
->
addLayout
(
layouth2
);
layouth2
->
addWidget
(
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
);
layouth2
->
addWidget
(
numSeuilMax
[
i
]);
}
layoutv
->
addLayout
(
layouth3
);
layouth3
->
addWidget
(
destination
);
layouth3
->
addWidget
(
etatDest
);
layoutv
->
addLayout
(
layouth4
);
layouth4
->
addWidget
(
etatCourant
);
layouth4
->
addWidget
(
valid_Etat
);
connect
(
valid_Etat
,
SIGNAL
(
currentTextChanged
(
const
QString
&
)),
this
,
SLOT
(
choisirEtatCourant
(
const
QString
&
)));
seuilValidator
->
setRange
(
0
,
1
);
QVBoxLayout
*
layoutv
=
new
QVBoxLayout
;
QHBoxLayout
*
layouth1
=
new
QHBoxLayout
;
QHBoxLayout
*
layouth2
=
new
QHBoxLayout
;
QHBoxLayout
*
layouth3
=
new
QHBoxLayout
;
QHBoxLayout
*
layouth4
=
new
QHBoxLayout
;
form_choix
->
addRow
(
layoutv
);
layoutv
->
addLayout
(
layouth1
);
layouth1
->
addWidget
(
seuilMin
);
for
(
unsigned
int
i
=
0
;
i
<
8
;
i
++
)
{
numSeuilMin
[
i
]
=
new
QLineEdit
;
numSeuilMin
[
i
]
->
setFixedWidth
(
22
);
numSeuilMin
[
i
]
->
setMaxLength
(
2
);
numSeuilMin
[
i
]
->
setText
(
"-1"
);
numSeuilMin
[
i
]
->
setValidator
(
seuilValidator
);
layouth1
->
addWidget
(
numSeuilMin
[
i
]);
}
layoutv
->
addLayout
(
layouth2
);
layouth2
->
addWidget
(
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
);
layouth2
->
addWidget
(
numSeuilMax
[
i
]);
}
layoutv
->
addLayout
(
layouth3
);
layouth3
->
addWidget
(
destination
);
layouth3
->
addWidget
(
etatDest
);
layoutv
->
addLayout
(
layouth4
);
layouth4
->
addWidget
(
etatCourant
);
layouth4
->
addWidget
(
valid_Etat
);
connect
(
valid_Etat
,
SIGNAL
(
currentTextChanged
(
const
QString
&
)),
this
,
SLOT
(
choisirEtatCourant
(
const
QString
&
)));
}
}
void
NouveauModele
::
choisirEtatCourant
(
const
QString
&
validEtat
){
if
(
validEtat
==
"Oui"
){
numEtatCourant
=
new
QSpinBox
;
numEtatCourant
->
setRange
(
1
,
8
);
etatCourant2
=
new
QLabel
(
"Etat Courant : "
);
QHBoxLayout
*
layout
=
new
QHBoxLayout
;
form_choix
->
addRow
(
layout
);
layout
->
addWidget
(
etatCourant
);
layout
->
addWidget
(
numEtatCourant
);
if
(
validEtat
==
"Oui"
){
numEtatCourant
=
new
QSpinBox
;
numEtatCourant
->
setRange
(
1
,
8
);
layout
->
addWidget
(
etatCourant
);
layout
->
addWidget
(
numEtatCourant
);
}
else
{
delete
layout
;
}
}
...
...
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