Project

General

Profile

Revision 447

broken checkin for robot position stuff

View differences:

trunk/code/projects/colonet/ColonetServer/Command.cpp
19 19

  
20 20
#include <Command.h>
21 21
#include <ConnectionPool.h>
22
#include <map>
23
#include <vision.h>
22 24

  
25
using namespace std;
26

  
23 27
Command::Command(ConnectionPool * connection_pool_temp) {
24 28
  connection_pool = connection_pool_temp;
25 29
}
......
274 278

  
275 279
int Command::parse_request_robot_positions(int pool_index) {
276 280
  printf("TODO - parse_request_robot_positions\n");
281
  
282
  map<int, VisionPosition> positions = colonet_server.getPositionMonitor()->getAllRobotPositions();
283

  
277 284
  return 0;
278 285
}
279 286

  
trunk/code/projects/colonet/ColonetServer/includes/PositionMonitor.h
9 9
#ifndef POSITIONMONITOR_H
10 10
#define POSITIONMONITOR_H
11 11

  
12
#include <map>
12 13
#include <vision.h>
13 14

  
14 15
#define MAX_POSITIONS 20
15 16

  
17
using namespace std;
18

  
16 19
class PositionMonitor {
17 20
 public:
18
  PositionMonitor();
19
  ~PositionMonitor();
21
  PositionMonitor(void);
22
  ~PositionMonitor(void);
20 23

  
21
  int startMonitoring();
22
  int stopMonitoring();
23
  int getPositions();
24
  int startMonitoring(void);
25
  int stopMonitoring(void);
26
  int updatePositions(void);
27

  
28
  map<int, VisionPosition> getAllRobotPositions(void);
24 29
  int getRobotPosition(int robot_id, int* xbuf, int* ybuf);
25 30

  
26 31
 private:
trunk/code/projects/colonet/ColonetServer/includes/Command.h
8 8
#ifndef COMMAND_H
9 9
#define COMMAND_H
10 10

  
11
#include "ConnectionPool.h"
11
#include <ConnectionPool.h>
12
#include <list>
12 13

  
13 14
class Command {
14 15
 public:
trunk/code/projects/colonet/ColonetServer/PositionMonitor.cpp
30 30
  return 0;
31 31
}
32 32

  
33
int PositionMonitor::getPositions() {
33
int PositionMonitor::updatePositions() {
34 34
  if (positions)
35 35
    free(positions);
36 36

  
......
40 40
  return 0;
41 41
}
42 42

  
43
map<int, VisionPosition> PositionMonitor::getAllRobotPositions() {
44
  return positionMap;
45
}
46

  
43 47
int PositionMonitor::getRobotPosition(int robot_id, int* xbuf, int* ybuf) {
44 48
  // TODO - fill this in.
45 49
  

Also available in: Unified diff