[graphics] minor update (thanks to Simon's advice)

Author: godardma

python/src/graphics/figures/codac2_py_Figure2D.cpp

@@ -108,11 +108,11 @@ void export_Figure2D(py::module& m)
 
     .def("draw_line", &Figure2D::draw_line,
       VOID_FIGURE2D_DRAW_LINE_CONST_VECTOR_REF_CONST_VECTOR_REF_CONST_STYLEPROPERTIES_REF,
-      "c1"_a, "c2"_a, "s"_a=StyleProperties())
+      "a"_a, "b"_a, "s"_a=StyleProperties())
 
     .def("draw_arrow", &Figure2D::draw_arrow,
       VOID_FIGURE2D_DRAW_ARROW_CONST_VECTOR_REF_CONST_VECTOR_REF_FLOAT_CONST_STYLEPROPERTIES_REF,
-      "c1"_a, "c2"_a, "tip_length"_a, "s"_a=StyleProperties())
+      "a"_a, "b"_a, "tip_length"_a, "s"_a=StyleProperties())
 
     .def("draw_polyline", (void(Figure2D::*)(const std::vector<Vector>&,const StyleProperties&))&Figure2D::draw_polyline,
       VOID_FIGURE2D_DRAW_POLYLINE_CONST_VECTOR_VECTOR_REF_CONST_STYLEPROPERTIES_REF,
@@ -241,11 +241,11 @@ void export_Figure2D(py::module& m)
 
     .def_static("draw_line", &DefaultView::draw_line,
       STATIC_VOID_DEFAULTVIEW_DRAW_LINE_CONST_VECTOR_REF_CONST_VECTOR_REF_CONST_STYLEPROPERTIES_REF,
-      "c1"_a, "c2"_a, "s"_a=StyleProperties())
+      "a"_a, "b"_a, "s"_a=StyleProperties())
 
     .def_static("draw_arrow", &DefaultView::draw_arrow,
       STATIC_VOID_DEFAULTVIEW_DRAW_ARROW_CONST_VECTOR_REF_CONST_VECTOR_REF_FLOAT_CONST_STYLEPROPERTIES_REF,
-      "c1"_a, "c2"_a, "tip_length"_a, "s"_a=StyleProperties())
+      "a"_a, "b"_a, "tip_length"_a, "s"_a=StyleProperties())
 
     .def_static("draw_polyline", (void(*)(const std::vector<Vector>&,const StyleProperties&))&DefaultView::draw_polyline,
       STATIC_VOID_DEFAULTVIEW_DRAW_POLYLINE_CONST_VECTOR_VECTOR_REF_CONST_STYLEPROPERTIES_REF,

src/graphics/figures/codac2_Figure2D.cpp

@@ -138,24 +138,22 @@ void Figure2D::draw_ring(const Vector& c, const Interval& r, const StyleProperti
       output_fig->draw_ring(c,r,s);
 }
 
-void Figure2D::draw_line(const Vector& x, const Vector& y, const StyleProperties& s)
+void Figure2D::draw_line(const Vector& a, const Vector& b, const StyleProperties& s)
 {
-  assert_release(x.size() == y.size());
-  assert_release(x.size() == 2);
-  vector<Vector> values = {x,y};
+  assert_release(a.size() == b.size());
+  assert_release(a.size() == 2);
+  vector<Vector> values = {a,b};
 
-  for(const auto& output_fig : _output_figures)
-    output_fig->draw_polyline(values,1e-3*scaled_unit(),s);
+  draw_polyline(values,s);
 }
 
-void Figure2D::draw_arrow(const Vector& x, const Vector& y, float tip_length, const StyleProperties& s)
+void Figure2D::draw_arrow(const Vector& a, const Vector& b, float tip_length, const StyleProperties& s)
 {
-  assert_release(x.size() == y.size());
-  assert_release(x.size() == 2);
-  vector<Vector> values = {x,y};
+  assert_release(a.size() == b.size());
+  assert_release(a.size() == 2);
+  vector<Vector> values = {a,b};
 
-  for(const auto& output_fig : _output_figures)
-    output_fig->draw_polyline(values,tip_length,s);
+  draw_polyline(values,tip_length,s);
 }
 
 void Figure2D::draw_polyline(const vector<Vector>& x, const StyleProperties& s)
@@ -236,14 +234,13 @@ void Figure2D::draw_trajectory(const SampledTrajectory<Vector>& x, const ColorMa
 {
   assert_release(this->size() <= x.size());
 
-  std::vector<Vector> values(2);
-  values[0] = x.begin()->second;
-  for (auto it = std::next(x.begin()); it != x.end(); ++it)
+  double range = x.rbegin()->first - x.begin()->first;
+
+  for(auto it = x.begin(); std::next(it) != x.end(); ++it)
   {
-    values[1] = it->second;
-    Color color = cmap.color((it->first - x.begin()->first) / (x.rbegin()->first - x.begin()->first));
-    draw_polyline(values, color);
-    values[0] = values[1];
+    draw_polyline(
+    { it->second, std::next(it)->second },
+    cmap.color((it->first - x.begin()->first) / range));
   }
 }
 

src/graphics/figures/codac2_Figure2D.h

@@ -86,8 +86,8 @@ namespace codac2
       void draw_box(const IntervalVector& x, const StyleProperties& s = StyleProperties());
       void draw_circle(const Vector& c, double r, const StyleProperties& s = StyleProperties());
       void draw_ring(const Vector& c, const Interval& r, const StyleProperties& s = StyleProperties());
-      void draw_line(const Vector& x1, const Vector& x2, const StyleProperties& s = StyleProperties());
-      void draw_arrow(const Vector& x1, const Vector& x2, float tip_length, const StyleProperties& s = StyleProperties());
+      void draw_line(const Vector& a, const Vector& b, const StyleProperties& s = StyleProperties());
+      void draw_arrow(const Vector& a, const Vector& b, float tip_length, const StyleProperties& s = StyleProperties());
       void draw_polyline(const std::vector<Vector>& x, const StyleProperties& s = StyleProperties());
       void draw_polyline(const std::vector<Vector>& x, float tip_length, const StyleProperties& s = StyleProperties());
       void draw_polygone(const std::vector<Vector>& x, const StyleProperties& s = StyleProperties());