gse/gps-gse gse/include/gui_speedo.h gse/src/gui_speedo.cpp gps-gse @@ -777,6 +777,57 @@ <event name="OnUpdateUI"></event> </object> </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">0</property> + <object class="wxToggleButton" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">ID_SPEEDO_B</property> + <property name="label">Speedometer</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">bSpeedo</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="value">0</property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnToggleButton"></event> + <event name="OnUpdateUI"></event> + </object> + </object> </object> </object> <object class="sizeritem" expanded="1"> @@ -15004,5 +15055,596 @@ </object> </object> </object> + <object class="Frame" expanded="1"> + <property name="bg"></property> + <property name="center"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="extra_style"></property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">iGUI_Speedo</property> + <property name="pos"></property> + <property name="size">600,500</property> + <property name="style">wxDEFAULT_FRAME_STYLE</property> + <property name="subclass"></property> + <property name="title">Speedometer</property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxTAB_TRAVERSAL</property> + <property name="xrc_skip_sizer">1</property> + <event name="OnActivate"></event> + <event name="OnActivateApp"></event> + <event name="OnChar"></event> + <event name="OnClose"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnHibernate"></event> + <event name="OnIconize"></event> + <event name="OnIdle"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + <object class="wxBoxSizer" expanded="1"> + <property name="minimum_size"></property> + <property name="name">bSizer107</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxBoxSizer" expanded="1"> + <property name="minimum_size"></property> + <property name="name">bSizer116</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxStaticBoxSizer" expanded="1"> + <property name="id">wxID_ANY</property> + <property name="label">Speed</property> + <property name="minimum_size"></property> + <property name="name">sbSizer18</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <event name="OnUpdateUI"></event> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxPanel" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">pspeed</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxTAB_TRAVERSAL</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxStaticBoxSizer" expanded="1"> + <property name="id">wxID_ANY</property> + <property name="label">???</property> + <property name="minimum_size"></property> + <property name="name">sbSizer43</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <event name="OnUpdateUI"></event> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxPanel" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">pdist</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxTAB_TRAVERSAL</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + </object> + </object> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxBoxSizer" expanded="1"> + <property name="minimum_size"></property> + <property name="name">bSizer109</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxGridSizer" expanded="1"> + <property name="cols">3</property> + <property name="hgap">0</property> + <property name="minimum_size"></property> + <property name="name">gSizer5</property> + <property name="permission">none</property> + <property name="rows">2</property> + <property name="vgap">0</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxStaticBoxSizer" expanded="1"> + <property name="id">wxID_ANY</property> + <property name="label">Overall Avg</property> + <property name="minimum_size"></property> + <property name="name">sbSizer235</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <event name="OnUpdateUI"></event> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxPanel" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">pstop1</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxTAB_TRAVERSAL</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxStaticBoxSizer" expanded="1"> + <property name="id">wxID_ANY</property> + <property name="label">Moving Avg</property> + <property name="minimum_size"></property> + <property name="name">sbSizer23</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <event name="OnUpdateUI"></event> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxPanel" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">pmavg</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxTAB_TRAVERSAL</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxStaticBoxSizer" expanded="1"> + <property name="id">wxID_ANY</property> + <property name="label">Max Speed</property> + <property name="minimum_size"></property> + <property name="name">sbSizer231</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <event name="OnUpdateUI"></event> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxPanel" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">pmax</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxTAB_TRAVERSAL</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxStaticBoxSizer" expanded="1"> + <property name="id">wxID_ANY</property> + <property name="label">Total Time</property> + <property name="minimum_size"></property> + <property name="name">sbSizer232</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <event name="OnUpdateUI"></event> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxPanel" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">pttime</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxTAB_TRAVERSAL</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxStaticBoxSizer" expanded="1"> + <property name="id">wxID_ANY</property> + <property name="label">Moving Time</property> + <property name="minimum_size"></property> + <property name="name">sbSizer233</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <event name="OnUpdateUI"></event> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxPanel" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">pmtime</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxTAB_TRAVERSAL</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxStaticBoxSizer" expanded="1"> + <property name="id">wxID_ANY</property> + <property name="label">Stopped Time</property> + <property name="minimum_size"></property> + <property name="name">sbSizer234</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <event name="OnUpdateUI"></event> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxPanel" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">pstop</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="subclass"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxTAB_TRAVERSAL</property> + <event name="OnChar"></event> + <event name="OnEnterWindow"></event> + <event name="OnEraseBackground"></event> + <event name="OnKeyDown"></event> + <event name="OnKeyUp"></event> + <event name="OnKillFocus"></event> + <event name="OnLeaveWindow"></event> + <event name="OnLeftDClick"></event> + <event name="OnLeftDown"></event> + <event name="OnLeftUp"></event> + <event name="OnMiddleDClick"></event> + <event name="OnMiddleDown"></event> + <event name="OnMiddleUp"></event> + <event name="OnMotion"></event> + <event name="OnMouseEvents"></event> + <event name="OnMouseWheel"></event> + <event name="OnPaint"></event> + <event name="OnRightDClick"></event> + <event name="OnRightDown"></event> + <event name="OnRightUp"></event> + <event name="OnSetFocus"></event> + <event name="OnSize"></event> + <event name="OnUpdateUI"></event> + </object> + </object> + </object> + </object> + </object> + </object> + </object> + </object> + </object> + </object> </object> </wxFormBuilder_Project> gse/gui.fbp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 21 2008) +// C++ code generated with wxFormBuilder (version Dec 29 2008) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -96,6 +96,9 @@ iGUI_Toplevel::iGUI_Toplevel( wxWindow* parent, wxWindowID id, const wxString& t bMessages = new wxToggleButton( this, ID_MESSAGES_B, wxT("Messages"), wxDefaultPosition, wxDefaultSize, 0 ); SubWindows->Add( bMessages, 0, wxALL|wxEXPAND, 5 ); + bSpeedo = new wxToggleButton( this, ID_SPEEDO_B, wxT("Speedometer"), wxDefaultPosition, wxDefaultSize, 0 ); + SubWindows->Add( bSpeedo, 0, wxALL|wxEXPAND, 5 ); + sMain->Add( SubWindows, 1, wxALL|wxEXPAND, 5 ); wxBoxSizer* sStatus; @@ -2138,3 +2141,97 @@ iGUI_Select::~iGUI_Select() // Disconnect Events pVisible->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( iGUI_Select::onMouse ), NULL, this ); } + +iGUI_Speedo::iGUI_Speedo( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bSizer107; + bSizer107 = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bSizer116; + bSizer116 = new wxBoxSizer( wxHORIZONTAL ); + + wxStaticBoxSizer* sbSizer18; + sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Speed") ), wxHORIZONTAL ); + + pspeed = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + sbSizer18->Add( pspeed, 1, wxEXPAND, 5 ); + + bSizer116->Add( sbSizer18, 1, wxALL|wxEXPAND, 5 ); + + wxStaticBoxSizer* sbSizer43; + sbSizer43 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("???") ), wxVERTICAL ); + + pdist = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + sbSizer43->Add( pdist, 1, wxEXPAND, 5 ); + + bSizer116->Add( sbSizer43, 1, wxALL|wxEXPAND, 5 ); + + bSizer107->Add( bSizer116, 1, wxEXPAND, 5 ); + + wxBoxSizer* bSizer109; + bSizer109 = new wxBoxSizer( wxHORIZONTAL ); + + wxGridSizer* gSizer5; + gSizer5 = new wxGridSizer( 2, 3, 0, 0 ); + + wxStaticBoxSizer* sbSizer235; + sbSizer235 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Overall Avg") ), wxVERTICAL ); + + pstop1 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + sbSizer235->Add( pstop1, 1, wxEXPAND, 5 ); + + gSizer5->Add( sbSizer235, 1, wxALL|wxEXPAND, 5 ); + + wxStaticBoxSizer* sbSizer23; + sbSizer23 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Moving Avg") ), wxVERTICAL ); + + pmavg = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + sbSizer23->Add( pmavg, 1, wxEXPAND, 5 ); + + gSizer5->Add( sbSizer23, 1, wxALL|wxEXPAND, 5 ); + + wxStaticBoxSizer* sbSizer231; + sbSizer231 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Max Speed") ), wxVERTICAL ); + + pmax = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + sbSizer231->Add( pmax, 1, wxEXPAND, 5 ); + + gSizer5->Add( sbSizer231, 1, wxALL|wxEXPAND, 5 ); + + wxStaticBoxSizer* sbSizer232; + sbSizer232 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Total Time") ), wxVERTICAL ); + + pttime = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + sbSizer232->Add( pttime, 1, wxEXPAND, 5 ); + + gSizer5->Add( sbSizer232, 1, wxALL|wxEXPAND, 5 ); + + wxStaticBoxSizer* sbSizer233; + sbSizer233 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Moving Time") ), wxVERTICAL ); + + pmtime = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + sbSizer233->Add( pmtime, 1, wxEXPAND, 5 ); + + gSizer5->Add( sbSizer233, 1, wxALL|wxEXPAND, 5 ); + + wxStaticBoxSizer* sbSizer234; + sbSizer234 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Stopped Time") ), wxVERTICAL ); + + pstop = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + sbSizer234->Add( pstop, 1, wxEXPAND, 5 ); + + gSizer5->Add( sbSizer234, 1, wxALL|wxEXPAND, 5 ); + + bSizer109->Add( gSizer5, 1, wxEXPAND, 5 ); + + bSizer107->Add( bSizer109, 1, wxEXPAND, 5 ); + + this->SetSizer( bSizer107 ); + this->Layout(); +} + +iGUI_Speedo::~iGUI_Speedo() +{ +} gse/gui_classes.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 21 2008) +// C++ code generated with wxFormBuilder (version Dec 29 2008) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -51,24 +51,25 @@ #define ID_HEALTH_B 1015 #define ID_COMMANDS_B 1016 #define ID_MESSAGES_B 1017 -#define ID_EPHEMERIS_REFRESH 1018 -#define ID_EPHEMERIS_SAVE 1019 -#define ID_EPHEMERIS_LOAD 1020 -#define ID_ALMANAC_REFRESH 1021 -#define ID_ALMANAC_SAVE 1022 -#define ID_ALMANAC_LOAD 1023 -#define ID_NULL 1024 -#define ID_RESET_WATCHDOG 1025 -#define ID_RESET_ALL 1026 -#define ID_RESET_PPS 1027 -#define ID_RESET_PVT 1028 -#define ID_RESET_EKF 1029 -#define ID_RESET_CHANNEL 1030 -#define ID_RESET_EPHEMERIS 1031 -#define ID_RESET_ALMANAC 1032 -#define ID_EEPROM_STOP 1033 -#define ID_EEPROM_START 1034 -#define ID_SELECT_REFRESH 1035 +#define ID_SPEEDO_B 1018 +#define ID_EPHEMERIS_REFRESH 1019 +#define ID_EPHEMERIS_SAVE 1020 +#define ID_EPHEMERIS_LOAD 1021 +#define ID_ALMANAC_REFRESH 1022 +#define ID_ALMANAC_SAVE 1023 +#define ID_ALMANAC_LOAD 1024 +#define ID_NULL 1025 +#define ID_RESET_WATCHDOG 1026 +#define ID_RESET_ALL 1027 +#define ID_RESET_PPS 1028 +#define ID_RESET_PVT 1029 +#define ID_RESET_EKF 1030 +#define ID_RESET_CHANNEL 1031 +#define ID_RESET_EPHEMERIS 1032 +#define ID_RESET_ALMANAC 1033 +#define ID_EEPROM_STOP 1034 +#define ID_EEPROM_START 1035 +#define ID_SELECT_REFRESH 1036 /////////////////////////////////////////////////////////////////////////////// /// Class iGUI_Toplevel @@ -92,6 +93,7 @@ class iGUI_Toplevel : public wxFrame wxToggleButton* bHealth; wxToggleButton* bCommands; wxToggleButton* bMessages; + wxToggleButton* bSpeedo; wxTextCtrl* tRS422; wxTextCtrl* tTask; wxStatusBar* mStatus; @@ -551,4 +553,27 @@ class iGUI_Select : public wxFrame }; +/////////////////////////////////////////////////////////////////////////////// +/// Class iGUI_Speedo +/////////////////////////////////////////////////////////////////////////////// +class iGUI_Speedo : public wxFrame +{ + private: + + protected: + wxPanel* pspeed; + wxPanel* pdist; + wxPanel* pstop1; + wxPanel* pmavg; + wxPanel* pmax; + wxPanel* pttime; + wxPanel* pmtime; + wxPanel* pstop; + + public: + iGUI_Speedo( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Speedometer"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 600,500 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL ); + ~iGUI_Speedo(); + +}; + #endif //__gui_classes__ gse/gui_classes.h @@ -77,6 +77,7 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1 #include "gui_health.h" #include "gui_messages.h" #include "gui_select.h" +#include "gui_speedo.h" #include "gui_toplevel.h" /*----------------------------------------------------------------------------------------------*/ double icn0_2_fcn0(uint32 _cn0); gse/include/gui.h @@ -22,6 +22,7 @@ class GUI_Toplevel: public iGUI_Toplevel GUI_Commands *wCommands; //GUI_EEPROM *wEEPROM; GUI_Messages *wMessages; + GUI_Speedo *wSpeedo; class GUI_Serial*pSerial; wxTimer *timer; @@ -67,6 +68,7 @@ class GUI_Toplevel: public iGUI_Toplevel void onCommands(wxCommandEvent& event); void onEEPROM(wxCommandEvent& event); void onMessages(wxCommandEvent& event); + void onSpeedo(wxCommandEvent& event); void paintEvent(wxPaintEvent& evt); void paintNow(); gse/include/gui_toplevel.h @@ -38,7 +38,6 @@ GUI_Almanac::GUI_Almanac():iGUI_Almanac(NULL, wxID_ANY, wxT("Almanac"), wxDefaul fp = NULL; } - GUI_Almanac::~GUI_Almanac() { gse/src/gui_almanac.cpp @@ -31,6 +31,7 @@ BEGIN_EVENT_TABLE(GUI_Toplevel, wxFrame) // EVT_TOGGLEBUTTON(ID_EEPROM_B, GUI_Toplevel::onEEPROM) EVT_TOGGLEBUTTON(ID_HEALTH_B, GUI_Toplevel::onHealth) EVT_TOGGLEBUTTON(ID_MESSAGES_B, GUI_Toplevel::onMessages) + EVT_TOGGLEBUTTON(ID_SPEEDO_B, GUI_Toplevel::onSpeedo) EVT_PAINT(GUI_Toplevel::paintEvent) EVT_CLOSE(GUI_Toplevel::onClose) END_EVENT_TABLE() @@ -50,6 +51,7 @@ GUI_Toplevel::GUI_Toplevel():iGUI_Toplevel(NULL, wxID_ANY, wxT("GPS GUI"), wxDef wHealth = NULL; wCommands = NULL; //wEEPROM = NULL; + wSpeedo = NULL; pSerial = new GUI_Serial; pSerial->setIO(0); @@ -62,6 +64,7 @@ GUI_Toplevel::GUI_Toplevel():iGUI_Toplevel(NULL, wxID_ANY, wxT("GPS GUI"), wxDef timer->Start(100, wxTIMER_CONTINUOUS); //Shoot for 20 fps log_filename.Clear(); + } /*----------------------------------------------------------------------------------------------*/ @@ -93,6 +96,9 @@ GUI_Toplevel::~GUI_Toplevel() if(wCommands) delete wCommands; + if(wSpeedo) + delete wSpeedo; + // if(wEEPROM) // delete wEEPROM; @@ -318,7 +324,7 @@ void GUI_Toplevel::render(wxDC& dc) /* Render RS422 Panel */ renderRS422(); - if(update) +// if(update) { /* Render Task Panel */ @@ -365,9 +371,13 @@ void GUI_Toplevel::render(wxDC& dc) // if(wEEPROM != NULL) // wEEPROM->paintNow(); - /* Display EEPROM */ + /* Display Messages */ if(wMessages != NULL) wMessages->paintNow(); + + /* Display Speedo */ + if(wSpeedo != NULL) + wSpeedo->paintNow(); } } @@ -765,3 +775,27 @@ void GUI_Toplevel::onMessages(wxCommandEvent& WXUNUSED(event)) } /*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ +void GUI_Toplevel::onSpeedo(wxCommandEvent& WXUNUSED(event)) +{ + + if(wSpeedo) + { + delete wSpeedo; + wSpeedo = NULL; + bSpeedo->SetValue(false); + } + else + { + wSpeedo = new GUI_Speedo(); + wSpeedo->setPointer(&messages); + wSpeedo->setSerial(pSerial); + wSpeedo->setToplevel(this); + wSpeedo->Show(TRUE); + bSpeedo->SetValue(true); + } + +} +/*----------------------------------------------------------------------------------------------*/ gse/src/gui_toplevel.cpp f4dcf08d7b3b2f6103c223e602aa68fa08a0e82a Gregory W Heckler gheckler@mesa3081994.(none) http://github.com/gps-sdr/gps-sdr/commit/6153c01317f34a26b2fb41926505b9d97f764e90 6153c01317f34a26b2fb41926505b9d97f764e90 2009-06-03T11:29:26-07:00 2009-06-03T11:29:26-07:00 Added a "speedometer" widget to the GUI program. 0a9e1451a4af159b3f2f2c334d56e17ef97919cb Gregory W Heckler gheckler@mesa3081994.(none)