Verified Commit 80648dc0 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 ac9f23cc e015b564
Pipeline #79766 passed with stage
in 16 seconds
......@@ -86,6 +86,10 @@ class AutoCell : public QWidget
QWidget* win_grid;
QTableWidget* grid;
//notice
std::unique_ptr<QWidget> fenetre_notice;
std::unique_ptr<QLabel> lab_notice;
explicit AutoCell(QWidget* parent=nullptr);
friend class NouveauModele;
public:
......@@ -140,6 +144,8 @@ class AutoCell : public QWidget
void setMatriceTorique(int val);
/// Revenir au réseau initial
void reinitialiserSimulation();
///Afficher la notice d'utilisation
void afficherNotice();
};
#endif // AUTOCELL_H
......@@ -217,6 +217,8 @@ this->setWindowTitle("Automate cellulaire");
win_grid = new QWidget;
grid = new QTableWidget(0,0,win_grid);
afficherNotice();
};
void AutoCell::afficherGrille(const Reseau* grille)
......@@ -450,3 +452,11 @@ void AutoCell::reinitialiserSimulation()
afficherGrille(&Automate::getInstance().getReseauInit());
}
void AutoCell::afficherNotice(){
fenetre_notice.reset(new QWidget);
fenetre_notice.get()->setMinimumWidth(1000);
fenetre_notice->setWindowTitle("Notice");
QString str_notice("test");
lab_notice.reset(new QLabel(str_notice, fenetre_notice.get()));
fenetre_notice.get()->show();
};
......@@ -471,7 +471,7 @@ void NouveauModele::validerParametrage(){
void NouveauModele::changerRegle(){
if (liste_regle_transition != nullptr) form_choix->removeRow(6);
if (liste_regle_transition != nullptr) form_choix->removeRow(8);
liste_regle_transition = new QComboBox;
liste_regle_transition->setPlaceholderText("--- select ---");
......
Markdown is supported
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