Merge pull request #2 from ConstantRobotics-Ltd/dev

Dev

Author: ConstantRobotics

README.md

@@ -3,7 +3,7 @@
 
 # **plotOpenCv C++ library**
 
-**v1.0.0**
+**v1.0.1**
 
 ------
 
@@ -34,6 +34,7 @@
 | Version | Release date | What's new                                                   |
 | ------- | ------------ | ------------------------------------------------------------ |
 | 1.0.0   | 08.09.2023   | First version.                                               |
+| 1.0.1   | 18.09.2023   | Update used container for plots.                             |
 
 
 # plot class description
@@ -131,7 +132,7 @@ std::cout << "plotOpenCv class version: " << plotOpenCv::getVersion() << std::en
 Console output:
 
 ```bash
-plotOpenCv class version: 1.0.0
+plotOpenCv class version: 1.0.1
 ```
 
 ## addPlot (for 1D dataset) method

src/CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13)
 ## LIBRARY-PROJECT
 ## name and version
 ###############################################################################
-project(plotOpenCv VERSION 1.0.0 LANGUAGES CXX)
+project(plotOpenCv VERSION 1.0.1 LANGUAGES CXX)
 
 ###############################################################################
 ## SETTINGS

src/plotOpenCv.cpp

@@ -93,7 +93,7 @@ void cr::utils::Plot::renderPlot(Plot2D plot)
                 plot.m_inMax, plot.m_outMax, plot.m_outMin) + plot.m_offsetY);
 
             cv::line(*m_image, previousPoint, currentPoint, plot.m_color,
- plot.m_tickness, cv::LINE_8);
+                    plot.m_tickness, cv::LINE_8);
         }
     }
     // 2D vector drawing.
@@ -117,30 +117,26 @@ void cr::utils::Plot::renderPlot(Plot2D plot)
      cv::Scalar color, int thickness) 
  {
      // Check if id is already contained.
-     for (const int& i : m_ids)
+     for (const auto& pair : m_plots)
      {
+         const int& i = pair.first;
          if (i == id)
          {
              // Remove plot from list.
-             std::list<Plot2D>::iterator it = m_plots.begin();
-             std::advance(it, id);
-             m_plots.erase(it);
- 
-             // Remove id from list.
-             auto removeIndex = std::remove(m_ids.begin(), m_ids.end(), id);
-             m_ids.erase(removeIndex, m_ids.end());
+             auto it = m_plots.find(i);
+             if (it != m_plots.end()) 
+                 m_plots.erase(it);
          }
      }
- 
-     m_ids.push_back(id);
- 
+
      // Add ploting object to list.
      std::vector<double> doubles;
      for (int i =0;i<points.size(); i++)
      {
          doubles.push_back(static_cast<double>(points[i]));
      }
-     m_plots.emplace_back(Plot2D(doubles, id, start, end, color, thickness));
+
+     m_plots.insert(std::make_pair(id, Plot2D(doubles, id, start, end, color, thickness)));
 
  }
 
@@ -149,23 +145,18 @@ void cr::utils::Plot::renderPlot(Plot2D plot)
     cv::Scalar color, int thickness)
 {
     // Check if id is already contained.
-    for (const int& i : m_ids)
+    for (const auto& pair : m_plots)
     {
+        const int& i = pair.first;
         if (i == id)
         {
             // Remove plot from list.
-            std::list<Plot2D>::iterator it = m_plots.begin();
-            std::advance(it, id);
-            m_plots.erase(it);
-
-            // Remove id from list.
-            auto removeIndex = std::remove(m_ids.begin(), m_ids.end(), id);
-            m_ids.erase(removeIndex, m_ids.end());
+            auto it = m_plots.find(i);
+            if (it != m_plots.end())
+                m_plots.erase(it);
         }
     }
 
-    m_ids.push_back(id);
-
     // Convert points vector to double.
     std::vector<std::vector<double>> doubles;
     std::vector<double> temp(2);
@@ -178,7 +169,7 @@ void cr::utils::Plot::renderPlot(Plot2D plot)
     }
 
     // Add ploting object to list.
-    m_plots.emplace_back(Plot2D(doubles, id, start, end, color, thickness));
+    m_plots.insert(std::make_pair(id, Plot2D(doubles, id, start, end, color, thickness)));
 
 }
 
@@ -200,8 +191,8 @@ void cr::utils::Plot::clean()
         cv::line(*m_image, cv::Point(i, 0), 
                 cv::Point(i, m_height), cv::Scalar(0, 0, 0));
 
+    // Clear all instances from container.
     m_plots.clear();
-    m_ids.clear();
 }
 
 void cr::utils::Plot::show()
@@ -225,9 +216,10 @@ void cr::utils::Plot::show()
                  cv::Point(i, m_height), cv::Scalar(0, 0, 0));
     }
 
-    // Draw plot objects on window.
-    for (const Plot2D& plot : m_plots)
+    // Iterate over the values (Plot2D instances) in the map
+    for (const auto& pair : m_plots) 
     {
+        const Plot2D& plot = pair.second;
         renderPlot(plot);
     }
 

src/plotOpenCv.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <vector>
 #include <string>
+#include <map>
 #include <opencv2/opencv.hpp>
 #include <opencv2/highgui/highgui.hpp>
 
@@ -146,10 +147,8 @@ class Plot {
     cv::Scalar m_horizontalScaleLineColor;
     /// Window name
     std::string m_name;
-    /// List of plots
-    std::list<Plot2D> m_plots;
-    /// List of ids
-    std::vector<int> m_ids;
+    // Create a std::map to store Plot2D instances with integer IDs
+    std::map<int, Plot2D> m_plots;
 
     /**
     * @brief Method to render a plot on window.

src/plotOpenCvVersion.h

@@ -2,6 +2,6 @@
 
 #define PLOT_OPENCV_MAJOR_VERSION 1
 #define PLOT_OPENCV_MINOR_VERSION 0
-#define PLOT_OPENCV_PATCH_VERSION 0
+#define PLOT_OPENCV_PATCH_VERSION 1
 
-#define PLOT_OPENCV_VERSION "1.0.0"
+#define PLOT_OPENCV_VERSION "1.0.1"