Revision 11bb78c2 scout/scoutsim/src/sim_frame.h

View differences:

scout/scoutsim/src/sim_frame.h
93 93
#define TELEOP_PRECISE 1
94 94
#define TELEOP_FLUID 2
95 95

  
96
//Scout DImensions
97
#define SCOUT_H 0.25
98
#define SCOUT_W 0.125
99

  
96 100
namespace scoutsim
97 101
{
98 102
    class SimFrame : public wxFrame
......
149 153

  
150 154
            void wirelessCallback(const messages::WirelessPacket::ConstPtr& msg);
151 155
            bool is_inrange(geometry_msgs::Pose2D scout_pos, 
152
                         geometry_msgs::Pose2D emitter_pos);
156
                         geometry_msgs::Pose2D emitter_pos,
157
                         double aperture, double distance);
153 158
            void checkBOM(geometry_msgs::Pose2D scout_pos,
154 159
                          M_Scout::iterator it); 
155 160
                         // std::map<std::string, EmitterPtr>::iterator m_it,
......
159 164
            ros::Subscriber wireless_send;
160 165
            ros::Publisher wireless_receive;
161 166

  
162
            //emitter
163
            float em_aperture;
164
            int em_distance;
165

  
166 167
            // Teleop
167 168
            short teleop_l_speed;
168 169
            short teleop_r_speed;
......
205 206
            float width_in_meters;
206 207
            float height_in_meters;
207 208

  
209
            //Emitter default values
210
            double em_aperture;
211
            double em_distance;
212

  
213

  
208 214
            std::string map_base_name;
209 215
            std::string map_lines_name;
210 216
            std::string map_walls_name;

Also available in: Unified diff