Skip to content

Commit

Permalink
Merge branch 'test-mode' of github.com:RoboJackets/robocup-software i…
Browse files Browse the repository at this point in the history
…nto test-mode
  • Loading branch information
jvogt23 committed Dec 9, 2024
2 parents c84a54a + a501d4e commit 2673072
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions soccer/src/soccer/ui/main_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ void MainWindow::updateDebugLayers(const LogFrame& frame) {
* The following methods are event listeners for the manual position assignments.
* In the QT5 event handling system, these methods are automatically connected to the
* QObject with the relevant name due to their naming scheme and their labels as Q_SLOT functions.
*
*
* For this reason, all of these methods are REQUIRED by the UI - Consolidating them into one method
* produces unnecessary complications.
*/
Expand Down Expand Up @@ -1211,7 +1211,6 @@ void MainWindow::on_positionReset_14_clicked() { onResetButtonClicked(14); }

void MainWindow::on_positionReset_15_clicked() { onResetButtonClicked(15); }


void MainWindow::on_robotPosition_0_currentIndexChanged(int value) {
onPositionDropdownChanged(0, value);
}
Expand Down
3 changes: 1 addition & 2 deletions soccer/src/soccer/ui/main_window.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ private Q_SLOTS:
void on_positionReset_13_clicked();
void on_positionReset_14_clicked();
void on_positionReset_15_clicked();


Q_SIGNALS:
// signal used to let widgets that we're viewing a different log frame now
Expand All @@ -222,7 +221,7 @@ private Q_SLOTS:
Processor* const _processor;
bool _has_external_ref;

int current_goalie_num_ {0};
int current_goalie_num_{0};

// Log history, copied from Logger.
// This is used by other controls to get log data without having to copy it
Expand Down

0 comments on commit 2673072

Please sign in to comment.