diff --git a/lib/graphic/mathgl_dens.cpp b/lib/graphic/mathgl_dens.cpp index 04b8451..b12a295 100644 --- a/lib/graphic/mathgl_dens.cpp +++ b/lib/graphic/mathgl_dens.cpp @@ -83,8 +83,8 @@ int gctl::mathgl_dens::Draw(mglGraph *gr) for (size_t j = 0; j < xnum_; j++) { z_d.a[j + i*xnum_] = z_[j + i*xnum_]; - zmin = std::min(zmin, z_[j + i*xnum_]); - zmax = std::max(zmax, z_[j + i*xnum_]); + zmin = GCTL_MIN(zmin, z_[j + i*xnum_]); + zmax = GCTL_MAX(zmax, z_[j + i*xnum_]); } } diff --git a/lib/graphic/mathgl_plot.cpp b/lib/graphic/mathgl_plot.cpp index 749f2a2..28f054d 100644 --- a/lib/graphic/mathgl_plot.cpp +++ b/lib/graphic/mathgl_plot.cpp @@ -49,7 +49,7 @@ void gctl::mathgl_plot::add_profile(const array &in_y, std::string y_lab if (xnum_ != in_y.size()) throw std::runtime_error("[gctl::mathgl_plot] Invalid profile data size."); - ys_.append_array(in_y); + ys_.concat(in_y); y_ll_ = y_label; ynum_++; return; @@ -65,8 +65,8 @@ int gctl::mathgl_plot::Draw(mglGraph *gr) double mini = ys_.front(), maxi = ys_.front(); for (size_t i = 1; i < ys_.size(); i++) { - mini = std::min(mini, ys_[i]); - maxi = std::max(maxi, ys_[i]); + mini = GCTL_MIN(mini, ys_[i]); + maxi = GCTL_MAX(maxi, ys_[i]); } gr->SetSize(800, 400);