Skip to content

Fix some bugs in griddisplay #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bretsky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix some bugs in griddisplay #223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions code/gui/griddisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,21 +108,29 @@ void GridDisplay::button_clicked(int x, int y) {
m_square_selected[m_start_position.x()][m_start_position.y()] = NOT_SELECTED_WEIGHT;
m_button[m_start_position.x()][m_start_position.y()]->setBrush(m_default_brush);
}
m_square_selected[x][y] = START_WEIGHT;
m_button[x][y]->setBrush(m_start_brush);
m_start_position = {x, y};
log() << "Robot Start Position (" << x << "," << y << ") = " << m_square_selected[x][y];
if (m_start_position.x() != x && m_start_position.y() != y) {
m_square_selected[x][y] = START_WEIGHT;
m_button[x][y]->setBrush(m_start_brush);
m_start_position = {x, y};
log() << "Robot Start Position (" << x << "," << y << ") = " << m_square_selected[x][y];
} else {
m_start_position = {NOT_SELECTED_WEIGHT, NOT_SELECTED_WEIGHT};
}
} else if (m_end_pos_selected) {
// Executes if another end position was previously selected
if (m_end_position.x() != NOT_SELECTED_WEIGHT &&
m_end_position.y() != NOT_SELECTED_WEIGHT) {
m_square_selected[m_end_position.x()][m_end_position.y()] = NOT_SELECTED_WEIGHT;
m_button[m_end_position.x()][m_end_position.y()]->setBrush(m_default_brush);
}
m_square_selected[x][y] = END_WEIGHT;
m_button[x][y]->setBrush(m_end_brush);
m_end_position = {x, y};
log() << "Robot End Position (" << x << "," << y << ") = " << m_square_selected[x][y];
if (m_end_position.x() != x && m_end_position.y() != y) {
m_square_selected[x][y] = END_WEIGHT;
m_button[x][y]->setBrush(m_end_brush);
m_end_position = {x, y};
log() << "Robot End Position (" << x << "," << y << ") = " << m_square_selected[x][y];
} else {
m_end_position = {NOT_SELECTED_WEIGHT, NOT_SELECTED_WEIGHT};
}
} else if (
m_square_selected[x][y] > NOT_SELECTED_WEIGHT ||
m_square_selected[x][y] == START_WEIGHT ||
Expand Down Expand Up @@ -207,8 +215,8 @@ void GridDisplay::hide_grid() {

void GridDisplay::select_robot_position(QString weight_selected) {
// TODO: Use enum instead of strings
m_start_pos_selected = (weight_selected == "Start Configuration");
m_end_pos_selected = (weight_selected == "End Configuration");
m_start_pos_selected = (weight_selected == "Object Starting Position");
m_end_pos_selected = (weight_selected == "Object Target Position");
}

void GridDisplay::init_start_end_pos() {
Expand Down