Progress importing changes from develop

Author: jlblancoc

apps/RawLogViewer/ViewOptions3DPoints.cpp

@@ -132,10 +132,16 @@ ViewOptions3DPoints::ViewOptions3DPoints(wxWindow* parent, wxWindowID id)
   FlexGridSizer3->Add(
       cbOnlyPointsWithColor, 1, wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL, 5);
 
-  rbColorByAxis = new wxRadioBox(
-      this, ID_RADIOBOX1, _("Otherwise, color from: "), wxDefaultPosition, wxDefaultSize, 4,
-      __wxRadioBoxChoices_1, 1, 0, wxDefaultValidator, _T("ID_RADIOBOX1"));
-  FlexGridSizer3->Add(rbColorByAxis, 1, wxEXPAND, 5);
+  const wxString colorOptions[] = {"x", "y", "z",    "i",         "intensity",   "ambient",
+                                   "r", "t", "time", "timestamp", "reflectivity"};
+
+  cbColorByAxis = new wxComboBox(
+      this, ID_RADIOBOX1, _("Otherwise, color from:"), wxDefaultPosition, wxDefaultSize,
+      WXSIZEOF(colorOptions), colorOptions,
+      wxCB_READONLY,  // prevents typing arbitrary values
+      wxDefaultValidator, _T("ID_COMBOBOX_COLORBY"));
+
+  FlexGridSizer3->Add(cbColorByAxis, 1, wxEXPAND, 5);
   wxString __wxRadioBoxChoices_2[3] = {_("cmGRAYSCALE"), _("cmJET"), _("cmHOT")};
   RadioBox1 = new wxRadioBox(
       this, ID_RADIOBOX2, _("Color map"), wxDefaultPosition, wxDefaultSize, 3,
@@ -220,7 +226,7 @@ ViewOptions3DPoints::ViewOptions3DPoints(wxWindow* parent, wxWindowID id)
   Bind(wxEVT_BUTTON, &Me::OnbtnApplyClick, this, ID_BUTTON1);
   Bind(wxEVT_CHECKBOX, &Me::OnbtnApplyClick, this, ID_CHECKBOX1);
   Bind(wxEVT_CHECKBOX, &Me::OnbtnApplyClick, this, ID_CHECKBOX2);
-  Bind(wxEVT_RADIOBOX, &Me::OnbtnApplyClick, this, ID_RADIOBOX1);
+  Bind(wxEVT_COMBOBOX, &Me::OnbtnApplyClick, this, ID_RADIOBOX1);
   Bind(wxEVT_RADIOBOX, &Me::OnbtnApplyClick, this, ID_RADIOBOX2);
   Bind(wxEVT_CHECKBOX, &Me::OnbtnApplyClick, this, ID_CHECKBOX3);
   Bind(wxEVT_SPINCTRL, &Me::OnbtnApplyClick, this, ID_SPINCTRL1);
@@ -250,7 +256,8 @@ void ParametersView3DPoints::to_UI(ViewOptions3DPoints& ui) const
   ui.edTickTextSize->SetValue(wxString::Format("%.03f", axisTickTextSize));
 
   ui.cbColorFromRGB->SetValue(colorFromRGBimage);
-  ui.rbColorByAxis->SetSelection(colorizeByAxis);
+  ui.cbColorByAxis->SetValue(colorizeByField);
+
   ui.cbInvertColormap->SetValue(invertColorMapping);
 
   ui.RadioBox1->SetSelection(static_cast<int>(colorMap));
@@ -280,7 +287,7 @@ void ParametersView3DPoints::from_UI(const ViewOptions3DPoints& ui)
 
   colorFromRGBimage = ui.cbColorFromRGB->IsChecked();
 
-  colorizeByAxis = ui.rbColorByAxis->GetSelection();
+  colorizeByField = ui.cbColorByAxis->GetValue();
 
   invertColorMapping = ui.cbInvertColormap->IsChecked();
 

apps/RawLogViewer/ViewOptions3DPoints.h

@@ -19,6 +19,7 @@
 #include <wx/button.h>
 #include <wx/checkbox.h>
 #include <wx/clrpicker.h>
+#include <wx/combobox.h>
 #include <wx/panel.h>
 #include <wx/radiobox.h>
 #include <wx/sizer.h>
@@ -56,7 +57,7 @@ class ViewOptions3DPoints : public wxPanel
   wxCheckBox* cb2DShowPoints;
   wxRadioBox* RadioBox1;
   wxCheckBox* cbColorFromRGB;
-  wxRadioBox* rbColorByAxis;
+  wxComboBox* cbColorByAxis;
   wxTextCtrl* edTickTextSize;
   wxCheckBox* cbShowAxes;
   wxSpinCtrl* edPointSize;

modules/mrpt_containers/include/mrpt/containers/NonCopiableData.h

@@ -35,6 +35,20 @@ class NonCopiableData
 
   T data;
 
+  NonCopiableData& operator=(const T& value)
+  {
+    data = value;
+    return *this;
+  }
+
+  NonCopiableData(T&& value) : data(std::move(value)) {}
+  NonCopiableData(const T& value) : data(value) {}
+
+  T& operator*() { return data; }
+  const T& operator*() const { return data; }
+  T* operator->() { return &data; }
+  const T* operator->() const { return &data; }
+
   NonCopiableData(const NonCopiableData&) {}
   NonCopiableData& operator=(const NonCopiableData&) { return *this; }
 

modules/mrpt_core/include/mrpt/core/WorkerThreadsPool.h

@@ -93,11 +93,11 @@ class WorkerThreadsPool
    * available. */
   template <class F, class... Args>
   [[nodiscard]] auto enqueue(F&& f, Args&&... args)
-      -> std::future<typename std::result_of<F(Args...)>::type>;
+      -> std::future<std::invoke_result_t<F, Args...>>;
 
   /** Returns the number of enqueued tasks, currently waiting for a free
    * working thread to process them.  */
-  std::size_t pendingTasks() const noexcept;
+  [[nodiscard]] std::size_t pendingTasks() const noexcept;
 
   /** Sets the private thread names of threads in this pool.
    * Names can be seen from debuggers, profilers, etc. and will follow
@@ -107,7 +107,7 @@ class WorkerThreadsPool
   void name(const std::string& name);
 
   /** Returns the base name of threads in this pool */
-  std::string name() const { return name_; }
+  [[nodiscard]] std::string name() const { return name_; }
 
  private:
   std::vector<std::thread> threads_;
@@ -121,16 +121,16 @@ class WorkerThreadsPool
 
 template <class F, class... Args>
 auto WorkerThreadsPool::enqueue(F&& f, Args&&... args)
-    -> std::future<typename std::result_of<F(Args...)>::type>
+    -> std::future<std::invoke_result_t<F, Args...>>
 {
-  using return_type = typename std::result_of<F(Args...)>::type;
+  using return_type = std::invoke_result_t<F, Args...>;
 
   auto task = std::make_shared<std::packaged_task<return_type()>>(
       std::bind(std::forward<F>(f), std::forward<Args>(args)...));
 
   std::future<return_type> res = task->get_future();
   {
-    std::unique_lock<std::mutex> lock(queue_mutex_);
+    const std::unique_lock<std::mutex> lock(queue_mutex_);
 
     // don't allow enqueueing after stopping the pool
     if (do_stop_)

modules/mrpt_maps/include/mrpt/maps.h

@@ -25,6 +25,7 @@ MRPT_WARNING(
 #include <mrpt/maps/CColouredOctoMap.h>
 #include <mrpt/maps/CColouredPointsMap.h>
 #include <mrpt/maps/CGasConcentrationGridMap2D.h>
+#include <mrpt/maps/CGenericPointsMap.h>
 #include <mrpt/maps/CHeightGridMap2D.h>
 #include <mrpt/maps/CHeightGridMap2D_MRF.h>
 #include <mrpt/maps/CMultiMetricMap.h>