Commit 3a2516b1 authored by Anthony Noir's avatar Anthony Noir
Browse files

Merge branch 'master' of...

Merge branch 'master' of https://gitlab.utc.fr/lo21_pin_noir_boucher_bouri_detree/cellulutlo21 into master
parents 9274ae69 13c0d102
Pipeline #79249 canceled with stage
......@@ -267,6 +267,20 @@ public:
}
}
//! \brief Retourne les coordonées comme un Neighborhood, les cellules voisines étant d'état 1
Neighborhood to_neighborhood() const
{
Neighborhood n;
for (const auto& ptr : contents)
{
Property& prop = *ptr;
CoordinateProperty& coord_p = static_cast<CoordinateProperty&>(prop);
n.addNeighbor(coord_p.c, 1);
}
return n;
}
public:
//! \brief Vrai si la liste est extensible, faux si elle est fixe.
const bool dynamic;
......
......@@ -507,10 +507,10 @@ void MainWindow::ui_update_alphabet(const Alphabet &alpha)
{
ui->grid_view->set_alphabet(alpha);
ui->nbrStateComboBox->clear();
std::cout << alpha.taille() << endl;
fflush(stdout);
for (unsigned i = 0; i < alpha.taille(); ++i)
ui->nbrStateComboBox->addItem(QString::number(i));
ui->nbrStatesComboBox->clear();
ui->nbrStatesComboBox->addItem(QString::number(alpha.taille()));
}
void MainWindow::save_grid_configuration()
......
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