# include <config.h>
#endif
-#include <simgear/misc/props.hxx>
+#include <simgear/props/props.hxx>
#include <Include/general.hxx>
#include <Main/fg_props.hxx>
FGATCDisplay::FGATCDisplay() {
rep_msg = false;
change_msg_flag = false;
- dsp_offset1 = 0;
- dsp_offset2 = 0;
+ dsp_offset1 = 0.0;
+ dsp_offset2 = 0.0;
}
guiFnt.drawString( m.msg.c_str(),
int(iwidth - 10 - m.dsp_offset),
(iheight - 40) );
- ++m.counter;
+ m.counter += dt;
m.dsp_offset += (80.0/fps);
msgList[i] = m;
++msgList_itr;
++i;
} else {
//cout << "Not yet started single message\n";
- ++m.counter;
+ m.counter += dt;
msgList[i] = m;
++msgList_itr;
++i;
//cout << "Stopping single message\n";
msgList_itr = msgList.erase(msgList_itr);
} else if(m.counter > m.start_count) {
- guiFnt.drawString( m.msg.c_str(),
- (iwidth - (m.msg.size() * 8))/2,
- //iwidth/2,
- (iheight - 40) ); // TODO - relate the distance in that the string is rendered to the string length.
- ++m.counter;
+ int pin = (((int)m.msg.size() * 8) >= iwidth ? 5 : (iwidth - (m.msg.size() * 8))/2);
+ //cout << m.msg << '\n';
+ //cout << "pin = " << pin << ", iwidth = " << iwidth << ", msg.size = " << m.msg.size() << '\n';
+ guiFnt.drawString( m.msg.c_str(), pin, (iheight - 40) );
+ m.counter += dt;
msgList[i] = m;
++msgList_itr;
++i;
} else {
- ++m.counter;
+ m.counter += dt;
msgList[i] = m;
++msgList_itr;
++i;
}
}
-void FGATCDisplay::RegisterSingleMessage(string msg, int delay) {
+void FGATCDisplay::RegisterSingleMessage(string msg, double delay) {
+ //cout << msg << '\n';
atcMessage m;
m.msg = msg;
m.repeating = false;
- m.counter = 0;
- m.start_count = delay * 30; // Fixme - need to use actual FPS
- m.stop_count = m.start_count + 400; // Display for 3 - 5 seconds for now - this might have to change eg. be related to length of message in future
+ m.counter = 0.0;
+ m.start_count = delay;
+ m.stop_count = m.start_count + 5.0; // Display for 5ish seconds for now - this might have to change eg. be related to length of message in future
//cout << "m.stop_count = " << m.stop_count << '\n';
m.id = 0;
m.dsp_offset = 0.0;