Feature/remove interface #1204

rolfvdhulst · 2021-02-22T21:04:26Z

No description provided.

Yuhanun · 2021-03-24T11:56:35Z

src/AI.cpp

+#include "stp/plays/TimeOut.h"
+
+rtt::AI::AI() {
+  plays = std::vector<std::unique_ptr<rtt::ai::stp::Play>>{};


Redundant line

Yuhanun · 2021-03-24T11:57:55Z

src/ApplicationManager.cpp

+  rtt::ai::Constants::init();
+
+
+  rtt::SETTINGS.setVisionIp("127.0.0.1");


this is still global?

I'm still refactoring it.

Yuhanun · 2021-03-24T12:00:02Z

src/roboteam_ai.cpp

+    bool result = a.exec();
+    return result;


Suggested change

bool result = a.exec();

return result;

return a.exec();

Yuhanun

There's a lot of lines that were commented out cuz they're draw calls which is fine, but we'll have to replace those at some point, maybe turn them into TODO's.

Apart from that it seems fine, I haven't tested it but if it works then it works, spacing is off sometimes but I'll just clang-format the entire codebase after new UI.

Yuhanun · 2021-05-13T11:03:58Z

include/roboteam_ai/world/World.hpp

-     * Pointer to GUI settings
-     */
-    Settings *settings;
+    bool we_are_yellow;


Is this where this should be?

Yuhanun · 2021-05-13T11:06:05Z

src/AI.cpp

+  if(state.has_referee()){
+    auto referee = state.referee();
+
+    roboteam_utils::rotate(&referee); //this only rotates the ball placement marker.


Why is this not rtt;;utils?

Yuhanun · 2021-05-13T11:08:12Z

src/AI.cpp

+    {
+      // Our name as specified by ssl-game-controller : https://github.com/RoboCup-SSL/ssl-game-controller/blob/master/config/engine.yaml
+      //make sure this matches exactly!
+      std::string ROBOTEAM_TWENTE = "RoboTeam Twente";


Can this not be in config.hpp or smth?

Yuhanun · 2021-05-13T11:08:55Z

src/AI.cpp

+        onSideOrColorChanged();
+      }
+    }
+    ai::GameStateManager::setRefereeData(referee, world.get(),settings); //TODO: fix world *


What's wrong with world?

Yuhanun · 2021-05-13T11:09:49Z

src/AISettings.cpp

+}
+
+std::string AISettings::name() const {
+  return "ai"+std::to_string(id);


Suggested change

return "ai"+std::to_string(id);

return "ai" + std::to_string(id);

Yuhanun · 2021-05-13T11:19:53Z

src/utilities/IOManager.cpp

  //first receive any setting changes
  bool received = true;
  int numReceivedMessages = 0;
+  stx::Result<proto::UiValues, std::string> last_message = stx::Err(std::string(""));


🤔 I really thought i was the only one using Result types, im so proud.

Yuhanun · 2021-05-13T11:22:58Z

src/world/World.cpp

+        std::vector<Vector2> positions{};
+        positionControl.setRobotPositions(positions);


Suggested change

std::vector<Vector2> positions{};

positionControl.setRobotPositions(positions);

positionControl.setRobotPositions({});

Yuhanun · 2021-05-13T11:23:20Z

src/world/World.cpp

@@ -98,9 +98,15 @@ namespace rtt::world {
    }

    void World::updatePositionControl() {
+      if(!getWorld()->getRobotsNonOwning().empty()){
        std::vector<Vector2> robotPositions(getWorld()->getRobotsNonOwning().size());
        std::transform(getWorld()->getRobotsNonOwning().begin(), getWorld()->getRobotsNonOwning().end(), robotPositions.begin(), [](const auto& robot) -> Vector2 { return (robot->getPos()); });


Can't we uhhh, &Robot::getPos?

Yuhanun · 2021-05-13T11:24:18Z

src/utilities/GameStateManager.cpp

+    if (settings.isYellow()) {
+      keeperID = refMsg.yellow().goalkeeper();
+    } else {
+      keeperID = refMsg.blue().goalkeeper();
+    }


Suggested change

if (settings.isYellow()) {

keeperID = refMsg.yellow().goalkeeper();

} else {

keeperID = refMsg.blue().goalkeeper();

}

keeperID = (settings.isYellow() ? refMsg.yellow() : refMsg.blue()).goalkeeper();

Yuhanun · 2021-05-13T11:24:44Z

src/utilities/GameStateManager.cpp

        // if there is a ref we set the interface gamestate to these values as well
        // this makes sure that when we stop using the referee we don't return to an unknown state,
        // // so now we keep the same.
-        interface::Output::setInterfaceGameState(newGameState);
+       interface_gamestate=newGameState;


Suggested change

interface_gamestate=newGameState;

interface_gamestate = newGameState;

JaroKuiken

Couldn't find something majorly wrong STP-wise, so lets hope thats true

# Conflicts: # CMakeLists.txt # include/roboteam_ai/ApplicationManager.h # include/roboteam_ai/control/ControlModule.h # include/roboteam_ai/interface/widgets/MainControlsWidget.h # include/roboteam_ai/interface/widgets/ManualControlWidget.h # include/roboteam_ai/interface/widgets/PidBox.h # include/roboteam_ai/interface/widgets/PidsWidget.h # include/roboteam_ai/interface/widgets/RobotsWidget.h # include/roboteam_ai/interface/widgets/STPVisualizerWidget.h # include/roboteam_ai/interface/widgets/widget.h # include/roboteam_ai/stp/Play.hpp # include/roboteam_ai/world/WorldData.hpp # src/ApplicationManager.cpp # src/control/ControlModule.cpp # src/control/positionControl/PositionControl.cpp # src/interface/api/Output.cpp # src/interface/widgets/GraphWidget.cpp # src/interface/widgets/PlaysWidget.cpp # src/interface/widgets/STPVisualizerWidget.cpp # src/interface/widgets/SettingsWidget.cpp # src/interface/widgets/widget.cpp # src/manual/JoystickManager.cpp # src/roboteam_ai.cpp # src/stp/Play.cpp # src/utilities/GameStateManager.cpp # src/utilities/IOManager.cpp # src/utilities/Pause.cpp # src/utilities/Settings.cpp # src/world/Ball.cpp

… implementing

…declaration parsing

…re the single source of truth anyways/don't need to react.

…f statement * Make sure declarations have state change status while values do not

rolfvdhulst added 18 commits February 15, 2021 23:41

Refactor Playdecider to be less static

3893533

remove IOManager global

1994784

Remove interface input visualizations

3a565bd

Remove ruleset widget

ab85b4e

Remove playswidget

c7046c5

Remove stp visualization widget

0103d93

Remove robotswidget

ef01485

Remove toggles and visualization settings

9ded68d

fix outdated appmanager constructor

447e051

Remove visualization widget

cd24d6f

Remove unused statics

5d262bc

Remove PID boxes

97fe252

Remove pid set functions

6e4365b

Remove pid set functions

016ceab

remove menu

5a562b9

remove marker

a0904fa

Remove timeout at top

d7ea936

Start removing settings global

4cabe2d

Yuhanun reviewed Mar 24, 2021

View reviewed changes

rolfvdhulst added 9 commits March 29, 2021 23:56

More changes, refactoring settings

ac299f0

move more things to the AI

0983749

Remove Output

7c34df6

Add initial button declarations

acf8e89

Send ai button declarations as well

d94525a

Add application settings functions

58ba2a6

More error checking

0f518e8

Finalize sending all settings to central server

f6fd954

Testing, only send declarations

402e633

Yuhanun reviewed May 13, 2021

View reviewed changes

JaroKuiken reviewed Jun 1, 2021

View reviewed changes

daw1012345 added 14 commits August 4, 2021 11:40

Fix merge errors and get it to compile

9aeff23

Gut Qt5 out of AI for good

8250f83

Lay out basic structure of a more versatile basic interface and begin…

7694cc9

… implementing

Implement data structures for the interface

f932cfc

Fix compilation errors and finish basic implementation

b3b6a5d

Move shared interface components to roboteam_interface and test json …

6adfc60

…declaration parsing

Load interface declarations from JSON file

aebe172

Add test interface declarations

3c8c919

Modify controller to only register changes in declarations since we a…

626924b

…re the single source of truth anyways/don't need to react.

Only send settings when declarations changed

9502dec

* Remove incorrect error message that was kept after refactoring an i…

f8afb9d

…f statement * Make sure declarations have state change status while values do not

* Fix AI SIGSEGV when roboteam_observer is not running

ab32e34

* Add basic interface rendeding capability

59fafbb

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/remove interface #1204

Feature/remove interface #1204

rolfvdhulst commented Feb 22, 2021

Yuhanun Mar 24, 2021

Yuhanun Mar 24, 2021

rolfvdhulst Mar 30, 2021

Yuhanun Mar 24, 2021 •

edited

Loading

Yuhanun left a comment

Yuhanun May 13, 2021

Yuhanun May 13, 2021

Yuhanun May 13, 2021

Yuhanun May 13, 2021

Yuhanun May 13, 2021

Yuhanun May 13, 2021

Yuhanun May 13, 2021

Yuhanun May 13, 2021

Yuhanun May 13, 2021

Yuhanun May 13, 2021

JaroKuiken left a comment

		rtt::ai::Constants::init();


		rtt::SETTINGS.setVisionIp("127.0.0.1");

	return "ai"+std::to_string(id);
	return "ai" + std::to_string(id);

		std::vector<Vector2> positions{};
		positionControl.setRobotPositions(positions);

	std::vector<Vector2> positions{};
	positionControl.setRobotPositions(positions);
	positionControl.setRobotPositions({});

	interface_gamestate=newGameState;
	interface_gamestate = newGameState;

Feature/remove interface #1204

Are you sure you want to change the base?

Feature/remove interface #1204

Conversation

rolfvdhulst commented Feb 22, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Yuhanun Mar 24, 2021 • edited Loading

Choose a reason for hiding this comment

Yuhanun left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JaroKuiken left a comment

Choose a reason for hiding this comment

Yuhanun Mar 24, 2021 •

edited

Loading