stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added some data and input validation

Browse source
This commit is contained in:
Steffen Vogel 2010-07-31 15:43:49 +02:00
parent 7d99cd7318
commit 0cca2826bd
3 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/lib/View/JSON.php
View file

@ -34,8 +34,6 @@ use Volkszaehler\Model;
* @author Steffen Vogel <info@steffenvogel.de>
*/
class JSON extends View {
const PRECISSION = 5;
protected $json = array();
protected $padding = FALSE;
@ -131,7 +129,7 @@ class JSON extends View {
foreach ($data as $reading) {
$jsonData[] = array(
(int) $reading[0],
(float) round($reading[1], JSON::PRECISSION),
(float) round($reading[1], View::PRECISSION),
(int) $reading[2]
);
}

45
backend/lib/View/JpGraph.php
View file

@ -94,34 +94,39 @@ class JpGraph extends View {
* @param $data
*/
public function addChannel(Model\Channel $channel, array $data = NULL){
$count = count($this->channels);
$xData = $yData = array();
if (isset($data) && count($data) > 0) {
$count = count($this->channels);
$xData = $yData = array();
foreach ($data as $reading) {
$xData[] = $reading[0] / 1000;
$yData[] = $reading[1];
}
foreach ($data as $reading) {
$xData[] = $reading[0] / 1000;
$yData[] = $reading[1];
}
// Create the scatter plot
$plot = new \ScatterPlot($yData, $xData);
// Create the scatter plot
$plot = new \ScatterPlot($yData, $xData);
$plot->setLegend($channel->getName() . ': ' . $channel->getDescription() . ' [' . $channel->getUnit() . ']');
$plot->SetLinkPoints(TRUE, self::$colors[$count]);
$plot->setLegend($channel->getName() . ': ' . $channel->getDescription() . ' [' . $channel->getUnit() . ']');
$plot->SetLinkPoints(TRUE, self::$colors[$count]);
$plot->mark->SetColor(self::$colors[$count]);
$plot->mark->SetFillColor(self::$colors[$count]);
$plot->mark->SetType(MARK_DIAMOND);
$plot->mark->SetWidth(1);
$plot->mark->SetColor(self::$colors[$count]);
$plot->mark->SetFillColor(self::$colors[$count]);
$plot->mark->SetType(MARK_DIAMOND);
$plot->mark->SetWidth(1);
$axis = $this->getAxisIndex($channel);
if ($axis >= 0) {
$this->graph->AddY($axis, $plot);
$axis = $this->getAxisIndex($channel);
if ($axis >= 0) {
$this->graph->AddY($axis, $plot);
}
else {
$this->graph->Add($plot);
}
$this->channels[] = $channel;
}
else {
$this->graph->Add($plot);
throw new \Exception('can\'t plot channels without data!');
}
$this->channels[] = $channel;
}
/**

2
backend/lib/View/View.php
View file

@ -47,6 +47,8 @@ interface ViewInterface {
*
*/
abstract class View implements ViewInterface {
const PRECISSION = 5;
public $request;
protected $response;