Skip to content

Commit b4eedb4

Browse files
RasbatsRasbats
committed
v3.1-legacy
1 parent ade04b1 commit b4eedb4

6 files changed

Lines changed: 152 additions & 131 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ SET(VERBOSE_NAME dr)
1414
SET(TITLE_NAME dr)
1515
SET(CPACK_PACKAGE_CONTACT "Mike Rossiter")
1616

17-
SET(VERSION_MAJOR "2")
18-
SET(VERSION_MINOR "1.1")
17+
SET(VERSION_MAJOR "3")
18+
SET(VERSION_MINOR "1")
1919

2020
SET(NAME_SUFFIX "ov50")
2121

‎DR_pi.fbp‎

Lines changed: 124 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
<property name="gripper">0</property>
171171
<property name="hidden">0</property>
172172
<property name="id">wxID_ANY</property>
173-
<property name="label">Speed </property>
173+
<property name="label">Planned &#x0A;Speed </property>
174174
<property name="markup">0</property>
175175
<property name="max_size"></property>
176176
<property name="maximize_button">0</property>
@@ -528,7 +528,7 @@
528528
<object class="sizeritem" expanded="1">
529529
<property name="border">5</property>
530530
<property name="flag">wxEXPAND</property>
531-
<property name="proportion">1</property>
531+
<property name="proportion">0</property>
532532
<object class="wxBoxSizer" expanded="1">
533533
<property name="minimum_size"></property>
534534
<property name="name">bSizer14</property>
@@ -566,7 +566,7 @@
566566
<property name="gripper">0</property>
567567
<property name="hidden">0</property>
568568
<property name="id">wxID_ANY</property>
569-
<property name="label">Route Name</property>
569+
<property name="label">Route / GPX &#x0A;file name </property>
570570
<property name="markup">0</property>
571571
<property name="max_size"></property>
572572
<property name="maximize_button">0</property>
@@ -661,18 +661,76 @@
661661
</object>
662662
</object>
663663
</object>
664+
<object class="sizeritem" expanded="1">
665+
<property name="border">5</property>
666+
<property name="flag">wxEXPAND | wxALL</property>
667+
<property name="proportion">0</property>
668+
<object class="wxStaticLine" expanded="1">
669+
<property name="BottomDockable">1</property>
670+
<property name="LeftDockable">1</property>
671+
<property name="RightDockable">1</property>
672+
<property name="TopDockable">1</property>
673+
<property name="aui_layer"></property>
674+
<property name="aui_name"></property>
675+
<property name="aui_position"></property>
676+
<property name="aui_row"></property>
677+
<property name="best_size"></property>
678+
<property name="bg"></property>
679+
<property name="caption"></property>
680+
<property name="caption_visible">1</property>
681+
<property name="center_pane">0</property>
682+
<property name="close_button">1</property>
683+
<property name="context_help"></property>
684+
<property name="context_menu">1</property>
685+
<property name="default_pane">0</property>
686+
<property name="dock">Dock</property>
687+
<property name="dock_fixed">0</property>
688+
<property name="docking">Left</property>
689+
<property name="enabled">1</property>
690+
<property name="fg"></property>
691+
<property name="floatable">1</property>
692+
<property name="font"></property>
693+
<property name="gripper">0</property>
694+
<property name="hidden">0</property>
695+
<property name="id">wxID_ANY</property>
696+
<property name="max_size"></property>
697+
<property name="maximize_button">0</property>
698+
<property name="maximum_size"></property>
699+
<property name="min_size"></property>
700+
<property name="minimize_button">0</property>
701+
<property name="minimum_size"></property>
702+
<property name="moveable">1</property>
703+
<property name="name">m_staticline1</property>
704+
<property name="pane_border">1</property>
705+
<property name="pane_position"></property>
706+
<property name="pane_size"></property>
707+
<property name="permission">protected</property>
708+
<property name="pin_button">1</property>
709+
<property name="pos"></property>
710+
<property name="resize">Resizable</property>
711+
<property name="show">1</property>
712+
<property name="size"></property>
713+
<property name="style">wxLI_HORIZONTAL</property>
714+
<property name="subclass">; ; forward_declare</property>
715+
<property name="toolbar_pane">0</property>
716+
<property name="tooltip"></property>
717+
<property name="window_extra_style"></property>
718+
<property name="window_name"></property>
719+
<property name="window_style"></property>
720+
</object>
721+
</object>
664722
<object class="sizeritem" expanded="1">
665723
<property name="border">5</property>
666724
<property name="flag">wxEXPAND</property>
667725
<property name="proportion">1</property>
668726
<object class="wxBoxSizer" expanded="1">
669727
<property name="minimum_size"></property>
670728
<property name="name">bSizer71</property>
671-
<property name="orient">wxHORIZONTAL</property>
729+
<property name="orient">wxVERTICAL</property>
672730
<property name="permission">none</property>
673731
<object class="sizeritem" expanded="1">
674732
<property name="border">5</property>
675-
<property name="flag">wxALL</property>
733+
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
676734
<property name="proportion">0</property>
677735
<object class="wxButton" expanded="1">
678736
<property name="BottomDockable">1</property>
@@ -743,6 +801,67 @@
743801
<event name="OnButtonClick">OnPSGPX</event>
744802
</object>
745803
</object>
804+
<object class="sizeritem" expanded="1">
805+
<property name="border">5</property>
806+
<property name="flag">wxALL</property>
807+
<property name="proportion">0</property>
808+
<object class="wxStaticText" expanded="1">
809+
<property name="BottomDockable">1</property>
810+
<property name="LeftDockable">1</property>
811+
<property name="RightDockable">1</property>
812+
<property name="TopDockable">1</property>
813+
<property name="aui_layer"></property>
814+
<property name="aui_name"></property>
815+
<property name="aui_position"></property>
816+
<property name="aui_row"></property>
817+
<property name="best_size"></property>
818+
<property name="bg"></property>
819+
<property name="caption"></property>
820+
<property name="caption_visible">1</property>
821+
<property name="center_pane">0</property>
822+
<property name="close_button">1</property>
823+
<property name="context_help"></property>
824+
<property name="context_menu">1</property>
825+
<property name="default_pane">0</property>
826+
<property name="dock">Dock</property>
827+
<property name="dock_fixed">0</property>
828+
<property name="docking">Left</property>
829+
<property name="enabled">1</property>
830+
<property name="fg"></property>
831+
<property name="floatable">1</property>
832+
<property name="font"></property>
833+
<property name="gripper">0</property>
834+
<property name="hidden">0</property>
835+
<property name="id">wxID_ANY</property>
836+
<property name="label">Imports an existing GPX file&#x0A;... then makes and saves a new route file&#x0A;... (GPX) with added DR positions</property>
837+
<property name="markup">0</property>
838+
<property name="max_size"></property>
839+
<property name="maximize_button">0</property>
840+
<property name="maximum_size"></property>
841+
<property name="min_size"></property>
842+
<property name="minimize_button">0</property>
843+
<property name="minimum_size"></property>
844+
<property name="moveable">1</property>
845+
<property name="name">m_staticText71</property>
846+
<property name="pane_border">1</property>
847+
<property name="pane_position"></property>
848+
<property name="pane_size"></property>
849+
<property name="permission">protected</property>
850+
<property name="pin_button">1</property>
851+
<property name="pos"></property>
852+
<property name="resize">Resizable</property>
853+
<property name="show">1</property>
854+
<property name="size"></property>
855+
<property name="style"></property>
856+
<property name="subclass">; ; forward_declare</property>
857+
<property name="toolbar_pane">0</property>
858+
<property name="tooltip"></property>
859+
<property name="window_extra_style"></property>
860+
<property name="window_name"></property>
861+
<property name="window_style"></property>
862+
<property name="wrap">-1</property>
863+
</object>
864+
</object>
746865
</object>
747866
</object>
748867
</object>

