Skip to content
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.

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

Changed the algorithm for calculating grid columns on Montage page #4034

Merged
merged 3 commits into from
May 23, 2024

Conversation

IgorA100
Copy link
Contributor

More than 12 monitors - "6 Wide"
From 4 to 12 - "4 Wide"
Less than 4 - "2 Wide"
It will probably be better this way.

More than 12 monitors - "6 Wide"
From 4 to 12 - "4 Wide"
Less than 4 - "2 Wide"
It will probably be better this way.
@connortechnology
Copy link
Member

My old code was something more like:
if (monitors.length <= 3) {
columns = monitors.length;
} else if (monitors.length <= 4) {
columns = 2;
} else if (monitors.length <= 6) {
columns = 3;
} else if (monitors.length%4 == 0) {
columns = 4;
} else if (monitors.length%5 == 0) {
columns = 5;
} else if (monitors.length%6 == 0) {
columns = 6;
} else {
columns = 4;
}

…ge.php)

if ($monitorCount <= 3) {
  $default_layout = $monitorCount . ' Wide';
} else if ($monitorCount <= 4) {
  $default_layout = '2 Wide';
} else if ($monitorCount <= 6) {
  $default_layout = '3 Wide';
} else if ($monitorCount%4 == 0) {
  $default_layout = '4 Wide';
} else if ($monitorCount%6 == 0) {
  $default_layout = '6 Wide';
} else {
  $default_layout = '4 Wide';
}
@IgorA100
Copy link
Contributor Author

Did it like this:

if ($monitorCount <= 3) {
  $default_layout = $monitorCount . ' Wide';
} else if ($monitorCount <= 4) {
  $default_layout = '2 Wide';
} else if ($monitorCount <= 6) {
  $default_layout = '3 Wide';
} else if ($monitorCount%4 == 0) {
  $default_layout = '4 Wide';
} else if ($monitorCount%6 == 0) {
  $default_layout = '6 Wide';
} else {
  $default_layout = '4 Wide';
}

Your old code was like this (and I didn't like it)

    if ((count($monitors) > 5) and (count($monitors)%5 == 0)) {
      $default_layout = '5 Wide';
    } else if ((count($monitors) > 4) and (count($monitors)%4 == 0)) {
      $default_layout = '4 Wide';
    } else if (count($monitors)%3 == 0) {
      $default_layout = '3 Wide';
    } else {
      $default_layout = '2 Wide';
    }

@IgorA100
Copy link
Contributor Author

I liked your algorithm, which I implemented in this PR.

@connortechnology connortechnology merged commit 8a57f91 into ZoneMinder:master May 23, 2024
9 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants