moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 18:36:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-55110 core: Add support for smooth lines

Browse source 
Part of MDL-54987 epic.
This commit is contained in:
Simey Lameze 2016-07-06 12:26:53 +08:00 • committed by Dan Poltawski
parent cc8438d112
commit f0f1e0310e
8 changed files with 151 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/classes/chart_line.php
View file

@ -33,4 +33,36 @@ defined('MOODLE_INTERNAL') || die();
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class chart_line extends chart_base {
/** @var bool Whether the line should be smooth or not. */
protected $smooth = false;
/**
* Add the smooth to the parent and return the serialized data.
*
* @return array
*/
public function jsonSerialize() {
$data = parent::jsonSerialize();
$data['smooth'] = $this->get_smooth();
return $data;
}
/**
* Get whether a lines should be smooth or not.
*
* @return bool
*/
public function get_smooth() {
return $this->smooth;
}
/**
* Set Whether the line should be smooth or not.
*
* @param bool $smooth True if the line chart should be smooth, false otherwise.
*/
public function set_smooth($smooth) {
$this->smooth = $smooth;
}
}

25
lib/classes/chart_series.php
View file

@ -46,6 +46,8 @@ class chart_series implements JsonSerializable {
protected $colors = [];
/** @var string Label for this series. */
protected $label;
/** @var bool Whether the line of the serie should be smooth or not. */
protected $smooth = null;
/** @var string Type of the series. */
protected $type = self::TYPE_DEFAULT;
/** @var float[] Values of the series. */
@ -102,6 +104,15 @@ class chart_series implements JsonSerializable {
return $this->label;
}
/**
* Get whether the line of the serie should be smooth or not.
*
* @return bool
*/
public function get_smooth() {
return $this->smooth;
}
/**
* Get the type of series.
*
@ -161,7 +172,8 @@ class chart_series implements JsonSerializable {
'axes' => [
'x' => $this->xaxis,
'y' => $this->yaxis,
]
],
'smooth' => $this->smooth
];
return $data;
}
@ -184,6 +196,17 @@ class chart_series implements JsonSerializable {
$this->colors = $colors;
}
/**
* Set whether the line of the serie should be smooth or not.
*
* Only applicable for line chart or a line series, if null it assumes the chart default (not smooth).
*
* @param bool true if the line should be smooth, false if not.
*/
public function set_smooth($smooth) {
$this->smooth = $smooth;
}
/**
* Set the type of the series.
*