Merge branch 'develop'

MRPT · Jul 24, 2024 · 0b35264 · 0b35264
2 parents 78f0ffa + a544281
commit 0b35264
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 375 deletions.
diff --git a/3rdparty/nanoflann b/3rdparty/nanoflann
diff --git a/3rdparty/nanogui b/3rdparty/nanogui
diff --git a/3rdparty/xspublic/xstypes/xsstatusflag.h b/3rdparty/xspublic/xstypes/xsstatusflag.h
@@ -57,7 +57,7 @@ enum XsStatusFlag
 
 	,XSF_RepresentativeMotion		= 0x20		//!< Indicates if the In-Run Compass Calibration is doing the representative motion analysis
 
-	,XSF_ExternalClockSynced		= 0x40		//!< Indicates whether the internal clock is synced with an external clock (Either GNNS or custom provided clock sync)
+	,XSF_ExternalClockSynced		= 0x40		//!< Indicates whether the internal clock is synced with an external clock (Either GNSS or custom provided clock sync)
 
 	,XSF_ClipAccX					= 0x00000100
 	,XSF_ClipAccY					= 0x00000200

diff --git a/apps/2d-slam-demo/slamdemoMain.cpp b/apps/2d-slam-demo/slamdemoMain.cpp
@@ -728,7 +728,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id)
 
   // IC plot ------------
   m_lyICvisibleRange = new mpPolygon();
-  m_lyICvisibleRange->SetPen(wxPen(wxColour(0, 0, 0), 1, wxLONG_DASH));
+  m_lyICvisibleRange->SetPen(wxPen(wxColour(0, 0, 0), 1, wxPENSTYLE_LONG_DASH));
   m_lyICvisibleRange->SetContinuity(true);
   m_lyICvisibleRange->SetCoordinateBase(0, 0, 0);
   plotIndivCompat->AddLayer(m_lyICvisibleRange);

diff --git a/apps/camera-calib/camera_calib_guiMain.cpp b/apps/camera-calib/camera_calib_guiMain.cpp
@@ -166,7 +166,7 @@ camera_calib_guiDialog::camera_calib_guiDialog(wxWindow* parent, wxWindowID id)
   btnCaptureNow = new wxButton(
       this, ID_BUTTON8, _("Grab now..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator,
       _T("ID_BUTTON8"));
-  wxFont btnCaptureNowFont(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxBOLD);
+  wxFont btnCaptureNowFont(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
   btnCaptureNow->SetFont(btnCaptureNowFont);
   FlexGridSizer5->Add(btnCaptureNow, 1, wxEXPAND, 5);
   btnPoseEstimateNow = new wxButton(
@@ -301,7 +301,7 @@ camera_calib_guiDialog::camera_calib_guiDialog(wxWindow* parent, wxWindowID id)
       this, ID_BUTTON3, _("Calibrate"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator,
       _T("ID_BUTTON3"));
   btnRunCalib->SetDefault();
-  wxFont btnRunCalibFont(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxBOLD);
+  wxFont btnRunCalibFont(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
   btnRunCalib->SetFont(btnRunCalibFont);
   FlexGridSizer8->Add(btnRunCalib, 1, wxEXPAND, 5);
   btnSave = new wxButton(

diff --git a/apps/ptg-configurator/ptgConfiguratorMain.cpp b/apps/ptg-configurator/ptgConfiguratorMain.cpp
@@ -206,7 +206,7 @@ ptgConfiguratorframe::ptgConfiguratorframe(wxWindow* parent, wxWindowID id) :
   btnReloadParams = new wxButton(
       Panel1, ID_BUTTON1, _("Initialize PTG"), wxDefaultPosition, wxDefaultSize, 0,
       wxDefaultValidator, _T("ID_BUTTON1"));
-  wxFont btnReloadParamsFont(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxBOLD);
+  wxFont btnReloadParamsFont(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
   btnReloadParams->SetFont(btnReloadParamsFont);
   FlexGridSizer7->Add(
       btnReloadParams, 1, wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL, 5);

diff --git a/apps/rosbag2rawlog/rosbag2rawlog_main.cpp b/apps/rosbag2rawlog/rosbag2rawlog_main.cpp
@@ -13,7 +13,7 @@
 //             as a RawLog file, easily readable by MRPT C++ programs.
 //
 //  Started: Hunter Laux @ SEPT-2018.
-//  Maintained: JLBC @ 2018-2023
+//  Maintained: JLBC @ 2018-2024
 // ===========================================================================
 
 #include <cv_bridge/cv_bridge.h>  // this header is obsolete in ros2-I but as long as this app is only built for ros1 we are ok

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 # version format
-version: 2.13.3-{branch}-build{build}
+version: 2.13.4-{branch}-build{build}
 
 os: Visual Studio 2019