Merge branch 'master' of https://github.com/alandefreitas/matplotplusplus

alandefreitas · alandefreitas · commit ee95a57a189d · 2021-05-11T10:39:44.000-03:00
diff --git a/.github/stale.yml b/.github/stale.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,7 +51,7 @@ jobs:
             name: "Ubuntu/18.04/Static/X64/Release",
             os: ubuntu-18.04,
             config: Release,
-            cmake_extra_args: "-DCMAKE_C_COMPILER=/usr/bin/gcc-8 -DCMAKE_CXX_COMPILER=/usr/bin/g++-8  -DCMAKE_CXX_FLAGS=\"-O2\"",
+            cmake_extra_args: "-DCMAKE_C_COMPILER=/usr/bin/gcc-10 -DCMAKE_CXX_COMPILER=/usr/bin/g++-10  -DCMAKE_CXX_FLAGS=\"-O2\"",
             sudocmd: "sudo",
             artifact_name: "Linux",
             cores: 2,
@@ -101,4 +101,4 @@ jobs:
       - name: Archive Installer Packages as is
         uses: kittaakos/upload-artifact-as-is@v0
         with:
-          path: build/matplotplusplus-?.?.?-*.*
+          path: build/matplotplusplus-?.?.?-*.*
diff --git a/README.md b/README.md
@@ -9241,14 +9241,21 @@ If contributing to the documentation, please edit [`README.md`](README.md) direc
             <sub><b>Marcus Asteborg</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/Zengit123">
+            <img src="https://avatars.githubusercontent.com/u/13079947?v=4" width="100;" alt="Zengit123"/>
+            <br />
+            <sub><b>Zengit</b></sub>
+        </a>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/madronalabs">
             <img src="https://avatars.githubusercontent.com/u/1434276?v=4" width="100;" alt="madronalabs"/>
             <br />
             <sub><b>Randy Jones</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/sammi">
             <img src="https://avatars.githubusercontent.com/u/189128?v=4" width="100;" alt="sammi"/>
@@ -9263,6 +9270,13 @@ If contributing to the documentation, please edit [`README.md`](README.md) direc
             <sub><b>Alex</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/avocadoboi">
+            <img src="https://avatars.githubusercontent.com/u/24738592?v=4" width="100;" alt="avocadoboi"/>
+            <br />
+            <sub><b>BjC6rn Sundin</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/dimztimz">
             <img src="https://avatars.githubusercontent.com/u/6236568?v=4" width="100;" alt="dimztimz"/>
@@ -9276,7 +9290,8 @@ If contributing to the documentation, please edit [`README.md`](README.md) direc
             <br />
             <sub><b>MaBnt</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/kaffehalv">
             <img src="https://avatars.githubusercontent.com/u/33203776?v=4" width="100;" alt="kaffehalv"/>
@@ -9290,8 +9305,14 @@ If contributing to the documentation, please edit [`README.md`](README.md) direc
             <br />
             <sub><b>Akash Patel</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
+    <td align="center">
+        <a href="https://github.com/myd7349">
+            <img src="https://avatars.githubusercontent.com/u/5435649?v=4" width="100;" alt="myd7349"/>
+            <br />
+            <sub><b>Myd7349</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/ankane">
             <img src="https://avatars3.githubusercontent.com/u/220358?v=4" width="100;" alt="ankane"/>
