Skip to content

Fix quiver scaling to respect user input #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 9, 2022
Merged

Fix quiver scaling to respect user input #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01a6bab
change scaling to be consistant across all directional vectors
acxz Jul 3, 2022
959a734
increase scaling to keep the same plot
acxz Jul 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/vector_fields/quiver3/quiver3_1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ int main() {
auto V = get_v();
auto W = get_w();

quiver3(Z, U, V, W);
quiver3(Z, U, V, W, 5);
view(-35, 45);

show();
Expand Down
26 changes: 21 additions & 5 deletions source/matplot/core/axes_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4551,15 +4551,23 @@ namespace matplot {
double v_max = *std::max_element(v.begin(), v.end());
double y_max = ydiffmin != y_diff.end() ? *ydiffmin : v_max;

// scale u, v with same ratio to retain direction
double mag_max = 1;
for (size_t i = 0; i < u.size(); ++i) {
double mag = sqrt(u[i] * u[i] + v[i] * v[i]);
mag_max = mag > mag_max ? mag : mag_max;
}
double val_max = std::min(x_max, y_max);

auto u_scaled =
(scale != 0.)
? transform(
u, [&](double u) { return (u / u_max) * scale * x_max; })
u, [&](double u) { return (u / mag_max) * scale * val_max; })
: u;
auto v_scaled =
(scale != 0.)
? transform(
v, [&](double v) { return (v / v_max) * scale * y_max; })
v, [&](double v) { return (v / mag_max) * scale * val_max; })
: v;

vectors_handle l = std::make_shared<class vectors>(
Expand Down Expand Up @@ -4640,20 +4648,28 @@ namespace matplot {
double w_max = *std::max_element(w.begin(), w.end());
double z_max = zdiffmin != z_diff.end() ? *zdiffmin : w_max;

// scale u, v, w with same ratio to retain direction
double mag_max = 1;
for (size_t i = 0; i < u.size(); ++i) {
double mag = sqrt(u[i] * u[i] + v[i] * v[i] + w[i] * w[i]);
mag_max = mag > mag_max ? mag : mag_max;
}
double val_max = std::min(std::min(x_max, y_max), z_max);

auto u_scaled =
(scale != 0.)
? transform(
u, [&](double u) { return (u / u_max) * scale * x_max; })
u, [&](double u) { return (u / mag_max) * scale * val_max; })
: u;
auto v_scaled =
(scale != 0.)
? transform(
v, [&](double v) { return (v / v_max) * scale * y_max; })
v, [&](double v) { return (v / mag_max) * scale * val_max; })
: v;
auto w_scaled =
(scale != 0.)
? transform(
w, [&](double w) { return (w / w_max) * scale * z_max; })
w, [&](double w) { return (w / mag_max) * scale * val_max; })
: w;

vectors_handle l = std::make_shared<class vectors>(
Expand Down