Author: ornicar2
Date: 2010-01-21 02:06:07 +0100 (Thu, 21 Jan 2010)
New Revision: 26960
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmContentChart.php
plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmLogChart.php
plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmVisitChart.php
plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmWeekChart.php
Log:
[Diem]
- updated admin charts
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmContentChart.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmContentChart.php
2010-01-20 23:59:44 UTC (rev 26959)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmContentChart.php
2010-01-21 01:06:07 UTC (rev 26960)
@@ -27,7 +27,7 @@
// Prepare the graph area
$this->setGraphArea(40, 0, $this->getWidth(), $this->getHeight()-20);
-
$this->drawScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_ADDALL,self::$colors['grey2'][0],
self::$colors['grey2'][1], self::$colors['grey2'][2],TRUE,0,2,TRUE, 3);
+
$this->drawScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_ADDALLSTART0,self::$colors['grey2'][0],
self::$colors['grey2'][1], self::$colors['grey2'][2],TRUE,0,2,TRUE, 3);
$this->drawGrid(4,TRUE,self::$colors['grey1'][0],
self::$colors['grey1'][1], self::$colors['grey1'][2],50);
// Draw the 0 line
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmLogChart.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmLogChart.php
2010-01-20 23:59:44 UTC (rev 26959)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmLogChart.php
2010-01-21 01:06:07 UTC (rev 26960)
@@ -52,7 +52,7 @@
$dataSet->removeAllSeries();
$dataSet->AddSerie("nbReq");
$dataSet->AddSerie("nbErr");
-
$this->drawRightScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_NORMAL,
self::$colors['grey2'][0], self::$colors['grey2'][1],
self::$colors['grey2'][2],TRUE,0,0, false, 10);
+
$this->drawRightScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_START0,
self::$colors['grey2'][0], self::$colors['grey2'][1],
self::$colors['grey2'][2],TRUE,0,0, false, 10);
$this->drawGrid(4,TRUE, self::$colors['grey1'][0],
self::$colors['grey1'][1], self::$colors['grey1'][2]);
$this->drawFilledCubicCurve($dataSet->GetData(),$dataSet->GetDataDescription(),
0.2, 10);
//
$this->drawFilledLineGraph($dataSet->GetData(),$dataSet->GetDataDescription(),
0.2, 10);
@@ -63,7 +63,7 @@
{
$dataSet->addSerie($eventType);
}
-
$this->drawScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_NORMAL,
0, 0, 0,false);
+
$this->drawScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_START0,
0, 0, 0,false);
$this->drawStackedBarGraph($dataSet->GetData(),
$dataSet->GetDataDescription(), 30, false);
$this->writeValuesOptions($dataSet->GetData(),
$dataSet->GetDataDescription(), 'clear cache', array(
'>' => 0
@@ -74,7 +74,7 @@
$dataSet->AddSerie("mem");
$maxMem = 64; //(int) ini_get('memory_limit')
$this->setFixedScale(0, $maxMem);
-
$this->drawScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_NORMAL,
0, 0, 0,false,0,0, false, 10);
+
$this->drawScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_START0,
0, 0, 0,false,0,0, false, 10);
$this->drawFilledCubicCurve($dataSet->GetData(),$dataSet->GetDataDescription(),
0.2, 20);
//
$this->drawFilledLineGraph($dataSet->GetData(),$dataSet->GetDataDescription(),
10);
@@ -82,7 +82,7 @@
$dataSet->removeAllSeries();
$dataSet->AddSerie("time");
$dataSet->SetYAxisName("Latency in s");
-
$this->drawScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_NORMAL,
self::$colors['grey2'][0], self::$colors['grey2'][1],
self::$colors['grey2'][2],TRUE,0,0, false, 10);
+
$this->drawScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_START0,
self::$colors['grey2'][0], self::$colors['grey2'][1],
self::$colors['grey2'][2],TRUE,0,0, false, 10);
$this->drawFilledCubicCurve($dataSet->GetData(),$dataSet->GetDataDescription(),
0.2, 30);
// Add labels
@@ -192,6 +192,11 @@
{
$data['mem'][$index] = $value / (1024*1024);
}
+
+ if($data['time'][$index] > 5000)
+ {
+ $data['time'][$index] = 5000;
+ }
}
$events = $this->serviceContainer->getService('event_log')
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmVisitChart.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmVisitChart.php
2010-01-20 23:59:44 UTC (rev 26959)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmVisitChart.php
2010-01-21 01:06:07 UTC (rev 26960)
@@ -23,7 +23,7 @@
// Draw the pageviews graph
$dataSet->AddSerie("pageviews");
$dataSet->SetYAxisName("Pages");
-
$this->drawScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_NORMAL,
self::$colors['grey2'][0], self::$colors['grey2'][1],
self::$colors['grey2'][2],TRUE,0,0, false, 3);
+
$this->drawScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_START0,
self::$colors['grey2'][0], self::$colors['grey2'][1],
self::$colors['grey2'][2],TRUE,0,0, false, 3);
$this->drawGrid(4,TRUE, self::$colors['grey1'][0],
self::$colors['grey1'][1], self::$colors['grey1'][2]);
$this->setShadowProperties(3,3,0,0,0,30,4);
$this->drawCubicCurve($dataSet->GetData(),$dataSet->GetDataDescription());
@@ -38,7 +38,7 @@
$dataSet->RemoveAllSeries();
$dataSet->AddSerie("visitors");
$dataSet->SetYAxisName("Visitors");
-
$this->drawRightScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_NORMAL,
self::$colors['grey2'][0], self::$colors['grey2'][1],
self::$colors['grey2'][2],TRUE,0,0, false, 3);
+
$this->drawRightScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_START0,
self::$colors['grey2'][0], self::$colors['grey2'][1],
self::$colors['grey2'][2],TRUE,0,0, false, 3);
$this->setShadowProperties(3,3,0,0,0,30,4);
$this->drawCubicCurve($dataSet->GetData(),$dataSet->GetDataDescription());
$this->clearShadow();
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmWeekChart.php
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmWeekChart.php
2010-01-20 23:59:44 UTC (rev 26959)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/lib/chart/dmWeekChart.php
2010-01-21 01:06:07 UTC (rev 26960)
@@ -29,12 +29,11 @@
$dataSet->AddSerie("bounces");
$dataSet->SetYAxisName("visitors");
$this->setLineStyle(1, 6);
-
$this->drawScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_NORMAL,
self::$colors['grey2'][0], self::$colors['grey2'][1],
self::$colors['grey2'][2],TRUE,0,0, false, 1);
+
$this->drawScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_START0,
self::$colors['grey2'][0], self::$colors['grey2'][1],
self::$colors['grey2'][2],TRUE,0,0, false, 1);
$this->drawGrid(4,TRUE, self::$colors['grey1'][0],
self::$colors['grey1'][1], self::$colors['grey1'][2]);
$this->drawLineGraph($dataSet->GetData(),$dataSet->GetDataDescription());
$this->drawPlotGraph($dataSet->GetData(),$dataSet->GetDataDescription(),3,2,255,255,255);
-
$this->drawArea($dataSet->GetData(),"visitors","bounces",self::$colors['blue'][0],
self::$colors['blue'][1], self::$colors['blue'][2], 50);
// $this->clearScale();
@@ -61,7 +60,7 @@
$dataSet->AddSerie("pageviews");
$this->setLineStyle(1, 6);
$this->setLineStyle(1, 1);
-
$this->drawRightScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_NORMAL,
self::$colors['grey2'][0], self::$colors['grey2'][1],
self::$colors['grey2'][2],TRUE,0,0, false, 1);
+
$this->drawRightScale($dataSet->GetData(),$dataSet->GetDataDescription(),SCALE_START0,
self::$colors['grey2'][0], self::$colors['grey2'][1],
self::$colors['grey2'][2],TRUE,0,0, false, 1);
//
$this->drawCubicCurve($dataSet->GetData(),$dataSet->GetDataDescription(), .1);
//
$this->drawPlotGraph($dataSet->GetData(),$dataSet->GetDataDescription(),3,2,255,255,255);
$this->drawBarGraph($dataSet->GetData(),$dataSet->GetDataDescription(),false,
30);
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
