Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jlblancoc committed Sep 6, 2022
2 parents 3292445 + a7a4b3e commit 3205059
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 15 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/nanogui
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,8 @@ if (MRPT_COMPILER_IS_GCC_OR_CLANG)

# If enabled, and NOT in an arch that doesn't support the flag:
if(MRPT_TUNE_NATIVE AND
(NOT "${CMAKE_MRPT_ARCH}" STREQUAL "riscv64")
(NOT "${CMAKE_MRPT_ARCH}" STREQUAL "riscv64") AND
(NOT "${CMAKE_MRPT_ARCH}" STREQUAL "parisc64") # hppa
)
add_compile_options(-mtune=native)
endif()
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# version format
version: 2.5.2-{branch}-build{build}
version: 2.5.3-{branch}-build{build}

os: Visual Studio 2019

Expand Down
9 changes: 9 additions & 0 deletions doc/source/doxygen-docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
\page changelog Change Log

# Version 2.5.3: Released September 6th, 2022
- Changes in libraries:
- \ref mrpt_gui_grp
- nanogui::mainloop() (and mrpt::gui::CDisplayWindowGUI()) now allows defining a minimum period for calls to user callback functions via a new second optional parameter.
- \ref mrpt_obs_grp
- Not all `CObservation*` classes were declared in `<mrpt/obs/obs_frwds.h>`. Now it is corrected.
- BUG FIXES:
- Fix build on hppa (parisc64) architecture (not supported flag `-mtune=native`)

# Version 2.5.2: Released August 30th, 2022
- BUG FIXES:
- mrpt::math::MatrixBase::eig_symmetric() now is ensured not to return negative eigenvalues due to numerical innacuracies in some platforms (i386).
Expand Down
4 changes: 0 additions & 4 deletions doc/source/robotics_file_formats.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ different programs and C++ classes.

.. toctree::
:maxdepth: 1
:caption: For more details:

rawlog_format.rst



1. Datasets
Expand Down
1 change: 1 addition & 0 deletions libs/gui/include/mrpt/gui/CDisplayWindowGUI.h
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ class CDisplayWindowGUI : public nanogui::Screen
/** @} */

virtual void drawContents() override;
virtual void onIdleLoopTasks() override;

protected:
CDisplayWindowGUI(const CDisplayWindowGUI&) = delete;
Expand Down
5 changes: 4 additions & 1 deletion libs/gui/src/CDisplayWindowGUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ CDisplayWindowGUI::~CDisplayWindowGUI()
nanogui::Screen::setVisible(false);
}

void CDisplayWindowGUI::drawContents()
void CDisplayWindowGUI::onIdleLoopTasks()
{
// If provided, call the user loop code:
for (const auto& callback : m_loopCallbacks)
Expand All @@ -57,7 +57,10 @@ void CDisplayWindowGUI::drawContents()
<< e.what() << std::endl;
}
}
}

void CDisplayWindowGUI::drawContents()
{
// Optional: render background scene.
std::lock_guard<std::mutex> lck(background_scene_mtx);
if (!background_scene) return;
Expand Down
28 changes: 23 additions & 5 deletions libs/obs/include/mrpt/obs/obs_frwds.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,34 @@ namespace obs
class CObservation;
class CSensoryFrame;
class CObservation2DRangeScan;
class CObservation2DRangeScanWithUncertainty;
class CObservation3DRangeScan;
class CObservationVelodyneScan;
class CObservationRotatingScan;
class CObservationRange;
class CObservation3DScene;
class CObservation6DFeatures;
class CObservationBatteryState;
class CObservationBeaconRanges;
class CObservationBearingRange;
class CObservationStereoImages;
class CObservationCANBusJ1939;
class CObservationComment;
class CObservationGPS;
class CObservationPointCloud;
class CObservationGasSensors;
class CObservationIMU;
class CObservationImage;
class CObservationOdometry;
class CObservationRFID;
class CObservationRGBD360;
class CObservationRange;
class CObservationRawDAQ;
class CObservationReflectivity;
class CObservationRobotPose;
class CObservationRotatingScan;
class CObservationSkeleton;
class CObservationStereoImages;
class CObservationStereoImagesFeatures;
class CObservationVelodyneScan;
class CObservationWindSensor;
class CObservationWirelessPower;

} // namespace obs
namespace maps
{
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<package format="3">
<name>mrpt2</name>
<!-- Before updating version number, read [MRPT_ROOT]/version_prefix.txt first -->
<version>2.5.2</version>
<version>2.5.3</version>
<description>Mobile Robot Programming Toolkit (MRPT) version 2.x</description>

<author email="joseluisblancoc@gmail.com">Jose-Luis Blanco-Claraco</author>
Expand Down
2 changes: 1 addition & 1 deletion version_prefix.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
2.5.2
2.5.3
# IMPORTANT: This file is parsed by CMake, don't add any comment to
# the first line.
# This file is used in both Windows and Linux scripts to automatically
Expand Down

0 comments on commit 3205059

Please sign in to comment.