Merge branch 'develop'

3rdparty/CMakeLists.txt

@@ -221,6 +221,10 @@ if(CMAKE_MRPT_HAS_OPENGL_GLUT AND NOT CMAKE_MRPT_HAS_OPENGL_GLUT_SYSTEM)
 			${OPENGL_glu_LIBRARY}
 		)
 	endif()
+	if (MINGW)
+		target_link_libraries(mrpt_freeglut PRIVATE winmm
+		)
+	endif()
 	unset(SRCS)
 endif()
 
@@ -240,6 +244,12 @@ if(WIN32)
 		)
 	endif()
 
+	if (MINGW)
+		target_compile_options(mrpt_glew PRIVATE
+			-Wno-cast-function-type
+		)
+	endif()
+
 	target_compile_definitions(mrpt_glew PUBLIC
 		GLEW_STATIC
 	)

AUTHORS

@@ -2,15 +2,16 @@ This file contains the list of people involved in the development
 of MRPT along its history. If you feel someone is missing, please
 fork and pull-request.
 
- DEVELOPERS
-==========================================================
+An online, dynamic list of git commit authors can be reached at:
+  https://github.com/MRPT/mrpt/graphs/contributors
+
 MRPT was born in 2004 at MAPIR lab in the University of Málaga and has been
 under continuous development by many developers and contributors since then.
 
 The following list is roughly sorted in reverse chronological order. See also
 the GitHub contributors page (https://github.com/MRPT/mrpt/graphs/contributors).
 
-* Jose-Luis Blanco-Claraco. Main developer.  http://www.ual.es/~jlblanco/  https://github.com/jlblancoc
+* Jose-Luis Blanco-Claraco. Main developer.  https://www.ual.es/~jlblanco/  https://github.com/jlblancoc
 
 * Hunter (2016-) https://github.com/jolting
   - Tons of changes towards porting code to C++14 for MRPT 2.0
@@ -158,13 +159,13 @@ the GitHub contributors page (https://github.com/MRPT/mrpt/graphs/contributors).
   - The application benchmarking-image-features
   - added files in the mrpt/libs/vision (detectors: AKAZE, LSD line detectors; descriptors: LATCH, BLD)
 
-* Aliben - (Github: http://github.com/alibenD).
+* Aliben - (Github: https://github.com/alibenD).
   - Driver for SICK TIM561/55x/56x via ethernet (mrpt::hwdrivers::CSICKTim561Eth)
   - A testing sample for SICK TIM55x/TIM56x series
 
 * David Serret
   - Small changes in Velodyne drivers
-  
+
 * Edward Rosten
   - Part of his libCVD (Free BSD) has been used in libs/opengl/src/gltext.cpp
 

CMakeLists.txt

@@ -151,6 +151,7 @@ if ((${CMAKE_MRPT_KERNEL} MATCHES "GNU") # It doesnt build in hurd
     OR ("$ENV{DEB_TARGET_ARCH_CPU}" STREQUAL "ppc64")   # fails: termios2
     OR ("$ENV{DEB_TARGET_ARCH_CPU}" STREQUAL "ppc64el") # fails: termios2
     OR ("$ENV{DEB_TARGET_ARCH_CPU}" STREQUAL "powerpc") # fails: termios2
+    OR MINGW
     )
 	set(DEFAULT_BUILD_ROBOPEAK_LIDAR OFF)
 endif()

README.md

@@ -1,13 +1,16 @@
 
 <h1 align="center">The MRPT project</h1>
 
-gcc/clang: <a href="https://circleci.com/gh/MRPT/mrpt/tree/develop"><img src="https://circleci.com/gh/MRPT/mrpt/tree/develop.svg?style=svg"></a> MSVC: <a href="https://ci.appveyor.com/project/jlblancoc/mrpt" alt="AppVeyor:msvc"><img src="https://ci.appveyor.com/api/projects/status/yjs4lpj02f6a1ylg/branch/develop?svg=true" /></a> Last stable release: <a href="https://github.com/MRPT/mrpt/releases" alt="Releases"><img src="https://img.shields.io/github/release/MRPT/mrpt.svg" /></a> <a href="https://gitter.im/MRPT/mrpt" alt="Gitter"><img src="https://badges.gitter.im/Join%20Chat.svg" /></a>
+<a href="https://circleci.com/gh/MRPT/mrpt/tree/develop"><img src="https://circleci.com/gh/MRPT/mrpt/tree/develop.svg?style=svg"></a>
+<a href="https://ci.appveyor.com/project/jlblancoc/mrpt" alt="AppVeyor:msvc"><img src="https://ci.appveyor.com/api/projects/status/yjs4lpj02f6a1ylg/branch/develop?svg=true" /></a> 
+<a href="https://codecov.io/gh/MRPT/mrpt" alt="codecov"><img src="https://codecov.io/gh/MRPT/mrpt/branch/develop/graph/badge.svg" /></a>
+<a href="https://gitter.im/MRPT/mrpt" alt="Gitter"><img src="https://badges.gitter.im/Join%20Chat.svg" /></a>
+[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/MRPT/mrpt)
 
-<a href="https://codecov.io/gh/MRPT/mrpt" alt="codecov"><img src="https://codecov.io/gh/MRPT/mrpt/branch/develop/graph/badge.svg" /></a>  GH downloads: <a href="https://github.com/MRPT/mrpt/releases" alt="GitHub"><img src="https://img.shields.io/github/downloads/mrpt/mrpt/total.svg" /></a> SF downloads (datasets): <a href="https://sourceforge.net/projects/mrpt/files/" alt="SourceForge"><img src="https://img.shields.io/sourceforge/dt/mrpt.svg" /></a>
-
-Last Win64 builds: <a href='https://bintray.com/mrpt/mrpt-win-binaries/MRPT-nightly-builds/win64-develop/link'><img src='https://api.bintray.com/packages/mrpt/mrpt-win-binaries/MRPT-nightly-builds/images/download.svg?version=win64-develop'></a> <a href='https://bintray.com/mrpt/mrpt-win-binaries/MRPT-nightly-builds/win64-stable/link'><img src='https://api.bintray.com/packages/mrpt/mrpt-win-binaries/MRPT-nightly-builds/images/download.svg?version=win64-stable'></a>
-
-Workspace: [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/MRPT/mrpt)
+<a href="https://github.com/MRPT/mrpt/releases" alt="Releases"><img src="https://img.shields.io/github/release/MRPT/mrpt.svg" /></a>
+<a href='https://github.com/MRPT/mrpt/releases/tag/Windows-nightly-builds'><img src='https://img.shields.io/badge/Windows-Installer-orange?logo=Windows'></a>
+<a href="https://github.com/MRPT/mrpt/releases" alt="GitHub"><img src="https://img.shields.io/github/downloads/mrpt/mrpt/total.svg" /></a>
+<a href="https://sourceforge.net/projects/mrpt/files/" alt="SourceForge"><img src="https://img.shields.io/sourceforge/dt/mrpt.svg" /></a>
 
 ## 1. Introduction
 <img align="right" src="https://mrpt.github.io/imgs/mrpt-videos-mix2.gif">
@@ -112,7 +115,7 @@ make
 
 Executables (`.exe`s and `.dll`s) and development libraries (`.h`s and `.lib`s) included:
 
-Last Win64 builds: <a href='https://bintray.com/mrpt/mrpt-win-binaries/MRPT-nightly-builds/win64-develop/link'><img src='https://api.bintray.com/packages/mrpt/mrpt-win-binaries/MRPT-nightly-builds/images/download.svg?version=win64-develop'></a> <a href='https://bintray.com/mrpt/mrpt-win-binaries/MRPT-nightly-builds/win64-stable/link'><img src='https://api.bintray.com/packages/mrpt/mrpt-win-binaries/MRPT-nightly-builds/images/download.svg?version=win64-stable'></a>
+[Nightly built Windows installer](https://github.com/MRPT/mrpt/releases/tag/Windows-nightly-builds)
 
 
 ## 4. License

apps/2d-slam-demo/CLogView.cpp

@@ -46,9 +46,7 @@ CLogView::CLogView(
 		this, ID_TEXTCTRL1, wxEmptyString, wxDefaultPosition, wxSize(835, 437),
 		wxTE_MULTILINE | wxTE_READONLY | wxHSCROLL | wxTE_DONTWRAP,
 		wxDefaultValidator, _T("ID_TEXTCTRL1"));
-	wxFont edLogFont(
-		wxDEFAULT, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxNORMAL, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+	wxFont edLogFont(-1, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxNORMAL);
 	edLog->SetFont(edLogFont);
 	FlexGridSizer1->Add(
 		edLog, 1, wxALL | wxEXPAND | wxALIGN_LEFT | wxALIGN_TOP, 5);

apps/2d-slam-demo/slamdemoMain.cpp

@@ -239,8 +239,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel3, ID_STATICTEXT1, _("Ground truth"), wxDefaultPosition,
 		wxDefaultSize, 0, _T("ID_STATICTEXT1"));
 	wxFont lbGTFont(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	lbGT->SetFont(lbGTFont);
 	GridSizer1->Add(
 		lbGT, 1, wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL,
@@ -263,8 +262,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel4, ID_STATICTEXT2, _("Observation"), wxDefaultPosition,
 		wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT2"));
 	wxFont lbObsFont(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	lbObs->SetFont(lbObsFont);
 	GridSizer2->Add(
 		lbObs, 1, wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL,
@@ -293,8 +291,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel5, ID_STATICTEXT10, _("Map"), wxDefaultPosition, wxDefaultSize,
 		wxALIGN_CENTRE, _T("ID_STATICTEXT10"));
 	wxFont lbMapFont(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	lbMap->SetFont(lbMapFont);
 	GridSizer3->Add(
 		lbMap, 1, wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL,
@@ -317,8 +314,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel6, ID_STATICTEXT3, _("Indiv. compat (95% ellips.)"),
 		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT3"));
 	wxFont lmIndCompatFont(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	lmIndCompat->SetFont(lmIndCompatFont);
 	GridSizer4->Add(
 		lmIndCompat, 1,
@@ -346,8 +342,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel7, ID_STATICTEXT4, _("Dat assoc"), wxDefaultPosition,
 		wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT4"));
 	wxFont lbDatAssocFont(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	lbDatAssoc->SetFont(lbDatAssocFont);
 	GridSizer5->Add(
 		lbDatAssoc, 1,
@@ -394,8 +389,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel8, ID_STATICTEXT5, _("Vehicle X (err,99% bounds)"),
 		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT5"));
 	wxFont StaticText2Font(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	StaticText2->SetFont(StaticText2Font);
 	GridSizer7->Add(
 		StaticText2, 1,
@@ -418,8 +412,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel9, ID_STATICTEXT6, _("Vehicle Y (err,99% bounds)"),
 		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT6"));
 	wxFont StaticText3Font(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	StaticText3->SetFont(StaticText3Font);
 	GridSizer8->Add(
 		StaticText3, 1,
@@ -442,8 +435,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel10, ID_STATICTEXT7, _("Vehicle Phi (err,99% bounds)"),
 		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT7"));
 	wxFont StaticText4Font(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	StaticText4->SetFont(StaticText4Font);
 	GridSizer9->Add(
 		StaticText4, 1,
@@ -478,8 +470,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel13, ID_STATICTEXT9, _("True positives:"), wxDefaultPosition,
 		wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT9"));
 	wxFont lbDaTPFont(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	lbDaTP->SetFont(lbDaTPFont);
 	GridSizer6->Add(
 		lbDaTP, 1, wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL,
@@ -502,8 +493,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel14, ID_STATICTEXT11, _("True negatives:"), wxDefaultPosition,
 		wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT11"));
 	wxFont lbDaTNFont(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	lbDaTN->SetFont(lbDaTNFont);
 	GridSizer11->Add(
 		lbDaTN, 1, wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL,
@@ -526,8 +516,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel15, ID_STATICTEXT12, _("False positives:"), wxDefaultPosition,
 		wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT12"));
 	wxFont StaticText6Font(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	StaticText6->SetFont(StaticText6Font);
 	GridSizer12->Add(
 		StaticText6, 1,
@@ -550,8 +539,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel16, ID_STATICTEXT13, _("False negatives:"), wxDefaultPosition,
 		wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT13"));
 	wxFont StaticText7Font(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	StaticText7->SetFont(StaticText7Font);
 	GridSizer13->Add(
 		StaticText7, 1,
@@ -583,8 +571,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		Panel12, ID_STATICTEXT8, _("Computation time (ms)"), wxDefaultPosition,
 		wxDefaultSize, wxALIGN_CENTRE, _T("ID_STATICTEXT8"));
 	wxFont StaticText1Font(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	StaticText1->SetFont(StaticText1Font);
 	GridSizer10->Add(
 		StaticText1, 1,
@@ -608,8 +595,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE,
 		_T("ID_STATICTEXT14"));
 	wxFont StaticText5Font(
-		wxDEFAULT, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	StaticText5->SetFont(StaticText5Font);
 	GridSizer14->Add(
 		StaticText5, 1,

apps/RawLogViewer/CFormMotionModel.cpp

@@ -293,8 +293,7 @@ CFormMotionModel::CFormMotionModel(wxWindow* parent, wxWindowID id)
 	btnGaussOK->SetDefault();
 	btnGaussOK->SetFocus();
 	wxFont btnGaussOKFont(
-		10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	btnGaussOK->SetFont(btnGaussOKFont);
 	FlexGridSizer11->Add(
 		btnGaussOK, 1,
@@ -442,8 +441,7 @@ CFormMotionModel::CFormMotionModel(wxWindow* parent, wxWindowID id)
 	btnThrunOk->SetDefault();
 	btnThrunOk->SetFocus();
 	wxFont btnThrunOkFont(
-		10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
-		wxEmptyString, wxFONTENCODING_DEFAULT);
+		10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
 	btnThrunOk->SetFont(btnThrunOkFont);
 	FlexGridSizer5->Add(
 		btnThrunOk, 1,

apps/RawLogViewer/CFormRawMap.cpp

@@ -87,7 +87,6 @@ const long CFormRawMap::ID_BUTTON8 = wxNewId();
 const long CFormRawMap::ID_BUTTON9 = wxNewId();
 const long CFormRawMap::ID_STATICTEXT8 = wxNewId();
 const long CFormRawMap::ID_STATICTEXT2 = wxNewId();
-const long CFormRawMap::ID_BITMAPBUTTON1 = wxNewId();
 const long CFormRawMap::ID_BUTTON4 = wxNewId();
 const long CFormRawMap::ID_TEXTCTRL1 = wxNewId();
 const long CFormRawMap::ID_PANEL1 = wxNewId();
@@ -104,7 +103,6 @@ CFormRawMap::CFormRawMap(wxWindow* parent, wxWindowID)
 {
 	//(*Initialize(CFormRawMap)
 	wxFlexGridSizer* FlexGridSizer4;
-	wxFlexGridSizer* FlexGridSizer10;
 	wxFlexGridSizer* FlexGridSizer5;
 	wxFlexGridSizer* FlexGridSizer9;
 	wxStaticBoxSizer* boxResults;
@@ -204,7 +202,7 @@ CFormRawMap::CFormRawMap(wxWindow* parent, wxWindowID)
 		5);
 	FlexGridSizer4->Add(
 		FlexGridSizer3, 1, wxALL | wxEXPAND | wxALIGN_LEFT | wxALIGN_TOP, 0);
-	FlexGridSizer5 = new wxFlexGridSizer(3, 1, 0, 0);
+	FlexGridSizer5 = new wxFlexGridSizer(2, 1, 0, 0);
 	FlexGridSizer5->AddGrowableCol(0);
 	FlexGridSizer6 = new wxFlexGridSizer(1, 1, 0, 0);
 	FlexGridSizer6->AddGrowableCol(0);
@@ -274,9 +272,13 @@ CFormRawMap::CFormRawMap(wxWindow* parent, wxWindowID)
 	btnView3D->Disable();
 	FlexGridSizer11->Add(
 		btnView3D, 1, wxALL | wxEXPAND | wxALIGN_LEFT | wxALIGN_TOP, 5);
+
+	btnClose = new wxButton(
+		Panel2, ID_BUTTON4, _("Close"), wxDefaultPosition, wxDefaultSize, 0,
+		wxDefaultValidator, _T("ID_BUTTON4"));
 	FlexGridSizer11->Add(
-		-1, -1, 1, wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL,
-		5);
+		btnClose, 1, wxALL | wxEXPAND | wxALIGN_LEFT | wxALIGN_TOP, 5);
+
 	lbCount = new wxStaticText(
 		Panel2, ID_STATICTEXT8, _("Point count=0 \n (No decimation)"),
 		wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT8"));
@@ -297,27 +299,6 @@ CFormRawMap::CFormRawMap(wxWindow* parent, wxWindowID)
 		boxResults, 1, wxALL | wxEXPAND | wxALIGN_LEFT | wxALIGN_TOP, 0);
 	FlexGridSizer5->Add(
 		FlexGridSizer7, 1, wxALL | wxEXPAND | wxALIGN_LEFT | wxALIGN_TOP, 3);
-	FlexGridSizer10 = new wxFlexGridSizer(1, 3, 0, 0);
-	FlexGridSizer10->AddGrowableCol(0);
-	FlexGridSizer10->AddGrowableRow(0);
-	FlexGridSizer10->Add(
-		-1, -1, 1, wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL,
-		5);
-	btnHelp = new wxBitmapButton(
-		Panel2, ID_BITMAPBUTTON1,
-		wxArtProvider::GetBitmap(
-			wxART_MAKE_ART_ID_FROM_STR(_T("wxART_INFORMATION")), wxART_BUTTON),
-		wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator,
-		_T("ID_BITMAPBUTTON1"));
-	FlexGridSizer10->Add(
-		btnHelp, 1, wxALL | wxEXPAND | wxALIGN_LEFT | wxALIGN_TOP, 4);
-	btnClose = new wxButton(
-		Panel2, ID_BUTTON4, _("Close"), wxDefaultPosition, wxDefaultSize, 0,
-		wxDefaultValidator, _T("ID_BUTTON4"));
-	FlexGridSizer10->Add(
-		btnClose, 1, wxALL | wxEXPAND | wxALIGN_LEFT | wxALIGN_TOP, 5);
-	FlexGridSizer5->Add(
-		FlexGridSizer10, 1, wxALL | wxEXPAND | wxALIGN_LEFT | wxALIGN_TOP, 5);
 	FlexGridSizer4->Add(
 		FlexGridSizer5, 1, wxALL | wxEXPAND | wxALIGN_LEFT | wxALIGN_TOP, 0);
 	FlexGridSizer2->Add(
@@ -730,7 +711,7 @@ void CFormRawMap::OnbtnGenerateClick(wxCommandEvent&)
 	mpFXYVector* lyPath = new mpFXYVector();
 	lyPath->SetPen(wxPen(wxColour(255, 0, 0), 2));
 	lyPath->SetContinuity(true);
-	lyPoints->SetPen(wxPen(wxColour(0, 0, 255), 0));
+	lyPoints->SetPen(wxPen(wxColour(0, 0, 255), 1));
 
 	plotMap->AddLayer(lyPoints);
 	plotMap->AddLayer(lyPath);
@@ -1136,7 +1117,7 @@ void CFormRawMap::OnGenerateFromRTK(wxCommandEvent&)
 	mpFXYVector* lyPath = new mpFXYVector();
 	lyPath->SetPen(wxPen(wxColour(255, 0, 0), 2));
 	lyPath->SetContinuity(true);
-	lyPoints->SetPen(wxPen(wxColour(0, 0, 255), 0));
+	lyPoints->SetPen(wxPen(wxColour(0, 0, 255), 1));
 
 	plotMap->AddLayer(lyPoints);
 	plotMap->AddLayer(lyPath);

apps/RawLogViewer/CFormRawMap.h

@@ -55,7 +55,6 @@ class CFormRawMap : public wxDialog
 	static const long ID_BUTTON9;
 	static const long ID_STATICTEXT8;
 	static const long ID_STATICTEXT2;
-	static const long ID_BITMAPBUTTON1;
 	static const long ID_BUTTON4;
 	static const long ID_TEXTCTRL1;
 	static const long ID_PANEL1;
@@ -92,7 +91,6 @@ class CFormRawMap : public wxDialog
 	wxFlexGridSizer* FlexGridSizer3;
 	wxStaticText* lbCount;
 	wxStaticText* StaticText6;
-	wxBitmapButton* btnHelp;
 	wxButton* btnSavePath;
 	wxFlexGridSizer* FlexGridSizer2;
 	wxStaticText* StaticText1;