diff --git a/source/matplot/CMakeLists.txt b/source/matplot/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(Filesystem REQUIRED)
+find_package(Filesystem REQUIRED COMPONENTS Experimental Final)
 
 add_library(matplot
         matplot.h
diff --git a/source/matplot/axes_objects/bars.h b/source/matplot/axes_objects/bars.h
@@ -104,14 +104,14 @@ namespace matplot {
         std::vector<std::vector<double>> ys_;
 
         // color and style
-        std::vector<color_array> face_colors_{{0.4, 0, 0, 0}};
+        std::vector<color_array> face_colors_{{0.4f, 0, 0, 0}};
         bool manual_face_color_{false};
         color_array edge_color_{0, 0, 0, 0};
         line_spec edge_style_{"-"};
         float line_width_{0.5};
         bool vertical_orientation_{true};
-        float bar_width_{0.8};
-        float cluster_width_{0.8};
+        float bar_width_{0.8f};
+        float cluster_width_{0.8f};
 
         // True if visible
         bool visible_{true};
diff --git a/source/matplot/axes_objects/box_chart.h b/source/matplot/axes_objects/box_chart.h
@@ -126,7 +126,7 @@ namespace matplot {
         std::vector<double> x_data_;
 
         // color and style
-        color_array face_color_{{0.4, 0, 0, 0}};
+        color_array face_color_{{0.4f, 0, 0, 0}};
         bool manual_face_color_{false};
         color_array edge_color_{0, 0, 0, 0};
         float edge_width_{0.5};
diff --git a/source/matplot/axes_objects/error_bar.h b/source/matplot/axes_objects/error_bar.h
@@ -80,7 +80,7 @@ namespace matplot {
         std::vector<double> y_positive_delta_{};
 
         bool filled_curve_{false};
-        float filled_curve_alpha_{0.90};
+        float filled_curve_alpha_{0.9f};
 
         float cap_size_{3.};
     };
diff --git a/source/matplot/axes_objects/histogram.h b/source/matplot/axes_objects/histogram.h
@@ -248,7 +248,7 @@ namespace matplot {
         enum normalization normalization_ { normalization::count };
 
         // color and style
-        color_array face_color_{0.4, 0, 0, 0};
+        color_array face_color_{0.4f, 0, 0, 0};
         bool manual_face_color_{false};
         color_array edge_color_{0, 0, 0, 0};
         bool manual_edge_color_{false};
diff --git a/source/matplot/axes_objects/matrix.h b/source/matplot/axes_objects/matrix.h
@@ -126,10 +126,10 @@ namespace matplot {
         std::string labels_data_string();
 
         inline double x_width() {
-            return (w_ - 1) / (matrices_[0][0].size() - 1);
+            return (w_ - 1) / static_cast<double>(matrices_[0][0].size() - 1);
         }
 
-        inline double y_width() { return (h_ - 1) / (matrices_[0].size() - 1); }
+        inline double y_width() { return (h_ - 1) / static_cast<double>(matrices_[0].size() - 1); }
 
       protected:
         // Main matrix
diff --git a/source/matplot/axes_objects/surface.h b/source/matplot/axes_objects/surface.h
@@ -214,7 +214,7 @@ namespace matplot {
         size_t norm_{2};
         bool hidden3d_{false};
         bool depthorder_{false};
-        float face_alpha_{.95};
+        float face_alpha_{.95f};
         class line_spec line_spec_;
         bool lighting_{false};
         float primary_{-1.};
diff --git a/source/matplot/core/axes_type.cpp b/source/matplot/core/axes_type.cpp
@@ -2214,6 +2214,9 @@ namespace matplot {
         y_axis_.limits_mode_auto(true);
         y2_axis_.limits_mode_auto(true);
         z_axis_.limits_mode_auto(true);
+        axes_type::x_axis().reverse(false);
+        axes_type::y_axis().reverse(false);
+        minor_grid(false);
         touch();
     }
 
@@ -5416,4 +5419,4 @@ namespace matplot {
         parent_->backend_->draw_path(cx,cy,color);
     }
 
-} // namespace matplot
+} // namespace matplot
diff --git a/source/matplot/core/axes_type.h b/source/matplot/core/axes_type.h
@@ -24,11 +24,11 @@ namespace matplot {
     class axes_type : public std::enable_shared_from_this<class axes_type> {
       public:
         // {left bottom right top}
-        static constexpr std::array<float, 4> default_subplot_inset{.2, .18,
-                                                                    .04, .1};
+        static constexpr std::array<float, 4> default_subplot_inset{.2f, .18f,
+                                                                    .04f, .1f};
         // {x, y, width, height}
-        static constexpr std::array<float, 4> default_axes_position{.13, .11,
-                                                                    .775, .815};
+        static constexpr std::array<float, 4> default_axes_position{.13f, .11f,
+                                                                    .775f, .815f};
 
       public:
         axes_type();
@@ -2783,7 +2783,7 @@ namespace matplot {
 
         // colors for children object
         std::array<float, 4> color_{0, 1.0, 1.0, 1.0};
-        std::array<float, 4> color_outside_{0, 0.97, 0.97, 0.97};
+        std::array<float, 4> color_outside_{0, 0.97f, 0.97f, 0.97f};
         std::vector<std::array<float, 4>> colororder_{
             default_color(0), default_color(1), default_color(2),
             default_color(3), default_color(4), default_color(5),
diff --git a/source/matplot/core/axis_type.h b/source/matplot/core/axis_type.h
@@ -132,7 +132,7 @@ namespace matplot {
         float tickangle_{0};
         std::vector<std::string> ticklabels_;
         bool ticklabels_mode_{true};
-        std::array<float, 4> color_{0, 0.15, 0.15, 0.15};
+        std::array<float, 4> color_{0, 0.15f, 0.15f, 0.15f};
         float tick_length_{0.75};
 
         // minor tics
diff --git a/source/matplot/core/figure_type.h b/source/matplot/core/figure_type.h
@@ -297,11 +297,11 @@ namespace matplot {
         std::string name_;
         std::string title_;
         color_array title_color_{0, 0, 0, 0};
-        float title_font_size_multiplier_{1.4};
+        float title_font_size_multiplier_{1.4f};
         size_t number_{1};
         bool number_title_{true};
         // ARGB
-        color_array color_{0., 0.9400, 0.9400, 0.9400};
+        color_array color_{0., 0.94f, 0.94f, 0.94f};
         bool custom_color_{false}; // was this color defined by the user
         std::string font_{"Helvetica"};
         float font_size_{10.};
diff --git a/source/matplot/core/line_spec.h b/source/matplot/core/line_spec.h
@@ -159,21 +159,21 @@ namespace matplot {
         // linewidth 3 linetype 4 unset label
       private:
         // Line
-        std::array<float, 4> color_{0, 0, 0.4470, 0.7410};
+        std::array<float, 4> color_{0, 0, 0.447f, 0.741f};
         // Did the user provide a color or is the color just a placeholder
         bool user_color_{false};
         enum line_style line_style_ { line_style::none };
         float line_width_{0.5000};
 
         // Marker
         enum marker_style marker_style_ { marker_style::none };
-        std::array<float, 4> marker_color_{0, 0, 0.4470, 0.7410};
+        std::array<float, 4> marker_color_{0, 0, 0.447f, 0.741f};
         bool marker_user_color_{false};
         std::string custom_marker_{""};
         float marker_size_{6};
 
         // Marker face
-        std::array<float, 4> marker_face_color_{0, 0.84, 1., 1.};
+        std::array<float, 4> marker_face_color_{0, 0.84f, 1., 1.};
         bool marker_face_user_color_{false};
         bool marker_face_ = false;
 
diff --git a/source/matplot/util/colors.h b/source/matplot/util/colors.h
@@ -63,21 +63,21 @@ namespace matplot {
         size_t color_index = index % num_default_colors;
         switch (color_index) {
         case 0:
-            return {0, 0, 0.4470, 0.7410};
+            return {0, 0, 0.447f, 0.741f};
         case 1:
-            return {0, 0.8500, 0.3250, 0.0980};
+            return {0, 0.85f, 0.325f, 0.098f};
         case 2:
-            return {0, 0.9290, 0.6940, 0.1250};
+            return {0, 0.929f, 0.694f, 0.125f};
         case 3:
-            return {0, 0.4940, 0.1840, 0.5560};
+            return {0, 0.494f, 0.184f, 0.556f};
         case 4:
-            return {0, 0.4660, 0.6740, 0.1880};
+            return {0, 0.466f, 0.674f, 0.188f};
         case 5:
-            return {0, 0.3010, 0.7450, 0.9330};
+            return {0, 0.301f, 0.745f, 0.933f};
         case 6:
-            return {0, 0.6350, 0.0780, 0.1840};
+            return {0, 0.635f, 0.078f, 0.184f};
         default:
-            return {0, 0.0, 0.0, 0.0};
+            return {};
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-find_package(Filesystem REQUIRED)`
	`1`	`+find_package(Filesystem REQUIRED COMPONENTS Experimental Final)`
`2`	`2`
`3`	`3`	`add_library(matplot`
`4`	`4`	`matplot.h`