kvuj/GPA675Lab1GOL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pattern apparait. Toujours un problème de gestion de mémoire qui fait planter. Surement un delete[]à faire

Browse Source
This commit is contained in:
LerPetitCarcajou 2024-02-01 10:08:25 -05:00
parent 34853011cd
commit e52a998e84
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
GPA675Lab1GOL/GOLTeamH.cpp
View File

@ -354,7 +354,6 @@ bool GOLTeamH::setFromPattern(std::string const& pattern)
int centerY = (mData.height() - sq.value().height)/2; int centerY = (mData.height() - sq.value().height)/2;
fillDataFromPattern(pattern, sq.value(),centerX+1, centerY+1); fillDataFromPattern(pattern, sq.value(),centerX+1, centerY+1);
mIteration = 0; mIteration = 0;
countLifeStatusCells(); countLifeStatusCells();
@ -564,14 +563,9 @@ void GOLTeamH::fillDataFromPattern(std::string const& pattern, sizeQueried& sq,
// Coordonnées dans la grille de destination // Coordonnées dans la grille de destination
int destX = centerX + x; int destX = centerX + x;
int destY = centerY + y; int destY = centerY + y;
/*if (centerX - sq.width / 2 + x <0
|| centerX - sq.width / 2 + x > mData.width()
|| centerY - sq.height / 2 + x <0
|| centerY - sq.height / 2 + x > mData.height()) {
continue;
}*/
// Vérifier si les coordonnées sont dans la grille // Vérifier si les coordonnées sont dans la grille
if (destX >= 0 || destX < mData.width()-1 || destY >= 0 || destY < mData.height()-1) { if (destX >= 0 || destX < mData.width() || destY >= 0 || destY < mData.height()) {
// On remplit la grille avec les valeurs du pattern // On remplit la grille avec les valeurs du pattern
State cellState = (sq.pos[(y * sq.width) + x] == '0') ? State::dead : State::alive; State cellState = (sq.pos[(y * sq.width) + x] == '0') ? State::dead : State::alive;
mData.setAt(destX, destY, cellState); mData.setAt(destX, destY, cellState);
@ -582,6 +576,7 @@ void GOLTeamH::fillDataFromPattern(std::string const& pattern, sizeQueried& sq,
} }
} }
} }
void GOLTeamH::countLifeStatusCells() void GOLTeamH::countLifeStatusCells()