From 7074f1b90ee7e9afe694caa6b9550679fbf52ad5 Mon Sep 17 00:00:00 2001
From: Martynas Mickevicius <mmartynas@gmail.com>
Date: Thu, 17 Jun 2010 16:01:56 +0300
Subject: [PATCH] color changes to make them more distinguishable

---
 libraries/chart/pma_chart.php     | 40 ++++++++++++++++---------------
 libraries/chart/pma_ofc_chart.php |  8 +++----
 libraries/chart/pma_ofc_pie.php   |  8 +++----
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/libraries/chart/pma_chart.php b/libraries/chart/pma_chart.php
index a1d798070..0288b5d3a 100644
--- a/libraries/chart/pma_chart.php
+++ b/libraries/chart/pma_chart.php
@@ -9,24 +9,26 @@ class PMA_Chart
 
     /*
      * Colors for the different slices in the pie chart.
-     */
+     */    
     protected $colors = array(
-        '#70484A',
-        '#705948',
-        '#6D4870',
-        '#70485E',
-        '#485E70',
-        '#484A70',
-        '#487059',
-        '#48706D',
-        '#594870',
-        '#5E7048',
-        '#839CAF',
-        '#95775F',
-        '#5F7E95',
-        '#706D48',
-        '#4A7048',
-        '#AF9683',
+        '#BCE02E',
+        '#E0642E',
+        '#E0D62E',
+        '#2E97E0',
+        '#B02EE0',
+        '#E02E75',
+        '#5CE02E',
+        '#E0B02E',
+        '#000000',
+        '#0022E0',
+        '#726CB1',
+        '#481A36',
+        '#BAC658',
+        '#127224',
+        '#825119',
+        '#238C74',
+        '#4C489B',
+        '#1D674A',
     );
 
     /*
@@ -44,9 +46,9 @@ class PMA_Chart
      */
     protected $height = 250;
 
-    function __construct()
+    function __construct($options = null)
     {
-
+        $this->handleOptions($options);
     }
 
     /*
diff --git a/libraries/chart/pma_ofc_chart.php b/libraries/chart/pma_ofc_chart.php
index c04bb2068..eb75e7126 100644
--- a/libraries/chart/pma_ofc_chart.php
+++ b/libraries/chart/pma_ofc_chart.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('pma_chart.php');
+require_once 'pma_chart.php';
 
 /*
  * Base class for every chart implemented using OFC.
@@ -8,13 +8,13 @@ require_once('pma_chart.php');
  */
 class PMA_OFC_Chart extends PMA_Chart
 {
-    protected $flashBaseUrl = 'js/';
+    protected $flashBaseUrl = 'flash/';
 
     protected $chart = null;
 
-    function __construct()
+    function __construct($options = null)
     {
-        parent::__construct();
+        parent::__construct($options);
     }
 
     function get_embed_code($data)
diff --git a/libraries/chart/pma_ofc_pie.php b/libraries/chart/pma_ofc_pie.php
index e8628fe06..2b5ea7e90 100644
--- a/libraries/chart/pma_ofc_pie.php
+++ b/libraries/chart/pma_ofc_pie.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('pma_ofc_chart.php');
+require_once 'pma_ofc_chart.php';
 
 /*
  * Implementation of pie chart using OFC.
@@ -9,11 +9,9 @@ class PMA_OFC_Pie extends PMA_OFC_Chart
 {
     function __construct($titleText, $data, $options = null)
     {
-        parent::__construct();
+        parent::__construct($options);
 
-        $this->handleOptions($options);
-
-        include './libraries/chart/ofc/open-flash-chart.php';
+        require_once './libraries/chart/ofc/open-flash-chart.php';
 
         // create and style chart title
         $title = new title($titleText);