fix(examples): disambiguate legend

alandefreitas · alandefreitas · commit 0bb23796e919 · 2023-05-28T20:40:41.000-03:00
diff --git a/examples/appearance/labels/legend/legend_1.cpp b/examples/appearance/labels/legend/legend_1.cpp
@@ -12,7 +12,7 @@ int main() {
     std::vector<double> y2 = transform(x, [](auto x) { return cos(2 * x); });
     plot(x, y2);
 
-    legend("cos(x)", "cos(2x)");
+    ::matplot::legend({"cos(x)", "cos(2x)"});
 
     std::vector<double> y3 = transform(x, [](auto x) { return cos(3 * x); });
     auto p = plot(x, y3);
@@ -21,7 +21,7 @@ int main() {
 
     show();
 
-    legend(off);
+    ::matplot::legend(off);
     show();
 
     return 0;
diff --git a/examples/appearance/labels/legend/legend_2.cpp b/examples/appearance/labels/legend/legend_2.cpp
@@ -13,7 +13,7 @@ int main() {
     auto ax2 = nexttile();
     plot(y2);
 
-    legend(ax1, "Line 1", "Line 2", "Line 3");
+    ::matplot::legend(ax1, {"Line 1", "Line 2", "Line 3"});
 
     show();
     return 0;
diff --git a/examples/appearance/labels/legend/legend_3.cpp b/examples/appearance/labels/legend/legend_3.cpp
@@ -16,7 +16,7 @@ int main() {
     p2->display_name("cos(2x)");
     hold(off);
 
-    legend();
+    ::matplot::legend({});
 
     show();
     return 0;
diff --git a/examples/appearance/labels/legend/legend_4.cpp b/examples/appearance/labels/legend/legend_4.cpp
@@ -17,7 +17,7 @@ int main() {
     plot(x, y4);
     hold(off);
 
-    auto l = legend("cos(x)", "cos(2x)", "cos(3x)", "cos(4x)");
+    auto l = ::matplot::legend({"cos(x)", "cos(2x)", "cos(3x)", "cos(4x)"});
     l->location(legend::general_alignment::topleft);
     l->num_rows(2);
 
diff --git a/examples/appearance/labels/legend/legend_5.cpp b/examples/appearance/labels/legend/legend_5.cpp
@@ -15,7 +15,7 @@ int main() {
     auto p3 = plot(x, y3);
     hold(off);
 
-    legend({p1, p3}, {"First", "Third"});
+    ::matplot::legend({p1, p3}, {"First", "Third"});
 
     show();
     return 0;
diff --git a/examples/appearance/labels/legend/legend_6.cpp b/examples/appearance/labels/legend/legend_6.cpp
@@ -13,7 +13,7 @@ int main() {
     plot(x, y2);
     hold(off);
 
-    auto lgd = legend("cos(x)", "cos(2x)");
+    auto lgd = ::matplot::legend({"cos(x)", "cos(2x)"});
     title(lgd, "My legend title");
 
     show();
diff --git a/examples/appearance/labels/legend/legend_7.cpp b/examples/appearance/labels/legend/legend_7.cpp
@@ -13,7 +13,7 @@ int main() {
     plot(x, y2);
     hold(off);
 
-    auto lgd = legend("cos(x)", "cos(2x)");
+    auto lgd = ::matplot::legend({"cos(x)", "cos(2x)"});
     lgd->location(legend::general_alignment::bottomleft);
     lgd->box(false);
 
diff --git a/examples/appearance/labels/legend/legend_8.cpp b/examples/appearance/labels/legend/legend_8.cpp
@@ -7,7 +7,7 @@ int main() {
 
     plot(rdm);
 
-    auto lgd = legend("Line 1", "Line 2", "Line 3", "Line 4");
+    auto lgd = ::matplot::legend({"Line 1", "Line 2", "Line 3", "Line 4"});
     lgd->font_size(12);
     lgd->text_color("blue");
     lgd->num_columns(2);
diff --git a/examples/appearance/labels/legend/legend_9.cpp b/examples/appearance/labels/legend/legend_9.cpp
@@ -6,7 +6,7 @@ int main() {
 
     auto random_lines = rand(4, 4, 0, 1);
     auto ls = plot(random_lines);
-    legend("Line 1", "Line 2");
+    ::matplot::legend({"Line 1", "Line 2"});
     ls[2]->display_name("Line 3");
 
     show();
diff --git a/examples/appearance/multiplot/yyaxis/yyaxis_4.cpp b/examples/appearance/multiplot/yyaxis/yyaxis_4.cpp
@@ -18,7 +18,7 @@ int main() {
     ps[1]->use_y2(true).color("m").line_style("--");
     gca()->y2_axis().color("m");
 
-    legend();
+    ::matplot::legend();
 
     show();
     return 0;
diff --git a/examples/appearance/multiplot/yyaxis/yyaxis_5.cpp b/examples/appearance/multiplot/yyaxis/yyaxis_5.cpp
@@ -21,7 +21,7 @@ int main() {
     ax->y2_axis().color(ax->colororder()[1]);
     hold(off);
 
-    legend();
+    ::matplot::legend();
 
     show();
     return 0;
diff --git a/examples/data_distribution/histogram/histogram_14.cpp b/examples/data_distribution/histogram/histogram_14.cpp
@@ -58,7 +58,7 @@ int main() {
     subplot(2, 3, 0);
     title("Average - Normal / Gaussian - mean(x)= {∑ x_i}/{n} - x_i = N(0,1)");
     xlim({-4, 4});
-    legend();
+    ::matplot::legend({});
     std::normal_distribution<double> d(0, 1);
     std::function<double()> normal_data_source = [&]() { return d(generator); };
     hist(bootstrap(mean<double>, normal_data_source, 1), n_bins)
@@ -104,7 +104,7 @@ int main() {
     subplot(2, 3, 1);
     title("Average - Uniform - mean(x)= {∑ x_i}/{n} - x_i = U(-1;+1)");
     xlim({-1, 1});
-    legend();
+    ::matplot::legend({});
     std::uniform_real_distribution<double> u(-1.0, 1.0);
     std::function<double()> uniform_data_source = [&]() {
         return u(generator);
@@ -152,7 +152,7 @@ int main() {
     subplot(2, 3, 2);
     title("Sum of Squares - Chi-Squared - ∑ (x_i - mean(x))^2");
     xlim({0, 5});
-    legend();
+    ::matplot::legend();
     double m = 0;
     auto chi2_data_source = [&]() {
         return pow(normal_data_source() - m, 2.0);
@@ -202,7 +202,7 @@ int main() {
     subplot(2, 3, 3);
     title("Square Root of Sum of Squares - Chi - √{∑ (x_i - mean(x))^2}");
     xlim({0, 4});
-    legend();
+    ::matplot::legend({});
     auto chi_data_source = [&]() { return sqrt(chi2_data_source()); };
     hist(bootstrap(mean<double>, chi_data_source, 1), n_bins)
         ->normalization(norm)
@@ -247,7 +247,7 @@ int main() {
               << std::endl;
     subplot(2, 3, 4);
     title("Variance ratio - F - σ_1 / σ_2");
-    legend();
+    ::matplot::legend({});
     m = 0.0;
     auto ratio_ss = [&]() { return chi2_data_source() / chi2_data_source(); };
     xlim({0, 5});
@@ -297,7 +297,7 @@ int main() {
     subplot(2, 3, 5);
     title("Average - Bernoulli - mean(x)= {∑ x_i}/{n} - x_i = B(1/6)");
     xlim({0, 1});
-    legend();
+    ::matplot::legend();
     std::bernoulli_distribution b(1. / 6.);
     std::function<double()> bernoulli_data_source = [&]() {
         return static_cast<double>(b(generator));
diff --git a/examples/line_plot/loglog/loglog_5.cpp b/examples/line_plot/loglog/loglog_5.cpp
@@ -12,7 +12,7 @@ int main() {
 
     loglog(x, y1, x, y2, "--");
 
-    legend("Signal 1", "Signal 2")
+    ::matplot::legend({"Signal 1", "Signal 2"})
         ->location(legend::general_alignment::topleft);
 
     axis({0.1, 100, 2, 8});
diff --git a/examples/polar_plots/polarscatter/polarscatter_5.cpp b/examples/polar_plots/polarscatter/polarscatter_5.cpp
@@ -13,7 +13,7 @@ int main() {
     polarscatter(theta, rho2, "filled");
     hold(off);
 
-    auto l = legend("Series A", "Series B");
+    auto l = ::matplot::legend({"Series A", "Series B"});
     l->location(legend::general_alignment::topright);
 
     show();
