Merge pull request #321 from AdenKoperczak/location_markers_part2

Location Markers Part 2

.clang-tidy

@@ -10,4 +10,6 @@ Checks:
   - '-misc-include-cleaner'
   - '-misc-non-private-member-variables-in-classes'
   - '-modernize-use-trailing-return-type'
+  - '-bugprone-easily-swappable-parameters'
+  - '-modernize-return-braced-init-list'
 FormatStyle: 'file'

scwx-qt/scwx-qt.cmake

@@ -222,8 +222,8 @@ set(HDR_TYPES source/scwx/qt/types/alert_types.hpp
               source/scwx/qt/types/layer_types.hpp
               source/scwx/qt/types/location_types.hpp
               source/scwx/qt/types/map_types.hpp
-              source/scwx/qt/types/media_types.hpp
               source/scwx/qt/types/marker_types.hpp
+              source/scwx/qt/types/media_types.hpp
               source/scwx/qt/types/qt_types.hpp
               source/scwx/qt/types/radar_product_record.hpp
               source/scwx/qt/types/text_event_key.hpp
@@ -255,6 +255,7 @@ set(HDR_UI source/scwx/qt/ui/about_dialog.hpp
            source/scwx/qt/ui/county_dialog.hpp
            source/scwx/qt/ui/download_dialog.hpp
            source/scwx/qt/ui/edit_line_dialog.hpp
+           source/scwx/qt/ui/edit_marker_dialog.hpp
            source/scwx/qt/ui/flow_layout.hpp
            source/scwx/qt/ui/gps_info_dialog.hpp
            source/scwx/qt/ui/hotkey_edit.hpp
@@ -285,6 +286,7 @@ set(SRC_UI source/scwx/qt/ui/about_dialog.cpp
            source/scwx/qt/ui/county_dialog.cpp
            source/scwx/qt/ui/download_dialog.cpp
            source/scwx/qt/ui/edit_line_dialog.cpp
+           source/scwx/qt/ui/edit_marker_dialog.cpp
            source/scwx/qt/ui/flow_layout.cpp
            source/scwx/qt/ui/gps_info_dialog.cpp
            source/scwx/qt/ui/hotkey_edit.cpp
@@ -314,6 +316,7 @@ set(UI_UI  source/scwx/qt/ui/about_dialog.ui
            source/scwx/qt/ui/collapsible_group.ui
            source/scwx/qt/ui/county_dialog.ui
            source/scwx/qt/ui/edit_line_dialog.ui
+           source/scwx/qt/ui/edit_marker_dialog.ui
            source/scwx/qt/ui/gps_info_dialog.ui
            source/scwx/qt/ui/imgui_debug_dialog.ui
            source/scwx/qt/ui/layer_dialog.ui
@@ -357,6 +360,7 @@ set(HDR_UTIL source/scwx/qt/util/color.hpp
              source/scwx/qt/util/network.hpp
              source/scwx/qt/util/streams.hpp
              source/scwx/qt/util/texture_atlas.hpp
+             source/scwx/qt/util/q_color_modulate.hpp
              source/scwx/qt/util/q_file_buffer.hpp
              source/scwx/qt/util/q_file_input_stream.hpp
              source/scwx/qt/util/time.hpp
@@ -369,6 +373,7 @@ set(SRC_UTIL source/scwx/qt/util/color.cpp
              source/scwx/qt/util/maplibre.cpp
              source/scwx/qt/util/network.cpp
              source/scwx/qt/util/texture_atlas.cpp
+             source/scwx/qt/util/q_color_modulate.cpp
              source/scwx/qt/util/q_file_buffer.cpp
              source/scwx/qt/util/q_file_input_stream.cpp
              source/scwx/qt/util/time.cpp

scwx-qt/scwx-qt.qrc

@@ -32,6 +32,10 @@
         <file>res/icons/font-awesome-6/angles-up-solid.svg</file>
         <file>res/icons/font-awesome-6/backward-step-solid.svg</file>
         <file>res/icons/font-awesome-6/book-solid.svg</file>
+        <file>res/icons/font-awesome-6/briefcase-solid.svg</file>
+        <file>res/icons/font-awesome-6/building-columns-solid.svg</file>
+        <file>res/icons/font-awesome-6/building-solid.svg</file>
+        <file>res/icons/font-awesome-6/caravan-solid.svg</file>
         <file>res/icons/font-awesome-6/copy-regular.svg</file>
         <file>res/icons/font-awesome-6/discord.svg</file>
         <file>res/icons/font-awesome-6/earth-americas-solid.svg</file>
@@ -40,8 +44,11 @@
         <file>res/icons/font-awesome-6/gears-solid.svg</file>
         <file>res/icons/font-awesome-6/github.svg</file>
         <file>res/icons/font-awesome-6/house-solid.svg</file>
+        <file>res/icons/font-awesome-6/house-solid-white.svg</file>
         <file>res/icons/font-awesome-6/keyboard-regular.svg</file>
         <file>res/icons/font-awesome-6/layer-group-solid.svg</file>
+        <file>res/icons/font-awesome-6/location-crosshairs-solid.svg</file>
+        <file>res/icons/font-awesome-6/location-pin.svg</file>
         <file>res/icons/font-awesome-6/palette-solid.svg</file>
         <file>res/icons/font-awesome-6/pause-solid.svg</file>
         <file>res/icons/font-awesome-6/play-solid.svg</file>
@@ -53,7 +60,9 @@
         <file>res/icons/font-awesome-6/square-minus-regular.svg</file>
         <file>res/icons/font-awesome-6/square-plus-regular.svg</file>
         <file>res/icons/font-awesome-6/star-solid.svg</file>
+        <file>res/icons/font-awesome-6/star-solid-white.svg</file>
         <file>res/icons/font-awesome-6/stop-solid.svg</file>
+        <file>res/icons/font-awesome-6/tent-solid.svg</file>
         <file>res/icons/font-awesome-6/volume-high-solid.svg</file>
         <file>res/palettes/wct/CC.pal</file>
         <file>res/palettes/wct/Default16.pal</file>

scwx-qt/source/scwx/qt/gl/draw/geo_icons.cpp

@@ -38,7 +38,7 @@ static constexpr std::size_t kIntegersPerVertex_ = 4;
 static constexpr std::size_t kIntegerBufferLength_ =
    kNumTriangles * kVerticesPerTriangle * kIntegersPerVertex_;
 
-struct GeoIconDrawItem
+struct GeoIconDrawItem : types::EventHandler
 {
    units::length::nautical_miles<double>       threshold_ {};
    std::chrono::sys_time<std::chrono::seconds> startTime_ {};
@@ -691,7 +691,7 @@ void GeoIcons::Impl::UpdateSingleBuffer(
                                hoverIcons.end(),
                                [&di](auto& entry) { return entry.di_ == di; });
 
-   if (di->visible_ && !di->hoverText_.empty())
+   if (di->visible_ && (!di->hoverText_.empty() || di->event_ != nullptr))
    {
       const units::angle::radians<double> radians = angle;
 
@@ -903,7 +903,7 @@ bool GeoIcons::RunMousePicking(
    const QPointF&   mouseGlobalPos,
    const glm::vec2& mouseCoords,
    const common::Coordinate& /* mouseGeoCoords */,
-   std::shared_ptr<types::EventHandler>& /* eventHandler */)
+   std::shared_ptr<types::EventHandler>& eventHandler)
 {
    std::unique_lock lock {p->iconMutex_};
 
@@ -993,12 +993,27 @@ bool GeoIcons::RunMousePicking(
    if (it != p->currentHoverIcons_.crend())
    {
       itemPicked = true;
-      util::tooltip::Show(it->di_->hoverText_, mouseGlobalPos);
+      if (!it->di_->hoverText_.empty())
+      {
+         // Show tooltip
+         util::tooltip::Show(it->di_->hoverText_, mouseGlobalPos);
+      }
+      if (it->di_->event_ != nullptr)
+      {
+         eventHandler = it->di_;
+      }
    }
 
    return itemPicked;
 }
 
+void GeoIcons::RegisterEventHandler(
+   const std::shared_ptr<GeoIconDrawItem>& di,
+   const std::function<void(QEvent*)>&     eventHandler)
+{
+   di->event_ = eventHandler;
+}
+
 } // namespace draw
 } // namespace gl
 } // namespace qt

scwx-qt/source/scwx/qt/gl/draw/geo_icons.hpp

@@ -183,6 +183,16 @@ class GeoIcons : public DrawItem
     */
    void FinishIcons();
 
+   /**
+    * Registers an event handler for an icon.
+    *
+    * @param [in] di Icon draw item
+    * @param [in] eventHandler Event handler function
+    */
+   static void
+   RegisterEventHandler(const std::shared_ptr<GeoIconDrawItem>& di,
+                        const std::function<void(QEvent*)>&     eventHandler);
+
 private:
    class Impl;