‎src/DRgui.cpp‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ m_Dialog::m_Dialog( wxWindow* parent, wxWindowID id, const wxString& title, cons
2828
wxBoxSizer* bSizer14111112;
2929
bSizer14111112 = new wxBoxSizer( wxHORIZONTAL );
3030

31-
m_staticText32111112 = new wxStaticText( this, wxID_ANY, wxT("Speed "), wxDefaultPosition, wxDefaultSize, 0 );
31+
m_staticText32111112 = new wxStaticText( this, wxID_ANY, wxT("Planned \nSpeed "), wxDefaultPosition, wxDefaultSize, 0 );
3232
m_staticText32111112->Wrap( -1 );
3333
bSizer14111112->Add( m_staticText32111112, 0, wxALL, 5 );
3434

@@ -68,21 +68,28 @@ m_Dialog::m_Dialog( wxWindow* parent, wxWindowID id, const wxString& title, cons
6868
wxBoxSizer* bSizer14;
6969
bSizer14 = new wxBoxSizer( wxHORIZONTAL );
7070

71-
m_staticText7 = new wxStaticText( this, wxID_ANY, wxT("Route Name"), wxDefaultPosition, wxDefaultSize, 0 );
71+
m_staticText7 = new wxStaticText( this, wxID_ANY, wxT("Route / GPX \nfile name "), wxDefaultPosition, wxDefaultSize, 0 );
7272
m_staticText7->Wrap( -1 );
7373
bSizer14->Add( m_staticText7, 0, wxALL, 5 );
7474

7575
m_Route = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
7676
bSizer14->Add( m_Route, 0, wxALL, 5 );
7777

7878

79-
bSizer9111->Add( bSizer14, 1, wxEXPAND, 5 );
79+
bSizer9111->Add( bSizer14, 0, wxEXPAND, 5 );
80+
81+
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
82+
bSizer9111->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
8083

8184
wxBoxSizer* bSizer71;
82-
bSizer71 = new wxBoxSizer( wxHORIZONTAL );
85+
bSizer71 = new wxBoxSizer( wxVERTICAL );
8386

8487
m_button3111 = new wxButton( this, wxID_ANY, wxT("Generate GPX"), wxDefaultPosition, wxDefaultSize, 0 );
85-
bSizer71->Add( m_button3111, 0, wxALL, 5 );
88+
bSizer71->Add( m_button3111, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
89+
90+
m_staticText71 = new wxStaticText( this, wxID_ANY, wxT("Imports an existing GPX file\n... then makes and saves a new route file\n... (GPX) with added DR positions"), wxDefaultPosition, wxDefaultSize, 0 );
91+
m_staticText71->Wrap( -1 );
92+
bSizer71->Add( m_staticText71, 0, wxALL, 5 );
8693

8794

8895
bSizer9111->Add( bSizer71, 1, wxEXPAND, 5 );

‎src/DRgui.cpp.bak‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎src/DRgui.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <wx/textctrl.h>
1919
#include <wx/sizer.h>
2020
#include <wx/choice.h>
21+
#include <wx/statline.h>
2122
#include <wx/bitmap.h>
2223
#include <wx/image.h>
2324
#include <wx/icon.h>
@@ -41,7 +42,9 @@ class m_Dialog : public wxDialog
4142
wxStaticText* m_staticText32111111;
4243
wxStaticText* m_staticText3311111;
4344
wxStaticText* m_staticText7;
45+
wxStaticLine* m_staticline1;
4446
wxButton* m_button3111;
47+
wxStaticText* m_staticText71;
4548

4649
// Virtual event handlers, overide them in your derived class
4750
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }

0 commit comments

Comments
 (0)