diff --git a/README.md b/README.md index d554d03..c0d7d0b 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,12 @@ Build calendar graphs with unlimited chart layers #### [Month](https://github.com/YGGverse/graph-php/blob/main/src/Calendar/Month.php) -![2 layers example](https://github.com/YGGverse/graph-php/blob/main/media/calendar/example-2-layers.png?raw=true) +![yggverse-graph-php-example](https://github.com/YGGverse/graph-php/assets/108541346/bbac7626-1f0b-476c-b154-f8a6f2933530) -##### Live examples +##### Examples - * [http://94.140.114.241/yggstate](http://94.140.114.241/yggstate) + * [YGGstate](https://github.com/YGGverse/YGGstate) - Yggdrasil Network Explorer + * [HLState](https://github.com/YGGverse/HLState) - Web Monitor for Half-Life Servers ##### Usage @@ -58,4 +59,4 @@ To make your own implementation, play with: var_dump( $calendarMonth->getNodes() ); -``` \ No newline at end of file +``` diff --git a/media/calendar/example-2-layers.png b/media/calendar/example-2-layers.png deleted file mode 100644 index 9a5491c..0000000 Binary files a/media/calendar/example-2-layers.png and /dev/null differ diff --git a/src/Calendar/Month.php b/src/Calendar/Month.php index fa19207..9a0bacf 100644 --- a/src/Calendar/Month.php +++ b/src/Calendar/Month.php @@ -35,18 +35,19 @@ class Month public function getNodes() : object { - // Calculate month totals - $total = []; + // Calculate max value + $max = 0; foreach ($this->_node as $i => $day) { foreach ($day as $l => $layer) { - $total[$i][$l] = 0; - foreach ($layer as $data) { - $total[$i][$l] += $data['value']; + if ($data['value'] > $max) + { + $max = $data['value']; + } } } } @@ -66,8 +67,8 @@ class Month // Calculate column width, height, offset foreach ($layer as $j => $data) { + $this->_node[$i][$l][$j]['height'] = $max ? ceil($data['value'] / $max * 100) : 0; $this->_node[$i][$l][$j]['width'] = $width; - $this->_node[$i][$l][$j]['height'] = $total[$i][$l] ? ceil($data['value'] / $total[$i][$l] * 100) : 0; $this->_node[$i][$l][$j]['offset'] = $width * $j; } }