Revision 0e143737 scout/scoutsim/src/sim_frame.h

View differences:

scout/scoutsim/src/sim_frame.h
65 65
#include <map>
66 66

  
67 67
#include "scout.h"
68
#include "emitter.h"
68 69
#include "ghost_scout.h"
69 70
#include "scoutsim_internal.h"
70 71
#include "messages/WirelessPacket.h"
......
102 103

  
103 104
            std::string spawnScout(const std::string& name,
104 105
                    float x, float y, float angle);
106
            std::string spawnEmitter(const std::string& name,
107
                    float x, float y, float angle);
105 108

  
106 109
            void onQuit(wxCommandEvent& event);
107 110
            void onAbout(wxCommandEvent& event);
......
117 120

  
118 121
        private:
119 122

  
123
            typedef std::map<std::string, ScoutPtr> M_Scout;
124
            typedef std::map<std::string, EmitterPtr> M_Emitter;
125

  
120 126
            void onUpdate(wxTimerEvent& evt);
121 127
            void onPaint(wxPaintEvent& evt);
122 128

  
......
129 135
            void updateScouts();
130 136
            void clear();
131 137
            bool hasScout(const std::string& name);
138
            bool hasEmitter(const std::string& name);
132 139

  
133 140
            bool clearCallback(std_srvs::Empty::Request&, std_srvs::Empty::Response&);
134 141
            bool resetCallback(std_srvs::Empty::Request&, std_srvs::Empty::Response&);
135 142
            bool spawnCallback(Spawn::Request&, Spawn::Response&);
143
            bool spawnEmCallback(Spawn::Request&, Spawn::Response&);
136 144
            bool killCallback(Kill::Request&, Kill::Response&);
137 145

  
138 146
            bool setSonarVizCallback(SetSonarViz::Request&, SetSonarViz::Response&);
......
140 148
            bool setTeleopCallback(SetTeleop::Request&, SetTeleop::Response&);
141 149

  
142 150
            void wirelessCallback(const messages::WirelessPacket::ConstPtr& msg);
151
            void readBOM(); 
152

  
143 153

  
144 154
            ros::Subscriber wireless_send;
145 155
            ros::Publisher wireless_receive;
146 156

  
157
            //emitter
158
            float em_aperture;
159
            int em_distance;
160

  
147 161
            // Teleop
148 162
            short teleop_l_speed;
149 163
            short teleop_r_speed;
......
170 184
            ros::ServiceServer clear_srv;
171 185
            ros::ServiceServer reset_srv;
172 186
            ros::ServiceServer spawn_srv;
187
            ros::ServiceServer spawn_em_srv;
173 188
            ros::ServiceServer kill_srv;
174 189
            ros::ServiceServer set_sonar_viz_srv;
175 190
            ros::ServiceServer set_ghost_srv;
176 191
            ros::ServiceServer set_teleop_srv;
177 192

  
178
            typedef std::map<std::string, ScoutPtr> M_Scout;
179 193
            M_Scout scouts;
194
            M_Emitter emitters;
180 195
            std::vector<GhostScout*> ghost_scouts;
181 196
            uint32_t id_counter;
182 197

  

Also available in: Unified diff