diff options
| author | Simon Rettberg | 2019-04-23 18:44:44 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-05-23 12:19:33 +0200 |
| commit | e9cb179a86461c8f0a4e9cd5c7054715323f62d0 (patch) | |
| tree | 193db3c5f4f3c1e49255a8b27cfd8eb1d0bc2436 | |
| parent | [serversetup-bwlp-ipxe] Use badge for refcount in bootentry table (diff) | |
| download | slx-admin-e9cb179a86461c8f0a4e9cd5c7054715323f62d0.tar.gz slx-admin-e9cb179a86461c8f0a4e9cd5c7054715323f62d0.tar.xz slx-admin-e9cb179a86461c8f0a4e9cd5c7054715323f62d0.zip | |
[roomplanner] Fix svg rotate logic
| -rw-r--r-- | modules-available/roomplanner/inc/pvsgenerator.inc.php | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/modules-available/roomplanner/inc/pvsgenerator.inc.php b/modules-available/roomplanner/inc/pvsgenerator.inc.php index e05ee1f1..2a4e2972 100644 --- a/modules-available/roomplanner/inc/pvsgenerator.inc.php +++ b/modules-available/roomplanner/inc/pvsgenerator.inc.php @@ -180,7 +180,7 @@ class PvsGenerator if ($auto && $highlightUuid !== false) { foreach ($machines as &$machine) { if ($machine['machineuuid'] === $highlightUuid) { - $rotate = $ORIENTATION[$machine['rotation']]; + $rotate = 4 - $ORIENTATION[$machine['rotation']]; // Reverse rotation break; } } @@ -194,8 +194,8 @@ class PvsGenerator $machine['rotation'] = $ORIENTATION[$machine['rotation']] * 90; } PvsGenerator::boundingBox($machines, $minX, $minY, $maxX, $maxY); - $clientSizeX = 4; /* TODO: optimize */ - $clientSizeY = 4; /* TODO: optimize */ + $clientSizeX = 4; /* this is optimal */ + $clientSizeY = 4; $minX--; $minY--; $maxX++; @@ -205,15 +205,13 @@ class PvsGenerator if ($rotate === 0) { $centerY = $centerX = 0; } elseif ($rotate === 1) { - $centerX = $minX + min($sizeX, $sizeY) / 2; - $centerY = $minY + min($sizeX, $sizeY) / 2; + $centerY = $centerX = $sizeY / 2; self::swap($sizeX, $sizeY); } elseif ($rotate === 2) { - $centerX = $minX + $sizeX / 2; - $centerY = $minY + $sizeY / 2; + $centerX = $sizeX / 2; + $centerY = $sizeY / 2; } else { - $centerX = $minX + max($sizeX, $sizeY) / 2; - $centerY = $minY + max($sizeX, $sizeY) / 2; + $centerY = $centerX = $sizeX / 2; self::swap($sizeX, $sizeY); } return Render::parse('svg-plan', [ |