BOINC / boinc

drupal/sites/default/boinc/modules/contrib/privatemsg/privatemsg_filter/privatemsg_filter.module

Indentation +314 added lines, -314 removed lines

@@ -9,34 +9,34 @@ 
  * Implements hook_perm().
  */
 function privatemsg_filter_perm() {
-  return array(
+    return array(
     'filter private messages',
     'tag private messages',
     'create private message tags',
-  );
+    );
 }
 
 /**
  * Implements hook_menu().
  */
 function privatemsg_filter_menu() {
-  $items['admin/settings/messages/filter'] = array(
+    $items['admin/settings/messages/filter'] = array(
     'title'            => 'Filter',
     'description'      => 'Configure filter settings.',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_filter_admin'),
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
-  );
-  $items['admin/settings/messages/tags'] = array(
+    );
+    $items['admin/settings/messages/tags'] = array(
     'title'            => 'Tags',
     'description'      => 'Configure tags.',
     'page callback'    => 'privatemsg_tags_admin',
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
     'file'             => 'privatemsg_filter.admin.inc',
-  );
-  $items['admin/settings/messages/tags/list'] = array(
+    );
+    $items['admin/settings/messages/tags/list'] = array(
     'title'            => 'List',
     'description'      => 'Configure tags.',
     'page callback'    => 'privatemsg_tags_admin',
@@ -44,8 +44,8 @@ 
     'type'             => MENU_DEFAULT_LOCAL_TASK,
     'file'             => 'privatemsg_filter.admin.inc',
     'weight'           => -10,
-  );
-  $items['admin/settings/messages/tags/add'] = array(
+    );
+    $items['admin/settings/messages/tags/add'] = array(
     'title'            => 'Add',
     'description'      => 'Configure tags.',
     'page callback'    => 'drupal_get_form',
@@ -53,8 +53,8 @@ 
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
     'file'             => 'privatemsg_filter.admin.inc',
-  );
-  $items['admin/settings/messages/tags/edit/%'] = array(
+    );
+    $items['admin/settings/messages/tags/edit/%'] = array(
     'title'            => 'Add',
     'description'      => 'Configure tags.',
     'page callback'    => 'drupal_get_form',
@@ -62,8 +62,8 @@ 
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_CALLBACK,
     'file'             => 'privatemsg_filter.admin.inc',
-  );
-  $items['admin/settings/messages/tags/delete/%'] = array(
+    );
+    $items['admin/settings/messages/tags/delete/%'] = array(
     'title'            => 'Add',
     'description'      => 'Configure tags.',
     'page callback'    => 'drupal_get_form',
@@ -71,62 +71,62 @@ 
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_CALLBACK,
     'file'             => 'privatemsg_filter.admin.inc',
-  );
-  $items['messages/inbox'] = array(
+    );
+    $items['messages/inbox'] = array(
     'title'            => 'Inbox',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_list', 'inbox'),
     'access callback'  => 'privatemsg_user_access',
     'type'             => variable_get('privatemsg_filter_default_list', 0) ? MENU_LOCAL_TASK : MENU_DEFAULT_LOCAL_TASK,
     'weight'           => -15,
-  );
-  $items['messages/sent'] = array(
+    );
+    $items['messages/sent'] = array(
     'title'            => 'Sent messages',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('privatemsg_list', 'sent'),
     'access callback'  => 'privatemsg_user_access',
     'type'             => MENU_LOCAL_TASK,
     'weight'           => -12,
-  );
-  $items['messages/filter/user-name-autocomplete'] = array(
+    );
+    $items['messages/filter/user-name-autocomplete'] = array(
     'page callback'    => 'privatemsg_user_name_autocomplete',
     'access callback'  => 'privatemsg_user_access',
     'access arguments' => array('write privatemsg'),
     'type'             => MENU_CALLBACK,
-  );
-  $items['messages/filter/tag-autocomplete'] = array(
+    );
+    $items['messages/filter/tag-autocomplete'] = array(
     'page callback'    => 'privatemsg_filter_tags_autocomplete',
     'access callback'  => 'privatemsg_user_access',
     'access arguments' => array('tag private messages'),
     'type'             => MENU_CALLBACK,
     'weight'           => -10,
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implements hook_menu_alter().
  */
 function privatemsg_filter_menu_alter(&$items) {
-  // Rename messages to "All messages".
-  $items['messages/list']['title'] = 'All messages';
+    // Rename messages to "All messages".
+    $items['messages/list']['title'] = 'All messages';
 
-  if (variable_get('privatemsg_filter_default_list', 0) == 0) {
+    if (variable_get('privatemsg_filter_default_list', 0) == 0) {
     // Change default argument of /messages to inbox. and set the task to MENU_LOCAL_TASK.
     $items['messages']['page arguments'] = array('privatemsg_list', 'inbox');
     $items['messages/list']['type'] = MENU_LOCAL_TASK;
-  }
+    }
 }
 
 function privatemsg_filter_admin() {
-  $form = array();
+    $form = array();
 
-  $form['privatemsg_filter_searchbody'] = array(
+    $form['privatemsg_filter_searchbody'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Search message body'),
     '#description'   => t('WARNING: turning on this feature will slow down search performance by a large factor. Gets worse as your messages database increases.'),
     '#default_value' => variable_get('privatemsg_filter_searchbody', FALSE),
-  );
+    );
 
     $form['privatemsg_filter_tagfield_weight'] = array(
     '#type'          => 'textfield',
@@ -134,9 +134,9 @@ 
     '#description'   => t('Use higher values to push the form lower down the page, lower or negative values to raise it higher.'),
     '#size'          => 4,
     '#default_value' => variable_get('privatemsg_filter_tagfield_weight', 10),
-  );
+    );
 
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 /**
@@ -145,26 +145,26 @@ 
  * Add a filter widget to the message listing pages.
  */
 function privatemsg_filter_form_private_message_settings_alter(&$form, $form_state) {
-  $form['privatemsg_listing']['privatemsg_filter_default_list'] = array(
+    $form['privatemsg_listing']['privatemsg_filter_default_list'] = array(
     '#type' => 'radios',
     '#default_value' => variable_get('privatemsg_filter_default_list', 0),
     '#options' => array(t('Inbox'), t('All messages')),
     '#title' => t('Choose the default list option'),
     '#description' => t('Choose which of the two lists are shown by default when following the messages link.'),
-  );
-  // Add tags to the list of possible columns.
-  $form['privatemsg_listing']['privatemsg_display_fields']['#options']['tags'] = t('Tags');
+    );
+    // Add tags to the list of possible columns.
+    $form['privatemsg_listing']['privatemsg_display_fields']['#options']['tags'] = t('Tags');
 
-  $form['#submit'][] = 'privatemsg_filter_settings_submit';
+    $form['#submit'][] = 'privatemsg_filter_settings_submit';
 }
 
 /**
  * Rebuilding the menu if necessary.
  */
 function privatemsg_filter_settings_submit($form, &$form_state) {
-  if ($form['privatemsg_listing']['privatemsg_filter_default_list']['#default_value'] != $form_state['values']['privatemsg_filter_default_list']) {
+    if ($form['privatemsg_listing']['privatemsg_filter_default_list']['#default_value'] != $form_state['values']['privatemsg_filter_default_list']) {
     menu_rebuild();
-  }
+    }
 }
 
 /**
@@ -174,33 +174,33 @@ 
  *   A single tag or an array of tags.
  */
 function privatemsg_filter_create_tags($tags) {
-  if (!is_array($tags)) {
+    if (!is_array($tags)) {
     $tags = array($tags);
-  }
+    }
 
-  $tag_ids = array();
+    $tag_ids = array();
 
-  foreach ($tags as $tag) {
+    foreach ($tags as $tag) {
     $tag = trim($tag);
     if (empty($tag)) {
-      // Do not save a blank tag.
-      continue;
+        // Do not save a blank tag.
+        continue;
     }
 
     // Check if the tag already exists and only create the tag if it does not.
     $tag_id = db_result(db_query("SELECT tag_id FROM {pm_tags} WHERE tag = '%s'", $tag));
     if (empty($tag_id) && privatemsg_user_access('create private message tags')) {
-      db_query("INSERT INTO {pm_tags} (tag) VALUES ('%s')", $tag);
-      $tag_id = db_last_insert_id('pm_tags', 'tag_id');
+        db_query("INSERT INTO {pm_tags} (tag) VALUES ('%s')", $tag);
+        $tag_id = db_last_insert_id('pm_tags', 'tag_id');
     }
     elseif (empty($tag_id)) {
-      // The user does not have permission to create new tags - disregard this tag and move onto the next.
-      drupal_set_message(t('Tag %tag was ignored because you do not have permission to create new tags.', array('%tag' => $tag)));
-      continue;
+        // The user does not have permission to create new tags - disregard this tag and move onto the next.
+        drupal_set_message(t('Tag %tag was ignored because you do not have permission to create new tags.', array('%tag' => $tag)));
+        continue;
     }
     $tag_ids[] = $tag_id;
-  }
-  return $tag_ids;
+    }
+    return $tag_ids;
 }
 
 /**
@@ -212,21 +212,21 @@ 
  *   Id of the tag.
  */
 function privatemsg_filter_add_tags($threads, $tag_id, $account = NULL) {
-  if (!is_array($threads)) {
+    if (!is_array($threads)) {
     $threads = array($threads);
-  }
-  if (empty($account)) {
+    }
+    if (empty($account)) {
     global $user;
     $account = drupal_clone($user);
-  }
+    }
 
-  foreach ($threads as $thread) {
+    foreach ($threads as $thread) {
     // Make sure that we don't add a tag to a thread twice,
     // only insert if there is no such tag yet.
     if (db_result(db_query('SELECT COUNT(*) FROM {pm_tags_index} WHERE tag_id = %d AND (uid = %d AND thread_id = %d)', $tag_id, $account->uid, $thread)) == 0) {
-      db_query('INSERT INTO {pm_tags_index} (tag_id, uid, thread_id) VALUES (%d, %d, %d)', $tag_id, $account->uid, $thread);
+        db_query('INSERT INTO {pm_tags_index} (tag_id, uid, thread_id) VALUES (%d, %d, %d)', $tag_id, $account->uid, $thread);
+    }
     }
-  }
 }
 
 /**
@@ -238,238 +238,238 @@ 
  *   Id of the tag - set to NULL to remove all tags.
  */
 function privatemsg_filter_remove_tags($threads, $tag_id = NULL, $account = NULL) {
-  if (!is_array($threads)) {
+    if (!is_array($threads)) {
     $threads = array($threads);
-  }
-  if (empty($account)) {
+    }
+    if (empty($account)) {
     global $user;
     $account = drupal_clone($user);
-  }
+    }
 
-  if (is_null($tag_id)) {
+    if (is_null($tag_id)) {
     // Delete all tag mapping.
     foreach ($threads as $thread) {
-      db_query('DELETE FROM {pm_tags_index} WHERE uid = %d AND thread_id = %d', $account->uid, $thread);
+        db_query('DELETE FROM {pm_tags_index} WHERE uid = %d AND thread_id = %d', $account->uid, $thread);
+    }
     }
-  }
-  else {
+    else {
     // Delete tag mapping for the specified tag.
     foreach ($threads as $thread) {
-      db_query('DELETE FROM {pm_tags_index} WHERE uid = %d AND thread_id = %d AND tag_id = %d', $account->uid, $thread, $tag_id);
+        db_query('DELETE FROM {pm_tags_index} WHERE uid = %d AND thread_id = %d AND tag_id = %d', $account->uid, $thread, $tag_id);
+    }
     }
-  }
 }
 
 function privatemsg_filter_get_filter($account) {
-  $filter = array();
-  if (isset($_GET['tags'])) {
+    $filter = array();
+    if (isset($_GET['tags'])) {
     $_GET['tags'] = urldecode($_GET['tags']);
     $tag_data = privatemsg_filter_get_tags_data($account);
     foreach (explode(',', $_GET['tags']) as $tag) {
-      if (isset($tag_data[$tag])) {
+        if (isset($tag_data[$tag])) {
         $filter['tags'][$tag] = $tag;
-      }
-      elseif (in_array($tag, $tag_data)) {
+        }
+        elseif (in_array($tag, $tag_data)) {
         $filter['tags'][array_search($tag, $tag_data)] = array_search($tag, $tag_data);
-      }
+        }
+    }
     }
-  }
 
-  if (isset($_GET['author'])) {
+    if (isset($_GET['author'])) {
     list($filter['author']) = _privatemsg_parse_userstring($_GET['author']);
-  }
+    }
 
-  if (isset($_GET['search'])) {
+    if (isset($_GET['search'])) {
     $filter['search'] = $_GET['search'];
-  }
+    }
 
-  if (!empty($filter)) {
+    if (!empty($filter)) {
     return $filter;
-  }
+    }
 
-  if (!empty($_SESSION['privatemsg_filter'])) {
+    if (!empty($_SESSION['privatemsg_filter'])) {
     return $_SESSION['privatemsg_filter'];
-  }
+    }
 
 }
 
 function privatemsg_filter_get_tags_data($account) {
-  static $tag_data;
+    static $tag_data;
 
-  if (is_array($tag_data)) {
+    if (is_array($tag_data)) {
     return $tag_data;
-  }
+    }
 
-  // Only show the tags that a user have used.
-  $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'), $account);
-  $results = db_query($query['query']);
+    // Only show the tags that a user have used.
+    $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'), $account);
+    $results = db_query($query['query']);
 
-  $tag_data = array();
-  while ($result = db_fetch_object($results)) {
+    $tag_data = array();
+    while ($result = db_fetch_object($results)) {
     $tag_data[$result->tag_id] = $result->tag;
-  }
-  return $tag_data;
+    }
+    return $tag_data;
 }
 
 function privatemsg_filter_dropdown(&$form_state, $account) {
 
-  drupal_add_css(drupal_get_path('module', 'privatemsg_filter') .'/privatemsg_filter.css');
+    drupal_add_css(drupal_get_path('module', 'privatemsg_filter') .'/privatemsg_filter.css');
 
-  $form['filter'] = array(
+    $form['filter'] = array(
     '#type' => 'fieldset',
     '#title' => t('Filter messages'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
-  $form['filter']['search'] = array(
+    );
+    $form['filter']['search'] = array(
     '#type' => 'textfield',
     '#title' => variable_get('privatemsg_filter_searchbody', FALSE) ? t('Search messages') : t('Search subjects'),
     '#weight' => -20
-  );
+    );
 
-  $form['filter']['author'] = array(
+    $form['filter']['author'] = array(
     '#type'               => 'textfield',
     '#title'              => t('Participants'),
     '#description'        => t('Separate multiple names with commas.'),
     '#weight'             => -5,
     '#size'               => 50,
     '#autocomplete_path'  => 'messages/filter/user-name-autocomplete',
-  );
+    );
 
-  // Only show form if the user has some messages tagged.
-  if (count($tag_data = privatemsg_filter_get_tags_data($account))) {
+    // Only show form if the user has some messages tagged.
+    if (count($tag_data = privatemsg_filter_get_tags_data($account))) {
     $form['filter']['tags'] = array(
-      '#type' => 'select',
-      '#title' => t('Tags'),
-      '#options' => $tag_data,
-      '#multiple' => TRUE,
-      '#size' => 5,
-      '#weight' => 0
-    );
-  }
+        '#type' => 'select',
+        '#title' => t('Tags'),
+        '#options' => $tag_data,
+        '#multiple' => TRUE,
+        '#size' => 5,
+        '#weight' => 0
+    );
+    }
     $form['filter']['submit'] = array(
-      '#type'     => 'submit',
-      '#value'    => t('Filter'),
-      '#prefix'   => '<div id="privatemsg-filter-buttons">',
-      '#weight'   => 10,
-      '#submit'   => array('privatemsg_filter_dropdown_submit'),
+        '#type'     => 'submit',
+        '#value'    => t('Filter'),
+        '#prefix'   => '<div id="privatemsg-filter-buttons">',
+        '#weight'   => 10,
+        '#submit'   => array('privatemsg_filter_dropdown_submit'),
     );
 
     $form['filter']['save'] = array(
-      '#type'     => 'submit',
-      '#value'    => t('Save filter'),
-      '#suffix'   => '</div>',
-      '#weight'   => 11,
-      '#submit'   => array('privatemsg_filter_dropdown_submit'),
+        '#type'     => 'submit',
+        '#value'    => t('Save filter'),
+        '#suffix'   => '</div>',
+        '#weight'   => 11,
+        '#submit'   => array('privatemsg_filter_dropdown_submit'),
     );
 
     if ($filter = privatemsg_filter_get_filter($account)) {
-      privatemsg_filter_dropdown_set_active($form, $filter);
+        privatemsg_filter_dropdown_set_active($form, $filter);
     }
 
     return $form;
 }
 
 function privatemsg_filter_dropdown_set_active(&$form, $filter) {
-  $form['filter']['#title'] = t('Filter messages (active)');
-  $form['filter']['#collapsed'] = FALSE;
+    $form['filter']['#title'] = t('Filter messages (active)');
+    $form['filter']['#collapsed'] = FALSE;
 
-  if (isset($filter['author'])) {
+    if (isset($filter['author'])) {
     $string = '';
     foreach ($filter['author'] as $author) {
-      $string .= $author->name . ', ';
+        $string .= $author->name . ', ';
     }
     $form['filter']['author']['#default_value'] = $string;
-  }
-  if (isset($filter['tags'])) {
+    }
+    if (isset($filter['tags'])) {
     $form['filter']['tags']['#default_value'] = $filter['tags'];
-  }
-  if (isset($filter['search'])) {
+    }
+    if (isset($filter['search'])) {
     $form['filter']['search']['#default_value'] = $filter['search'];
-  }
-
-  $form['filter']['reset'] = array(
-      '#type'     => 'submit',
-      '#value'    => t('Reset'),
-      '#suffix'   => '</div>',
-      '#weight'   => 12,
-      '#submit'   => array('privatemsg_filter_dropdown_submit'),
-  );
-  unset($form['filter']['save']['#suffix']);
+    }
+
+    $form['filter']['reset'] = array(
+        '#type'     => 'submit',
+        '#value'    => t('Reset'),
+        '#suffix'   => '</div>',
+        '#weight'   => 12,
+        '#submit'   => array('privatemsg_filter_dropdown_submit'),
+    );
+    unset($form['filter']['save']['#suffix']);
 }
 
 function privatemsg_filter_dropdown_submit($form, &$form_state) {
 
-  if (!empty($form_state['values']['author'])) {
+    if (!empty($form_state['values']['author'])) {
     list($form_state['values']['author']) = _privatemsg_parse_userstring($form_state['values']['author']);
-  }
+    }
 
-  switch ($form_state['values']['op']) {
+    switch ($form_state['values']['op']) {
     case t('Save filter'):
       $filter = array();
-      if (!empty($form_state['values']['tags'])) {
+        if (!empty($form_state['values']['tags'])) {
         $filter['tags'] = $form_state['values']['tags'];
-      }
-      if (!empty($form_state['values']['author'])) {
+        }
+        if (!empty($form_state['values']['author'])) {
         $filter['author'] = $form_state['values']['author'];
-      }
-      if (!empty($form_state['values']['search'])) {
+        }
+        if (!empty($form_state['values']['search'])) {
         $filter['search'] = $form_state['values']['search'];
-      }
-      $_SESSION['privatemsg_filter'] = $filter;
-      break;
+        }
+        $_SESSION['privatemsg_filter'] = $filter;
+        break;
     case t('Filter'):
       drupal_goto($_GET['q'], privatemsg_filter_create_get_query($form_state['values']));
-      return;
-      break;
+        return;
+        break;
     case t('Reset'):
       $_SESSION['privatemsg_filter'] = array();
-      break;
-  }
-  $form_state['redirect'] = $_GET['q'];
+        break;
+    }
+    $form_state['redirect'] = $_GET['q'];
 }
 
 function privatemsg_filter_create_get_query($filter) {
-  $query = array();
-  if (isset($filter['tags']) && !empty($filter['tags'])) {
+    $query = array();
+    if (isset($filter['tags']) && !empty($filter['tags'])) {
     $ids = array();
     foreach ($filter['tags'] as $tag) {
-      if ((int)$tag > 0) {
+        if ((int)$tag > 0) {
         $ids[] = $tag;
-      }
-      else {
+        }
+        else {
         $query['tags'][] = $tag;
-      }
+        }
     }
     $sql = 'SELECT pmt.tag FROM {pm_tags} pmt WHERE pmt.tag_id IN ('. implode(', ', $filter['tags']) .')';
     $result = db_query($sql);
     while ($row = db_fetch_object($result)) {
-      $query['tags'][] = $row->tag;
+        $query['tags'][] = $row->tag;
     }
 
     if (isset($query['tags'])) {
-      $query['tags'] = implode(',', $query['tags']);
+        $query['tags'] = implode(',', $query['tags']);
+    }
     }
-  }
 
-  if (isset($filter['author']) && !empty($filter['author'])) {
+    if (isset($filter['author']) && !empty($filter['author'])) {
     foreach ($filter['author'] as $author) {
-      if (is_object($author) && isset($author->uid) && isset($author->name)) {
+        if (is_object($author) && isset($author->uid) && isset($author->name)) {
         $query['author'][] = $author->name;
-      }
-      elseif ($author_obj = user_load($author)) {
+        }
+        elseif ($author_obj = user_load($author)) {
         $query['author'][] = $author_obj->name;
-      }
+        }
     }
     if (isset($query['author'])) {
-      $query['author'] = implode(',', $query['author']);
+        $query['author'] = implode(',', $query['author']);
+    }
     }
-  }
 
-  if (isset($filter['search']) && !empty($filter['search'])) {
+    if (isset($filter['search']) && !empty($filter['search'])) {
     $query['search'] = $filter['search'];
-  }
-  return $query;
+    }
+    return $query;
 }
 
 /**
@@ -478,14 +478,14 @@ 
  * Adds a filter widget to the message listing pages.
  */
 function privatemsg_filter_form_privatemsg_list_alter(&$form, $form_state) {
-  global $user;
+    global $user;
 
-  if (privatemsg_user_access('filter private messages') && !empty($form['#data'])) {
+    if (privatemsg_user_access('filter private messages') && !empty($form['#data'])) {
     $form += privatemsg_filter_dropdown($form_state, $form['#account']);
-  }
+    }
 
-  $fields = array_filter(variable_get('privatemsg_display_fields', array('participants')));
-  if (in_array('tags', $fields)) {
+    $fields = array_filter(variable_get('privatemsg_display_fields', array('participants')));
+    if (in_array('tags', $fields)) {
     // Load thread id's of the current list.
     $threads = array_keys($form['#data']);
 
@@ -495,21 +495,21 @@ 
     // Add them to #data
     $result = db_query($query['query']);
     while ($tag = db_fetch_array($result)) {
-      $form['#data'][$tag['thread_id']]['tags'][$tag['tag_id']] = $tag['tag'];
+        $form['#data'][$tag['thread_id']]['tags'][$tag['tag_id']] = $tag['tag'];
+    }
     }
-  }
 
-  $tags = privatemsg_filter_get_tags_data($user);
-  if (privatemsg_user_access('tag private messages') && !empty($tags) && !empty($form['#data'])) {
+    $tags = privatemsg_filter_get_tags_data($user);
+    if (privatemsg_user_access('tag private messages') && !empty($tags) && !empty($form['#data'])) {
     $options = array();
     $options[] = t('Apply tag...');
     foreach ($tags as $tag_id => $tag) {
-      $options[$tag_id] = $tag;
+        $options[$tag_id] = $tag;
     }
     $form['actions']['tag-add'] = array(
-      '#type'          => 'select',
-      '#options'       => $options,
-      '#default_value' => 0,
+        '#type'          => 'select',
+        '#options'       => $options,
+        '#default_value' => 0,
     );
     $form['actions']['tag-add-submit'] = array(
         '#prefix'     => '<div class="privatemsg-tag-add-submit">',
@@ -521,9 +521,9 @@ 
     );
     $options[0] = t('Remove Tag...');
     $form['actions']['tag-remove'] = array(
-      '#type'          => 'select',
-      '#options'       => $options,
-      '#default_value' => 0,
+        '#type'          => 'select',
+        '#options'       => $options,
+        '#default_value' => 0,
     );
     $form['actions']['tag-remove-submit'] = array(
         '#prefix'     => '<div class="privatemsg-tag-remove-submit">',
@@ -536,7 +536,7 @@ 
 
     // JS for hiding the submit buttons.
     drupal_add_js(drupal_get_path('module', 'privatemsg_filter') .'/privatemsg-filter-list.js');
-  }
+    }
 }
 
 /**
@@ -545,12 +545,12 @@ 
  * @see theme_privatemsg_list_header()
  */
 function phptemplate_privatemsg_list_header__tags() {
-   return array(
+    return array(
     'data' => t('Tags'),
     'key' => 'tags',
     'class' => 'privatemsg-header-tags',
     '#weight' => -42,
-  );
+    );
 }
 
 
@@ -560,48 +560,48 @@ 
  * @see theme_privatemsg_list_field()
  */
 function phptemplate_privatemsg_list_field__tags($thread) {
-  if (!empty($thread['tags'])) {
+    if (!empty($thread['tags'])) {
     $tags = array();
 
     foreach ($thread['tags'] as $tag_id => $tag) {
-      $tags[] = l(strlen($tag) > 15 ? substr($tag, 0, 13) . '...' : $tag, 'messages', array(
+        $tags[] = l(strlen($tag) > 15 ? substr($tag, 0, 13) . '...' : $tag, 'messages', array(
         'attributes' => array('title' => $tag),
         'query' => array('tags' => $tag)
-      ));
+        ));
     }
     return array(
-      'data'  => implode(', ', $tags),
-      'class' => 'privatemsg-list-tags',
+        'data'  => implode(', ', $tags),
+        'class' => 'privatemsg-list-tags',
     );
-  }
+    }
 }
 
 /**
  * Form callback for adding a tag to threads.
  */
 function privatemsg_filter_add_tag_submit($form, &$form_state) {
-  $operation = array(
+    $operation = array(
     'callback' => 'privatemsg_filter_add_tags',
     'callback arguments' => array('tag_id' => $form_state['values']['tag-add']),
     'undo callback' => 'privatemsg_filter_remove_tags',
     'undo callback arguments' => array('tag_id' => $form_state['values']['tag-add']),
-  );
-  drupal_set_message(t('The selected conversations have been tagged.'));
-  privatemsg_operation_execute($operation, $form_state['values']['threads']);
+    );
+    drupal_set_message(t('The selected conversations have been tagged.'));
+    privatemsg_operation_execute($operation, $form_state['values']['threads']);
 }
 
 /**
  * Form callback for removing a tag to threads.
  */
 function privatemsg_filter_remove_tag_submit($form, &$form_state) {
-  $operation = array(
+    $operation = array(
     'callback' => 'privatemsg_filter_remove_tags',
     'callback arguments' => array('tag_id' => $form_state['values']['tag-remove']),
     'undo callback' => 'privatemsg_filter_add_tags',
     'undo callback arguments' => array('tag_id' => $form_state['values']['tag-remove']),
-  );
-  drupal_set_message(t('The tag has been removed from the selected conversations.'));
-  privatemsg_operation_execute($operation, $form_state['values']['threads']);
+    );
+    drupal_set_message(t('The tag has been removed from the selected conversations.'));
+    privatemsg_operation_execute($operation, $form_state['values']['threads']);
 }
 
 /**
@@ -609,114 +609,114 @@ 
  */
 function privatemsg_filter_privatemsg_sql_list_alter(&$fragments, $account, $argument) {
 
-  // Check if its a filtered view.
-  if ($argument == 'sent') {
+    // Check if its a filtered view.
+    if ($argument == 'sent') {
     $fragments['where'][]       = "pm.author = %d";
     $fragments['query_args']['where'][]   = $account->uid;
-  }
-  if ($argument == 'inbox') {
+    }
+    if ($argument == 'inbox') {
     $fragments['having'][]       = '((SELECT pmf.author FROM {pm_message} pmf WHERE pmf.mid = pmi.thread_id) = %d AND COUNT(pmi.thread_id) > 1) OR (SELECT COUNT(*) FROM {pm_message} pmf INNER JOIN {pm_index} pmif ON (pmf.mid = pmif.mid) WHERE pmif.thread_id = pmi.thread_id AND pmf.author <> %d) > 0';
     $fragments['query_args']['having'][]   = $account->uid;
     $fragments['query_args']['having'][]   = $account->uid;
-  }
+    }
 
-  // Filter the message listing by any set tags.
-  if ($filter = privatemsg_filter_get_filter($account)) {
+    // Filter the message listing by any set tags.
+    if ($filter = privatemsg_filter_get_filter($account)) {
     $count = 0;
     if (isset($filter['tags']) && !empty($filter['tags'])) {
-      foreach ($filter['tags'] as $tag) {
+        foreach ($filter['tags'] as $tag) {
         $fragments['inner_join'][]  = "INNER JOIN {pm_tags_index} pmti$count ON (pmti$count.thread_id = pmi.thread_id AND pmti$count.uid = pmi.uid)";
         $fragments['where'][]       = "pmti$count.tag_id = %d";
         $fragments['query_args']['where'][]   = $tag;
         $count++;
-      }
+        }
     }
 
     if (isset($filter['author']) && !empty($filter['author'])) {
-      foreach ($filter['author'] as $author) {
+        foreach ($filter['author'] as $author) {
         $fragments['inner_join'][]  = "INNER JOIN {pm_index} pmi$count ON (pmi$count.mid = pm.mid)";
         $fragments['where'][]       = "pmi$count.uid = %d";
         $fragments['query_args']['where'][]   = $author->uid;
         $count++;
-      }
+        }
     }
 
     if (isset($filter['search']) && !empty($filter['search'])) {
-      if (variable_get('privatemsg_filter_searchbody', FALSE)) {
+        if (variable_get('privatemsg_filter_searchbody', FALSE)) {
         $fragments['where'][]       = "pm.subject LIKE '%s' OR pm.body LIKE '%s'";
         $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
         $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
-      }
-      else {
+        }
+        else {
         $fragments['where'][]       = "pm.subject LIKE '%s'";
         $fragments['query_args']['where'][]    = '%%'. $filter['search'] .'%%';
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Hook into the view messages page to add a form for tagging purposes.
  */
 function privatemsg_filter_privatemsg_view_messages_alter(&$content, $thread) {
-  if (count($thread['messages']) > 0) {
+    if (count($thread['messages']) > 0) {
     $content['tags']['#value'] = drupal_get_form('privatemsg_filter_form');
     $content['tags']['#weight'] = variable_get('privatemsg_filter_tagfield_weight', 10);
-  }
+    }
 }
 
 /**
  * Form to show and allow modification of tagging information of a conversation.
  */
 function privatemsg_filter_form(&$form_state) {
-  global $user;
-  $thread_id = arg(2);
-
-  // Get a list of current tags for this thread
-  $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'), $user, array($thread_id));
-  $results = db_query($query['query']);
-  $count = db_result(db_query($query['count']));
-  $tags = '';
-  while ($tag = db_fetch_array($results)) {
+    global $user;
+    $thread_id = arg(2);
+
+    // Get a list of current tags for this thread
+    $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'), $user, array($thread_id));
+    $results = db_query($query['query']);
+    $count = db_result(db_query($query['count']));
+    $tags = '';
+    while ($tag = db_fetch_array($results)) {
     $tags .= $tag['tag'] . ', ';
-  }
+    }
 
-  $form['tags'] = array(
+    $form['tags'] = array(
     '#type' => 'fieldset',
     '#title' => t('Tags'),
     '#access' => privatemsg_user_access('tag private messages'),
     '#collapsible' => TRUE,
     '#collapsed' => empty($count) ? TRUE : FALSE,
-  );
-  $form['tags']['user_id'] = array(
+    );
+    $form['tags']['user_id'] = array(
     '#type' => 'value',
     '#value' => $user->uid,
-  );
-  $form['tags']['thread_id'] = array(
+    );
+    $form['tags']['thread_id'] = array(
     '#type' => 'value',
     '#value' => $thread_id,
-  );
+    );
 
-  $form['tags']['tags'] = array(
+    $form['tags']['tags'] = array(
     '#type'               => 'textfield',
     '#title'              => t('Tags for this conversation'),
     '#description'        => t('Separate multiple tags with commas.'),
     '#size'               => 50,
     '#default_value'      => $tags,
     '#autocomplete_path'  => 'messages/filter/tag-autocomplete',
-  );
+    );
 
-  $form['tags']['submit'] = array(
+    $form['tags']['submit'] = array(
     '#type'     => 'submit',
     '#value'    => t('Tag this conversation'),
     '#submit'   => array('privatemsg_filter_form_submit'),
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 function privatemsg_filter_form_submit($form, &$form_state) {
-  if (isset($form_state['values']['submit'])) {
+    if (isset($form_state['values']['submit'])) {
     $tags = explode(',', $form_state['values']['tags']);
 
     // Step 1 - Delete all tag mapping. I cannot think of a better way to remove tags that are no longer in the textfield, so ideas welcome.
@@ -727,10 +727,10 @@ 
 
     // Step 3 - Save all the tagging data.
     foreach ($tag_ids as $tag_id) {
-      privatemsg_filter_add_tags($form_state['values']['thread_id'], $tag_id);
+        privatemsg_filter_add_tags($form_state['values']['thread_id'], $tag_id);
     }
     drupal_set_message(t('Tagging information has been saved.'));
-  }
+    }
 }
 
 /**
@@ -741,28 +741,28 @@ 
  */
 function privatemsg_filter_tags_autocomplete($string) {
 
-  // 1: Parse $string and build a list of tags.
-  $tags = array();
-  $fragments = explode(',', $string);
-  foreach ($fragments as $index => $tag) {
+    // 1: Parse $string and build a list of tags.
+    $tags = array();
+    $fragments = explode(',', $string);
+    foreach ($fragments as $index => $tag) {
     $tag = trim($tag);
     $tags[$tag] = $tag;
-  }
+    }
 
-  // 2: Find the next tag suggestion.
-  $fragment = array_pop($tags);
-  $matches = array();
-  if (!empty($fragment)) {
+    // 2: Find the next tag suggestion.
+    $fragment = array_pop($tags);
+    $matches = array();
+    if (!empty($fragment)) {
     $query = _privatemsg_assemble_query(array('tags_autocomplete', 'privatemsg_filter'), $fragment, $tags);
     $result = db_query_range($query['query'], $fragment, 0, 10);
     $prefix = count($tags) ? implode(", ", $tags) .", " : '';
     // 3: Build proper suggestions and print.
     while ($tag = db_fetch_object($result)) {
-      $matches[$prefix . $tag->tag .", "] = $tag->tag;
+        $matches[$prefix . $tag->tag .", "] = $tag->tag;
     }
-  }
-  // convert to object to prevent drupal bug, see http://drupal.org/node/175361
-  drupal_json((object)$matches);
+    }
+    // convert to object to prevent drupal bug, see http://drupal.org/node/175361
+    drupal_json((object)$matches);
 }
 
 /**
@@ -781,19 +781,19 @@ 
  *   Array of names that are already part of the autocomplete field.
  */
 function privatemsg_filter_privatemsg_sql_autocomplete_alter(&$fragments, $search, $names) {
-  global $user;
-  // arg(1) is an additional URL argument passed to the URL when only
-  // users that are listed as recipient for threads of that user should be
-  // displayed.
-  // @todo: Check if these results can be grouped to avoid unecessary loops.
-  if (arg(1) == 'filter') {
+    global $user;
+    // arg(1) is an additional URL argument passed to the URL when only
+    // users that are listed as recipient for threads of that user should be
+    // displayed.
+    // @todo: Check if these results can be grouped to avoid unecessary loops.
+    if (arg(1) == 'filter') {
     // JOIN on index entries where the to be selected user is a recipient.
     $fragments['inner_join'][] = 'INNER JOIN {pm_index} pip ON pip.uid = u.uid';
     // JOIN on rows where the current user is the recipient and that have the
     // same mid as those above.
     $fragments['inner_join'][] = 'INNER JOIN {pm_index} piu ON piu.uid = %d AND pip.mid = piu.mid';
     $fragments['query_args']['join'][] = $user->uid;
-  }
+    }
 }
 
 /**
@@ -809,19 +809,19 @@ 
  *   Limit the number of tags *per thread*.
  */
 function privatemsg_filter_sql_tags(&$fragments, $user = NULL, $threads = NULL, $limit = NULL) {
-  $fragments['primary_table'] = '{pm_tags} t';
-  $fragments['select'][] = 't.tag';
-  $fragments['select'][] = 't.tag_id';
-  $fragments['select'][] = 't.public';
+    $fragments['primary_table'] = '{pm_tags} t';
+    $fragments['select'][] = 't.tag';
+    $fragments['select'][] = 't.tag_id';
+    $fragments['select'][] = 't.public';
 
-  if (!empty($threads)) {
+    if (!empty($threads)) {
     // If the tag list needs to be for specific threads.
     $fragments['select'][] = 'ti.thread_id';
     $fragments['inner_join'][]  = 'INNER JOIN {pm_tags_index} ti on ti.tag_id = t.tag_id';
     $fragments['where'][] = 'ti.thread_id IN (' . db_placeholders($threads) . ')';
     $fragments['query_args']['where'] += $threads;
-  }
-  else {
+    }
+    else {
     // Tag usage counter is only used when we select all tags.
     $fragments['select'][]      = 'COUNT(ti.thread_id) as count';
     // LEFT JOIN so that unused tags are displayed too.
@@ -829,33 +829,33 @@ 
     $fragments['group_by'][]    = 't.tag_id';
     $fragments['group_by'][]    = 't.tag';
     $fragments['group_by'][]    = 't.public';
-  }
-  if (!empty($user)) {
+    }
+    if (!empty($user)) {
     $fragments['where'][]       = 'ti.uid = %d';
     $fragments['query_args']['where'][] = $user->uid;
-  }
-
-  // Only select n tags per thread (ordered per tag_id), see
-  // http://www.xaprb.com/blog/2006/12/07/how-to-select-the-firstleastmax-row-per-group-in-sql/.
-  //
-  // It does select how many tags for that thread/uid combination exist that
-  // have a lower tag_id and does only select those that have less than $limit.
-  //
-  // This should only have a very minor performance impact as most users won't
-  // tag a thread with 1000 different tags.
-  //
-  if ($limit) {
+    }
+
+    // Only select n tags per thread (ordered per tag_id), see
+    // http://www.xaprb.com/blog/2006/12/07/how-to-select-the-firstleastmax-row-per-group-in-sql/.
+    //
+    // It does select how many tags for that thread/uid combination exist that
+    // have a lower tag_id and does only select those that have less than $limit.
+    //
+    // This should only have a very minor performance impact as most users won't
+    // tag a thread with 1000 different tags.
+    //
+    if ($limit) {
     $fragments['where'][] = '(SELECT count(*) FROM {pm_tags_index} AS pmtic
                               WHERE pmtic.thread_id = ti.thread_id
                               AND pmtic.uid = ti.uid
                               AND pmtic.tag_id < ti.tag_id) < %d';
     $fragments['query_args']['where'][] = $limit;
-  }
-  elseif (!empty($threads) || !empty($user)) {
+    }
+    elseif (!empty($threads) || !empty($user)) {
     // Only add a sort when we are not loading the tags for the admin page.
     // Sorting is handled through tablesort_sql() then.
     $fragments['order_by'][] = 't.tag ASC';
-  }
+    }
 }
 
 /**
@@ -869,25 +869,25 @@ 
  *   Array of tags not to be used as suggestions.
  */
 function privatemsg_filter_sql_tags_autocomplete(&$fragments, $search, $tags) {
-  global $user;
-
-  $fragments['primary_table'] = '{pm_tags} pmt';
-  $fragments['select'][] = 'pmt.tag';
-  $fragments['where'][] = "pmt.tag LIKE '%s'";
-  // Escape % to get through the placeholder replacement.
-  $fragments['query_args']['where'][] = $search .'%%';
-  if (!empty($tags)) {
+    global $user;
+
+    $fragments['primary_table'] = '{pm_tags} pmt';
+    $fragments['select'][] = 'pmt.tag';
+    $fragments['where'][] = "pmt.tag LIKE '%s'";
+    // Escape % to get through the placeholder replacement.
+    $fragments['query_args']['where'][] = $search .'%%';
+    if (!empty($tags)) {
     // Exclude tags.
     $fragments['where'][] = "pmt.tag NOT IN (". db_placeholders($tags, 'text') .")";
     $fragments['query_args']['where'] += $tags;
-  }
-  // LEFT JOIN to be able to load public, unused tags.
-  $fragments['inner_join'][]  = 'LEFT JOIN {pm_tags_index} pmti ON pmt.tag_id = pmti.tag_id AND pmti.uid = %d';
-  $fragments['query_args']['join'][] = $user->uid;
-  // Autocomplete should only display Tags used by that user or public tags.
-  // This is done to avoid information disclosure as part of tag names.
-  $fragments['where'][] = '(pmti.uid IS NOT NULL OR pmt.public = 1)';
-  $fragments['order_by'][] = 'pmt.tag ASC';
+    }
+    // LEFT JOIN to be able to load public, unused tags.
+    $fragments['inner_join'][]  = 'LEFT JOIN {pm_tags_index} pmti ON pmt.tag_id = pmti.tag_id AND pmti.uid = %d';
+    $fragments['query_args']['join'][] = $user->uid;
+    // Autocomplete should only display Tags used by that user or public tags.
+    // This is done to avoid information disclosure as part of tag names.
+    $fragments['where'][] = '(pmti.uid IS NOT NULL OR pmt.public = 1)';
+    $fragments['order_by'][] = 'pmt.tag ASC';
 }
 
 /**
@@ -898,10 +898,10 @@ 
  * Implement hook_user().
  */
 function privatemsg_filter_user($op, &$edit, &$account, $category = NULL) {
-  switch ($op) {
-      case 'delete':
+    switch ($op) {
+        case 'delete':
       // Delete tag information of that user.
       db_query("DELETE FROM {pm_tags_index} WHERE uid = %d", $account->uid, $account->uid);
-      break;
-  }
+        break;
+    }
 }

drupal/sites/default/boinc/modules/contrib/privatemsg/privatemsg.theme.inc

Indentation +75 added lines, -75 removed lines

@@ -75,11 +75,11 @@ 
  * @see theme_privatemsg_list_field()
  */
 function phptemplate_privatemsg_list_field__participants($thread) {
-  $participants = _privatemsg_generate_user_array($thread['participants'], -4);
-  $field = array();
-  $field['data'] = _privatemsg_format_participants($participants, 3, TRUE);
-  $field['class'] = 'privatemsg-list-participants';
-  return $field;
+    $participants = _privatemsg_generate_user_array($thread['participants'], -4);
+    $field = array();
+    $field['data'] = _privatemsg_format_participants($participants, 3, TRUE);
+    $field['class'] = 'privatemsg-list-participants';
+    return $field;
 }
 
 /**
@@ -88,16 +88,16 @@ 
  * @see theme_privatemsg_list_field()
  */
 function phptemplate_privatemsg_list_field__subject($thread) {
-  $field = array();
-  $options = array();
-  $is_new = '';
-  if (!empty($thread['is_new'])) {
+    $field = array();
+    $options = array();
+    $is_new = '';
+    if (!empty($thread['is_new'])) {
     $is_new = theme_mark(MARK_NEW);
     $options['fragment'] = 'new';
-  }
-  $field['data'] = l($thread['subject'], 'messages/view/' . $thread['thread_id'], $options) . $is_new;
-  $field['class'] = 'privatemsg-list-subject';
-  return $field;
+    }
+    $field['data'] = l($thread['subject'], 'messages/view/' . $thread['thread_id'], $options) . $is_new;
+    $field['class'] = 'privatemsg-list-subject';
+    return $field;
 }
 
 /**
@@ -106,15 +106,15 @@ 
  * @see theme_privatemsg_list_field()
  */
 function phptemplate_privatemsg_list_field__count($thread) {
-  $field = array();
-  $field['data'] = $thread['count'];
-  $options = array();
-  if (!empty($thread['is_new']) && $thread['is_new'] < $thread['count']) {
+    $field = array();
+    $field['data'] = $thread['count'];
+    $options = array();
+    if (!empty($thread['is_new']) && $thread['is_new'] < $thread['count']) {
     $options['fragment'] = 'new';
     $field['data'] .= '<br />' . l((format_plural($thread['is_new'], '(1 new)', '(@count new)')), 'messages/view/' . $thread['thread_id'], $options);
-  }
-  $field['class'] = 'privatemsg-list-count';
-  return $field;
+    }
+    $field['class'] = 'privatemsg-list-count';
+    return $field;
 }
 
 /**
@@ -123,10 +123,10 @@ 
  * @see theme_privatemsg_list_field()
  */
 function phptemplate_privatemsg_list_field__last_updated($thread) {
-  $field = array();
-  $field['data'] = format_date($thread['last_updated'], 'small');
-  $field['class'] = 'privatemsg-list-date';
-  return $field;
+    $field = array();
+    $field['data'] = format_date($thread['last_updated'], 'small');
+    $field['class'] = 'privatemsg-list-date';
+    return $field;
 }
 
 /**
@@ -135,10 +135,10 @@ 
  * @see theme_privatemsg_list_field()
  */
 function phptemplate_privatemsg_list_field__thread_started($thread) {
-  $field = array();
-  $field['data'] = format_date($thread['thread_started'], 'small');
-  $field['class'] = 'privatemsg-list-date-started';
-  return $field;
+    $field = array();
+    $field['data'] = format_date($thread['thread_started'], 'small');
+    $field['class'] = 'privatemsg-list-date-started';
+    return $field;
 }
 
 /**
@@ -162,13 +162,13 @@ 
  * @see theme_privatemsg_list_header()
  */
 function phptemplate_privatemsg_list_header__subject() {
-  return array(
+    return array(
     'data'    => t('Subject'),
     'field'   => 'subject',
     'key'     => 'subject',
     'class'   => 'privatemsg-header-subject',
     '#weight' => -40,
-  );
+    );
 }
 
 /**
@@ -177,12 +177,12 @@ 
  * @see theme_privatemsg_list_header()
  */
 function phptemplate_privatemsg_list_header__count() {
-  return array(
+    return array(
     'data'    => t('Messages'),
     'key'     => 'count',
     'class'   => 'privatemsg-header-count',
     '#weight' => -25,
-  );
+    );
 }
 
 /**
@@ -191,12 +191,12 @@ 
  * @see theme_privatemsg_list_header()
  */
 function phptemplate_privatemsg_list_header__participants() {
-  return array(
+    return array(
     'data'    => t('Participants'),
     'key'     => 'participants',
     'class'   => 'privatemsg-header-participants',
     '#weight' => -30,
-  );
+    );
 }
 
 /**
@@ -205,14 +205,14 @@ 
  * @see theme_privatemsg_list_header()
  */
 function phptemplate_privatemsg_list_header__last_updated() {
-  return array(
+    return array(
     'data'    => t('Last Updated'),
     'field'   => 'last_updated',
     'key'     => 'last_updated',
     'sort'    => 'desc',
     'class'   => 'privatemsg-header-lastupdated',
     '#weight' => -20,
-  );
+    );
 }
 
 /**
@@ -221,13 +221,13 @@ 
  * @see theme_privatemsg_list_header()
  */
 function phptemplate_privatemsg_list_header__thread_started() {
-  return array(
+    return array(
     'data'    => t('Started'),
     'field'   => 'thread_started',
     'key'     => 'thread_started',
     'class'   => 'privatemsg-header-threadstarted',
     '#weight' => -15,
-  );
+    );
 }
 
 /**
@@ -237,70 +237,70 @@ 
  * by the header and field theme patterns.
  */
 function theme_privatemsg_list($form) {
-  $has_posts = !empty($form['#data']);
+    $has_posts = !empty($form['#data']);
 
-  drupal_add_css(drupal_get_path('module', 'privatemsg') .'/styles/privatemsg-list.css');
+    drupal_add_css(drupal_get_path('module', 'privatemsg') .'/styles/privatemsg-list.css');
 
-  // Load the table columns.
-  $columns = array_merge(array('subject', 'last_updated'), array_filter(variable_get('privatemsg_display_fields', array('participants'))));
+    // Load the table columns.
+    $columns = array_merge(array('subject', 'last_updated'), array_filter(variable_get('privatemsg_display_fields', array('participants'))));
 
-  // Load the themed list headers based on the available data.
-  $headers = _privatemsg_list_headers(!empty($form['#data']), $columns);
-  // sort the headers array based on the #weight property.
-  usort($headers, 'element_sort');
+    // Load the themed list headers based on the available data.
+    $headers = _privatemsg_list_headers(!empty($form['#data']), $columns);
+    // sort the headers array based on the #weight property.
+    usort($headers, 'element_sort');
 
-  $themed_rows = array();
-  // Check if there is atleast a single thread.
-  if ($has_posts) {
+    $themed_rows = array();
+    // Check if there is atleast a single thread.
+    if ($has_posts) {
     foreach ($form['#data'] as $thread_id => $data) {
-      // Theme the row.
-      $row = _privatemsg_list_thread($data);
-      $data = array();
-      // Render the checkbox.
-      $data[] = array('data' => drupal_render($form['threads'][$thread_id]), 'class' => 'privatemsg-list-select');
+        // Theme the row.
+        $row = _privatemsg_list_thread($data);
+        $data = array();
+        // Render the checkbox.
+        $data[] = array('data' => drupal_render($form['threads'][$thread_id]), 'class' => 'privatemsg-list-select');
 
-      // Store the #rows data in the same order as the header is, the key property of the header refers to the field that belongs to it.
-      foreach ($headers as $header) {
+        // Store the #rows data in the same order as the header is, the key property of the header refers to the field that belongs to it.
+        foreach ($headers as $header) {
         if (!empty($header['key'])) {
-          if (isset($row['data'][$header['key']])) {
+            if (isset($row['data'][$header['key']])) {
             $data[] = $row['data'][$header['key']];
-          }
-          else {
+            }
+            else {
             // Store a empty value so that the order is still correct.
             $data[] = '';
-          }
+            }
+        }
         }
-      }
-      // Replace the data
-      $row['data'] = $data;
-      $themed_rows[] = $row;
+        // Replace the data
+        $row['data'] = $data;
+        $themed_rows[] = $row;
     }
-  }
-  else {
+    }
+    else {
     // Display a message if now messages are available.
     $themed_rows[] = array(array('data' => t('No messages available.'), 'colspan' => count($headers)));
-  }
+    }
 
-  // Remove any data in header that we don't need anymore.
-  foreach ($headers as $id => $header) {
+    // Remove any data in header that we don't need anymore.
+    foreach ($headers as $id => $header) {
     unset($headers[$id]['key']);
     unset($headers[$id]['#weight']);
-  }
+    }
 
-  // Theme the table, pass all generated information to the table theme function.
-  $form['list'] = array('#value' => theme('table', $headers, $themed_rows, array('class' => 'privatemsg-list')), '#weight' => 5);
-  return drupal_render($form);
+    // Theme the table, pass all generated information to the table theme function.
+    $form['list'] = array('#value' => theme('table', $headers, $themed_rows, array('class' => 'privatemsg-list')), '#weight' => 5);
+    return drupal_render($form);
 }
 
 /**
  * Theme a block which displays the number of new messages a user has.
  */
 function theme_privatemsg_new_block($count) {
-  $text = format_plural($count, 'You have a new message, click here to read it',
+    $text = format_plural($count, 'You have a new message, click here to read it',
                         'You have @count new messages, click here to read them',
                         array('@count' => $count));
 
-  return l($text, 'messages', array('attributes' => array('id' => 'privatemsg-new-link')));
+    return l($text, 'messages', array('attributes' => array('id' => 'privatemsg-new-link')));
 }
 
 /**

drupal/sites/default/boinc/modules/contrib/privatemsg/pm_block_user/pm_block_user.module

Indentation +222 added lines, -222 removed lines

@@ -19,17 +19,17 @@ 
  * Implements hook_help().
  */
 function pm_block_user_help($path) {
-  switch ($path) {
+    switch ($path) {
     case 'admin/settings/messages/block':
       return '<p>' . t('This area is used to define user blocking rules for the Privatemsg module. Rules allow control of who may block messages from whom. By default all users are allowed to block messages from anyone else. However, a site may have groups of users that need to contact or get information to others, for example: the site may have administrative staff or be a forum with moderators. Groups of users are defined by roles, which can be managed on the <a href="@roles">roles configuration page</a>.', array('@roles' => url('admin/user/roles'))) . '</p>';
-  }
+    }
 }
 
 /**
  * Implements hook_menu().
  */
 function pm_block_user_menu() {
-  $items['messages/block/%user'] = array(
+    $items['messages/block/%user'] = array(
     'title'            => 'Block user messages',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('pm_block_user_form', 2),
@@ -37,61 +37,61 @@ 
     'access arguments' => array(2),
     'type'             => MENU_CALLBACK,
     'weight'           => -10,
-  );
+    );
 
-  $items['admin/settings/messages/block'] = array(
+    $items['admin/settings/messages/block'] = array(
     'title'            => 'User blocking rules',
     'description'      => 'Configure rules for which users may block each other.',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('pm_block_user_settings'),
     'access arguments' => array('administer privatemsg settings'),
     'type'             => MENU_LOCAL_TASK,
-  );
+    );
 
-  $items['messages/block/js'] = array(
+    $items['messages/block/js'] = array(
     'title' => 'Javascript block actions form',
     'page callback' => 'pm_block_user_js',
     'access arguments' => array('administer privatemsg settings'),
     'type' => MENU_CALLBACK,
-  );
+    );
 
-  return $items;
+    return $items;
 }
 
 /**
  * Menu callback for blocked user settings.
  */
 function pm_block_user_settings(&$form_state) {
-  drupal_add_css(drupal_get_path('module', 'pm_block_user') .'/pm_block_user.css');
-  // Need to cache form for AHAH, so it can be rebuilt from cache later.
-  $form = array(
+    drupal_add_css(drupal_get_path('module', 'pm_block_user') .'/pm_block_user.css');
+    // Need to cache form for AHAH, so it can be rebuilt from cache later.
+    $form = array(
     '#cache' => TRUE,
-  );
+    );
 
-  // Container for just the actions, used for AHAH.
-  $form['block_actions'] = array(
+    // Container for just the actions, used for AHAH.
+    $form['block_actions'] = array(
     '#tree' => TRUE,
     '#prefix' => '<div id="block-actions">',
     '#suffix' => '</div>',
     '#theme' => 'pm_block_user_actions',
-  );
+    );
 
-  // Should we populate the form with data from $form_state or the database?
-  if (!isset($form_state['pm_block_user']['block_actions'])) {
+    // Should we populate the form with data from $form_state or the database?
+    if (!isset($form_state['pm_block_user']['block_actions'])) {
     $block_actions = variable_get('pm_block_user_actions', array());
-  }
-  else {
+    }
+    else {
     $block_actions = $form_state['pm_block_user']['block_actions'];
-  }
-  // Work through each rule, adding it as a new element in
-  // $form['block_actions'] ready to be themed later.
-  foreach ($block_actions as $delta => $details) {
+    }
+    // Work through each rule, adding it as a new element in
+    // $form['block_actions'] ready to be themed later.
+    foreach ($block_actions as $delta => $details) {
     $details['delta'] = $delta;
     $form['block_actions'][$delta] = _pm_block_user_actions_form($details);
-  }
+    }
 
-  // The magic AHAH callback button that adds more rows.
-  $form['pm_block_actions_more'] = array(
+    // The magic AHAH callback button that adds more rows.
+    $form['pm_block_actions_more'] = array(
     '#type' => 'submit',
     '#value' => t('More'),
     '#weight' => 1,
@@ -99,20 +99,20 @@ 
     '#suffix' => '<label for="edit-pm-block-actions-more">' . t('Add new rule') . '</label></div>',
     '#submit' => array('pm_block_user_more_submit'),
     '#ahah' => array(
-      'path' => 'messages/block/js',
-      'wrapper' => 'block-actions',
-      'method' => 'replace',
-      'effect' => 'fade',
+        'path' => 'messages/block/js',
+        'wrapper' => 'block-actions',
+        'method' => 'replace',
+        'effect' => 'fade',
     ),
-  );
+    );
 
-  $form['submit_form'] = array(
+    $form['submit_form'] = array(
     '#type' => 'submit',
     '#weight' => 10,
     '#value' => t('Save configuration'),
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -132,50 +132,50 @@ 
  *   Part of a form with controls for sending, receiving and actions.
  */
 function _pm_block_user_actions_form($details, $blacklist = TRUE) {
-  $form = array(
+    $form = array(
     '#tree' => TRUE,
-  );
-  $delta = $details['delta'];
-  // FALSE by default, or if the user has checked the 'Enabled' check box for
-  // this row.
-  $row_disabled = (isset($details['enabled']) ? !$details['enabled'] : FALSE);
+    );
+    $delta = $details['delta'];
+    // FALSE by default, or if the user has checked the 'Enabled' check box for
+    // this row.
+    $row_disabled = (isset($details['enabled']) ? !$details['enabled'] : FALSE);
 
-  $form['author'] = array(
+    $form['author'] = array(
     '#type' => 'select',
     '#options' => user_roles(TRUE),
     '#default_value' => (isset($details['author']) ? $details['author'] : DRUPAL_AUTHENTICATED_RID),
     '#disabled' => $row_disabled,
-  );
-  $form['recipient'] = array(
+    );
+    $form['recipient'] = array(
     '#type' => 'select',
     '#options' => user_roles(TRUE),
     '#default_value' => (isset($details['recipient']) ? $details['recipient'] : DRUPAL_AUTHENTICATED_RID),
     '#disabled' => $row_disabled,
-  );
+    );
 
-  // Provide different action radios if we're using a whitelist or a blacklist.
-  if ($blacklist) {
+    // Provide different action radios if we're using a whitelist or a blacklist.
+    if ($blacklist) {
     $options = array(
-      PM_BLOCK_USER_DISALLOW_BLOCKING => t('Disallow blocking author'),
-      PM_BLOCK_USER_DISALLOW_SENDING => t('Disallow sending message'),
+        PM_BLOCK_USER_DISALLOW_BLOCKING => t('Disallow blocking author'),
+        PM_BLOCK_USER_DISALLOW_SENDING => t('Disallow sending message'),
     );
     $default_value = (isset($details['action']) ? $details['action'] : PM_BLOCK_USER_DISALLOW_BLOCKING);
-  }
-  else {
+    }
+    else {
     // @todo: add whitelist options/default_value here.
-  }
-  $form['action']  = array(
+    }
+    $form['action']  = array(
     '#type' => 'radios',
     '#options' => $options,
     '#disabled' => $row_disabled,
     '#default_value' => $default_value,
-  );
+    );
 
-  $form['enabled'] = array(
+    $form['enabled'] = array(
     '#type' => 'checkbox',
     '#default_value' => (isset($details['enabled']) ? $details['enabled'] : TRUE),
-  );
-  $form['remove'] = array(
+    );
+    $form['remove'] = array(
     '#type' => 'submit',
     '#submit' => array('pm_block_user_remove_submit'),
     '#value' => t('Remove'),
@@ -183,14 +183,14 @@ 
     '#prefix' => '<div id="remove-rule-button">',
     '#suffix' => '<label for="edit-remove">' . t('Remove rule') . '</label></div>',
     '#ahah' => array(
-      'path' => 'messages/block/js',
-      'wrapper' => 'block-actions',
-      'method' => 'replace',
-      'effect' => 'fade',
+        'path' => 'messages/block/js',
+        'wrapper' => 'block-actions',
+        'method' => 'replace',
+        'effect' => 'fade',
     ),
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -199,17 +199,17 @@ 
  * @see pm_block_user_remove_submit()
  */
 function pm_block_user_more_submit($form, &$form_state) {
-  unset($form_state['submit_handlers']);
-  form_execute_handlers('submit', $form, $form_state);
-  // Get the submitted actions, then put them into a special area of
-  // the $form_state.
-  $submitted_values = $form_state['values'];
-  // Add an empty action.
-  $submitted_values['block_actions'][] = array();
-  $form_state['pm_block_user'] = $submitted_values;
-  // Rebuild the form by passing our $form_state through the
-  // pm_block_user_settings() builder function.
-  $form_state['rebuild'] = TRUE;
+    unset($form_state['submit_handlers']);
+    form_execute_handlers('submit', $form, $form_state);
+    // Get the submitted actions, then put them into a special area of
+    // the $form_state.
+    $submitted_values = $form_state['values'];
+    // Add an empty action.
+    $submitted_values['block_actions'][] = array();
+    $form_state['pm_block_user'] = $submitted_values;
+    // Rebuild the form by passing our $form_state through the
+    // pm_block_user_settings() builder function.
+    $form_state['rebuild'] = TRUE;
 }
 
 /**
@@ -218,33 +218,33 @@ 
  * @see pm_block_user_more_submit()
  */
 function pm_block_user_remove_submit($form, &$form_state) {
-  unset($form_state['submit_handlers']);
-  form_execute_handlers('submit', $form, $form_state);
-  $submitted_values = $form_state['values'];
-  // Remove the requested action.
-  $delta = $form_state['clicked_button']['#parents'][1];
-  unset($submitted_values['block_actions'][$delta]);
-  $form_state['pm_block_user'] = $submitted_values;
-  $form_state['rebuild'] = TRUE;
+    unset($form_state['submit_handlers']);
+    form_execute_handlers('submit', $form, $form_state);
+    $submitted_values = $form_state['values'];
+    // Remove the requested action.
+    $delta = $form_state['clicked_button']['#parents'][1];
+    unset($submitted_values['block_actions'][$delta]);
+    $form_state['pm_block_user'] = $submitted_values;
+    $form_state['rebuild'] = TRUE;
 }
 
 /**
  * Submit handler for admin form.
  */
 function pm_block_user_settings_submit($form, &$form_state) {
-  // We don't want it to submit when we're adding/removing actions.
-  if ($form_state['clicked_button']['#id'] == 'edit-submit-form') {
+    // We don't want it to submit when we're adding/removing actions.
+    if ($form_state['clicked_button']['#id'] == 'edit-submit-form') {
     // If the form's 'block_actions' aren't set, the user has deleted all the
     // rows in the table, so we save an empty array to stop errors in the form
     // builder.
     if (isset($form_state['values']['block_actions'])) {
-      variable_set('pm_block_user_actions', _pm_block_user_settings_filter($form_state['values']['block_actions']));
+        variable_set('pm_block_user_actions', _pm_block_user_settings_filter($form_state['values']['block_actions']));
     }
     else {
-      variable_set('pm_block_user_actions', array());
+        variable_set('pm_block_user_actions', array());
     }
     drupal_set_message(t('The configuration options have been saved.'));
-  }
+    }
 }
 
 /**
@@ -259,60 +259,60 @@ 
  * @see pm_block_user_settings_submit()
  */
 function _pm_block_user_settings_filter($settings) {
-  // Add-in the names of any settings to be saved into the array below.
-  $save_keys = array('author', 'recipient', 'action', 'enabled');
-  $matching = array();
-  // Run through each of the keys we want to save, creating a new array.
-  // It's not possible to simply check for unwanted values and unset() them as
-  // the array is multi-dimensional.
-  foreach ($save_keys as $save_key) {
+    // Add-in the names of any settings to be saved into the array below.
+    $save_keys = array('author', 'recipient', 'action', 'enabled');
+    $matching = array();
+    // Run through each of the keys we want to save, creating a new array.
+    // It's not possible to simply check for unwanted values and unset() them as
+    // the array is multi-dimensional.
+    foreach ($save_keys as $save_key) {
     if (isset($settings[$save_key])) {
-      $matching[$save_key] = $settings[$save_key];
+        $matching[$save_key] = $settings[$save_key];
+    }
     }
-  }
-  if (count($matching) > 0) {
+    if (count($matching) > 0) {
     return $matching;
-  }
-  else {
+    }
+    else {
     return array_map('_pm_block_user_settings_filter', $settings);
-  }
+    }
 }
 
 /**
  * Menu callback for AHAH handling.
  */
 function pm_block_user_js() {
-  // See: http://drupal.org/node/331941 for the philosophy of Drupal AHAH.
-  $form_state = array('storage' => NULL, 'submitted' => FALSE);
-  $form_build_id = $_POST['form_build_id'];
-  $form = form_get_cache($form_build_id, $form_state);
-  $args = $form['#parameters'];
-  $form_id = array_shift($args);
-  $form['#post'] = $_POST;
-  $form['#redirect'] = FALSE;
-  $form['#programmed'] = FALSE;
-  $form_state['post'] = $_POST;
-  drupal_process_form($form_id, $form, $form_state);
-  $form = drupal_rebuild_form($form_id, $form_state, $args, $form_build_id);
-  $output_form = $form['block_actions'];
-  unset($output_form['#prefix'], $output_form['#suffix']); // Prevent duplicate wrappers.
-  $output = theme('status_messages') . drupal_render($output_form);
-
-  // Hack to make behaviours attach to new HTML controls (delete buttons in
-  // this case).
-  $javascript = drupal_add_js(NULL, NULL, 'header');
-  drupal_json(array('status' => TRUE, 'data' => $output));
+    // See: http://drupal.org/node/331941 for the philosophy of Drupal AHAH.
+    $form_state = array('storage' => NULL, 'submitted' => FALSE);
+    $form_build_id = $_POST['form_build_id'];
+    $form = form_get_cache($form_build_id, $form_state);
+    $args = $form['#parameters'];
+    $form_id = array_shift($args);
+    $form['#post'] = $_POST;
+    $form['#redirect'] = FALSE;
+    $form['#programmed'] = FALSE;
+    $form_state['post'] = $_POST;
+    drupal_process_form($form_id, $form, $form_state);
+    $form = drupal_rebuild_form($form_id, $form_state, $args, $form_build_id);
+    $output_form = $form['block_actions'];
+    unset($output_form['#prefix'], $output_form['#suffix']); // Prevent duplicate wrappers.
+    $output = theme('status_messages') . drupal_render($output_form);
+
+    // Hack to make behaviours attach to new HTML controls (delete buttons in
+    // this case).
+    $javascript = drupal_add_js(NULL, NULL, 'header');
+    drupal_json(array('status' => TRUE, 'data' => $output));
 }
 
 /**
  * Implements hook_theme().
  */
 function pm_block_user_theme() {
-  return array(
+    return array(
     'pm_block_user_actions' => array(
-      'arguments' => array('form' => NULL),
+        'arguments' => array('form' => NULL),
     ),
-  );
+    );
 }
 
 /**
@@ -321,49 +321,49 @@ 
  * @ingroup themeable
  */
 function theme_pm_block_user_actions($form) {
-  $rows = array();
-  $headers = array(
+    $rows = array();
+    $headers = array(
     t('If the author has the role'),
     t('And the recipient has the role'),
     t('Action'),
     t('Enabled'),
     '',
-  );
-  $form_data = element_children($form);
+    );
+    $form_data = element_children($form);
 
-  foreach ($form_data as $key) {
+    foreach ($form_data as $key) {
     // Build the table row.
     $row = array(
-      'data' => array(
+        'data' => array(
         array('data' => drupal_render($form[$key]['author'])),
         array('data' => drupal_render($form[$key]['recipient'])),
         array('data' => drupal_render($form[$key]['action'])),
         array('data' => drupal_render($form[$key]['enabled'])),
         array('data' => drupal_render($form[$key]['remove'])),
-      ),
+        ),
     );
 
     // Add additional attributes to the row, such as a class for this row.
     if (isset($form[$key]['#attributes'])) {
-      $row = array_merge($row, $form[$key]['#attributes']);
+        $row = array_merge($row, $form[$key]['#attributes']);
     }
     $rows[] = $row;
-  }
+    }
 
-  // If there are no rows, output some instructions for the user.
-  if (empty($form_data)) {
+    // If there are no rows, output some instructions for the user.
+    if (empty($form_data)) {
     $rows[] = array(
-      array(
+        array(
         'data' => t("No rules have been added. All users may block private messages from each other. To limit which users may be blocked, click 'Add new rule'."),
         'colspan' => '5',
-      ),
+        ),
     );
-  }
+    }
 
-  $output = theme('table', $headers, $rows);
-  $output .= drupal_render($form);
+    $output = theme('table', $headers, $rows);
+    $output .= drupal_render($form);
 
-  return $output;
+    return $output;
 }
 
 /**
@@ -377,14 +377,14 @@ 
  *   TRUE if the user is allowed to block $account, or FALSE if not.
  */
 function _pm_block_user_access($account) {
-  global $user;
-  if (!privatemsg_user_access('read privatemsg', $user)) {
+    global $user;
+    if (!privatemsg_user_access('read privatemsg', $user)) {
     return FALSE;
-  }
-  if (_pm_block_user_rule_exists($account, $user, PM_BLOCK_USER_DISALLOW_BLOCKING)) {
+    }
+    if (_pm_block_user_rule_exists($account, $user, PM_BLOCK_USER_DISALLOW_BLOCKING)) {
     return FALSE;
-  }
-  return TRUE;
+    }
+    return TRUE;
 }
 
 /**
@@ -406,179 +406,179 @@ 
  *   TRUE if a rule exists for the combination of author recipient and action.
  */
 function _pm_block_user_rule_exists($author, $recipient, $action = PM_BLOCK_USER_DISALLOW_BLOCKING) {
-  $block_actions = variable_get('pm_block_user_actions', array());
-  foreach ($block_actions as $delta => $details) {
+    $block_actions = variable_get('pm_block_user_actions', array());
+    foreach ($block_actions as $delta => $details) {
     // If this rule doesn't relate to $action, or it's disabled
     // ignore it and go to next loop iteration.
     if ($details['action'] != $action || !$details['enabled']) {
-      continue;
+        continue;
     }
     // There are no rules governing user one, but user one may have roles that
     // affect other users, so these exceptions are narrow in scope.
     // Disallow sending affects private message authors.
     if ($author->uid == 1 && $action == PM_BLOCK_USER_DISALLOW_SENDING) {
-      continue;
+        continue;
     }
     // Disallow blocking affects private message recipients.
     if ($recipient->uid == 1 && $action == PM_BLOCK_USER_DISALLOW_BLOCKING) {
-      continue;
+        continue;
     }
     // The author has a role matching the rule and so does the recipient.
     if (isset($author->roles[$details['author']]) && isset($recipient->roles[$details['recipient']])) {
-      return TRUE;
+        return TRUE;
+    }
     }
-  }
-  return FALSE;
+    return FALSE;
 }
 
 function pm_block_user_form($form_state, $author) {
-  global $user;
+    global $user;
 
-  $form['author'] = array(
+    $form['author'] = array(
     '#type' => 'value',
     '#value' => $author->uid,
-  );
+    );
     $form['recipient'] = array(
     '#type' => 'value',
     '#value' => $user->uid,
-  );
-  $form['author_name'] = array(
+    );
+    $form['author_name'] = array(
     '#type' => 'value',
     '#value' => $author->name,
-  );
-  $form['destination'] = array(
+    );
+    $form['destination'] = array(
     '#type' => 'value',
     '#value' => isset($_GET['destination']) ? $_GET['destination'] : 'messages/',
-  );
+    );
 
-  if (db_result(db_query('SELECT COUNT(recipient) FROM {pm_block_user} WHERE author = %d AND recipient = %d', $author->uid, $user->uid))) {
+    if (db_result(db_query('SELECT COUNT(recipient) FROM {pm_block_user} WHERE author = %d AND recipient = %d', $author->uid, $user->uid))) {
     $form['block_action'] = array(
-      '#type' => 'value',
-      '#value' => 'unblock_user',
+        '#type' => 'value',
+        '#value' => 'unblock_user',
     );
     return confirm_form($form,
-      t('You have previously blocked "@author" from sending you any more messages. Are you sure you want to unblock this user?', array('@author' => $author->name)),
-      isset($_GET['destination']) ? $_GET['destination'] : 'messages/',
-      t('This action cannot be undone.'),
-      t('Unblock @author', array('@author' => $author->name)),
-      t('Cancel')
+        t('You have previously blocked "@author" from sending you any more messages. Are you sure you want to unblock this user?', array('@author' => $author->name)),
+        isset($_GET['destination']) ? $_GET['destination'] : 'messages/',
+        t('This action cannot be undone.'),
+        t('Unblock @author', array('@author' => $author->name)),
+        t('Cancel')
     );
-  }
-  else {
+    }
+    else {
     $form['block_action'] = array(
-      '#type' => 'value',
-      '#value' => 'block_user',
+        '#type' => 'value',
+        '#value' => 'block_user',
     );
     return confirm_form($form,
-      t('Are you sure you want to block "@author" from sending you any more messages?', array('@author' => $author->name)),
-      isset($_GET['destination']) ? $_GET['destination'] : 'messages/',
-      '',
-      t('Block @author', array('@author' => $author->name)),
-      t('Cancel')
+        t('Are you sure you want to block "@author" from sending you any more messages?', array('@author' => $author->name)),
+        isset($_GET['destination']) ? $_GET['destination'] : 'messages/',
+        '',
+        t('Block @author', array('@author' => $author->name)),
+        t('Cancel')
     );
-  }
+    }
 }
 
 /**
  * Implements hook_form_submit().
  */
 function pm_block_user_form_submit($form, &$form_state) {
-  if ($form_state['values']['confirm']) {
+    if ($form_state['values']['confirm']) {
     switch ($form_state['values']['block_action']) {
-      case 'block_user':
+        case 'block_user':
         db_query('INSERT INTO {pm_block_user} (author, recipient) VALUES (%d, %d)', $form_state['values']['author'], $form_state['values']['recipient']);
         drupal_set_message(t('@author has been blocked from sending you any further messages.', array('@author' => $form_state['values']['author_name'])));
-      break;
-      case 'unblock_user':
+        break;
+        case 'unblock_user':
         db_query('DELETE FROM {pm_block_user} WHERE author = %d AND recipient = %d', $form_state['values']['author'], $form_state['values']['recipient']);
         drupal_set_message(t('@author is now allowed to send you new messages.', array('@author' => $form_state['values']['author_name'])));
-      break;
+        break;
+    }
     }
-  }
-  $form_state['redirect'] = $form_state['values']['destination'];
+    $form_state['redirect'] = $form_state['values']['destination'];
 }
 
 /**
  * Implements hook_privatemsg_block_message().
  */
 function pm_block_user_privatemsg_block_message($author, $recipients) {
-  $blocked = array();
-  // Loop through each recipient and ensure there is no rule blocking this
-  // author from sending them private messages. Use a reference, so when
-  // user_load() is needed here the array is updated, negating the need for
-  // further calls to user_load() later in the code.
-  foreach (array_keys($recipients) as $uid) {
+    $blocked = array();
+    // Loop through each recipient and ensure there is no rule blocking this
+    // author from sending them private messages. Use a reference, so when
+    // user_load() is needed here the array is updated, negating the need for
+    // further calls to user_load() later in the code.
+    foreach (array_keys($recipients) as $uid) {
 
     // Ensure we have a recipient user object which includes roles.
     if (!isset($recipients[$uid]->roles)) {
-      $recipients[$uid] = user_load($uid);
+        $recipients[$uid] = user_load($uid);
     }
     // Note: this is checks whether the author may send the message (see third
     // parameter). Further below is a check whether the recipient may block it.
     if (_pm_block_user_rule_exists($author, $recipients[$uid], PM_BLOCK_USER_DISALLOW_SENDING)) {
-      $blocked[] = array(
+        $blocked[] = array(
         'uid' => $uid,
         'message' => t('Sorry, private messaging rules forbid sending messages to !name.', array('!name' => $recipients[$uid]->name)),
-      );
+        );
+    }
     }
-  }
 
-  $args = array_merge(array($author->uid), array_keys($recipients));
-  $result = db_query('SELECT recipient FROM {pm_block_user} WHERE author = %d AND recipient IN ('. db_placeholders($recipients) .') GROUP BY recipient', $args);
-  while ($row = db_fetch_array($result)) {
+    $args = array_merge(array($author->uid), array_keys($recipients));
+    $result = db_query('SELECT recipient FROM {pm_block_user} WHERE author = %d AND recipient IN ('. db_placeholders($recipients) .') GROUP BY recipient', $args);
+    while ($row = db_fetch_array($result)) {
     $recipient = $recipients[$row['recipient']];
     // If there's a rule disallowing blocking of this message, send it anyway.
     if (_pm_block_user_rule_exists($author, $recipient, PM_BLOCK_USER_DISALLOW_BLOCKING)) {
-      continue;
+        continue;
     }
     $blocked[] = array(
-      'uid' => $row['recipient'],
-      'message' => t('%name has chosen to not recieve any more messages from you.', array('%name' => $recipients[$row['recipient']]->name))
+        'uid' => $row['recipient'],
+        'message' => t('%name has chosen to not recieve any more messages from you.', array('%name' => $recipients[$row['recipient']]->name))
     );
-  }
-  return $blocked;
+    }
+    return $blocked;
 }
 
 function pm_block_user_privatemsg_sql_load_alter(&$fragments, $pmid, $uid) {
-  $fragments['select'][] = 'pmbu.recipient AS is_blocked';
+    $fragments['select'][] = 'pmbu.recipient AS is_blocked';
 
-  $fragments['inner_join'][] = 'LEFT JOIN {pm_block_user} pmbu ON (pm.author = pmbu.author AND pmi.uid = pmbu.recipient)';
+    $fragments['inner_join'][] = 'LEFT JOIN {pm_block_user} pmbu ON (pm.author = pmbu.author AND pmi.uid = pmbu.recipient)';
 }
 
 /**
  * Implements hook_privatemsg_message_view_alter().
  */
 function pm_block_user_privatemsg_message_view_alter(&$vars) {
-  global $user;
+    global $user;
 
-  $author = $vars['message']['author'];
-  if (_pm_block_user_rule_exists($author, $user, PM_BLOCK_USER_DISALLOW_BLOCKING)) {
+    $author = $vars['message']['author'];
+    if (_pm_block_user_rule_exists($author, $user, PM_BLOCK_USER_DISALLOW_BLOCKING)) {
     return;
-  }
-  if (!isset($vars['message']['thread_id'])) {
+    }
+    if (!isset($vars['message']['thread_id'])) {
     // No thread id, this is probably only a preview
     return;
-  }
-  $thread_id = $vars['message']['thread_id'];
+    }
+    $thread_id = $vars['message']['thread_id'];
 
-  if ($user->uid <> $author->uid) {
+    if ($user->uid <> $author->uid) {
     if ($vars['message']['is_blocked']) {
-      $vars['message_actions']['unblock_author'] = array('title' => t('Unblock author'), 'href' => 'messages/block/'. $author->uid, 'query' => 'destination=messages/view/' . $thread_id);
+        $vars['message_actions']['unblock_author'] = array('title' => t('Unblock author'), 'href' => 'messages/block/'. $author->uid, 'query' => 'destination=messages/view/' . $thread_id);
     }
     else {
-      $vars['message_actions']['block_author'] = array('title' => t('Block author'), 'href' => 'messages/block/'. $author->uid, 'query' => 'destination=messages/view/' . $thread_id);
+        $vars['message_actions']['block_author'] = array('title' => t('Block author'), 'href' => 'messages/block/'. $author->uid, 'query' => 'destination=messages/view/' . $thread_id);
+    }
     }
-  }
 }
 
 /**
  * Implement hook_user().
  */
 function pm_block_user_user($op, &$edit, &$account, $category = NULL) {
-  switch ($op) {
-      case 'delete':
+    switch ($op) {
+        case 'delete':
       // Delete blocking rules which involve this user.
       db_query("DELETE FROM {pm_block_user} WHERE author = %d OR recipient = %d", $account->uid, $account->uid);
-      break;
-  }
+        break;
+    }
 }

drupal/sites/default/boinc/modules/node_comment_block/node_comment_block.module

Indentation +35 added lines, -35 removed lines

@@ -9,45 +9,45 @@ 
  * Implements hook_block() for Drupal 6 compatibility
  */
 function node_comment_block_block($op = 'list', $delta = 0, $edit = array()) {
-  switch ($op) {
-  case 'view':
+    switch ($op) {
+    case 'view':
     //$block = node_comment_block_block_view($delta);
     $block = array();
     if ($delta == 'node_comments') {
-      if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
+        if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
         $node = node_load($nid);
         if ($node->comment !== 0) {
-          $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
-          $block['content'] = '';
-          if ($node->comment) {
+            $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
+            $block['content'] = '';
+            if ($node->comment) {
             $block['content'] .= comment_render($node);
-          }
+            }
+        }
         }
-      }
     }
     break;
-  case 'list':
+    case 'list':
     $blocks = node_comment_block_block_info();
     return $blocks;
     break;
-  default:
+    default:
   }
-  return $block;
+    return $block;
 }
 
 /**
  * Port Drupal 7 render() function to Drupal 6
  */
 function render(&$element) {
-  if (is_array($element)) {
+    if (is_array($element)) {
     show($element);
     return drupal_render($element);
-  }
-  else {
+    }
+    else {
     // Safe-guard for inappropriate use of render() on flat variables: return
     // the variable as-is.
     return $element;
-  }
+    }
 }
 
 
@@ -56,50 +56,50 @@ 
  * Implements hook_block_info().
  */
 function node_comment_block_block_info() {
-  $blocks['node_comments'] = array(
+    $blocks['node_comments'] = array(
     'info' => t('Node comments'),
-  );
+    );
 
-  return $blocks;
+    return $blocks;
 }
 
 /**
  * Implements hook_block_view().
  */
 function node_comment_block_block_view($delta = '') {
-  $block = array();
+    $block = array();
 
-  if ($delta == 'node_comments') {
+    if ($delta == 'node_comments') {
     if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
-      $node = node_load($nid);
+        $node = node_load($nid);
 
-      if ($node->comment !== 0) {
+        if ($node->comment !== 0) {
         $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
         $block['content'] = '';
 
         $node = node_view($node);
 
         if ($node['comments']) {
-          $block['content'] .= render($node['comments']);
+            $block['content'] .= render($node['comments']);
+        }
         }
-      }
     }
-  }
+    }
 
-  return $block;
+    return $block;
 }
 
 /**
  * Implements hook_preprocess_HOOK() for nodes.
  */
 function node_comment_block_preprocess_node(&$variables) {
-  $node = $variables['node'];
-  // Only hide standard comments for news content
-  if ($variables['type'] == 'news') {
+    $node = $variables['node'];
+    // Only hide standard comments for news content
+    if ($variables['type'] == 'news') {
     $variables['node']->comment = 0;
-  }
+    }
   
-  /* Drupal 7...
+    /* Drupal 7...
   if ($node->comment !== 0 && $variables['view_mode'] == 'full') {
     if (isset($variables['content']['comments'])) {
       unset($variables['content']['comments']);
@@ -113,10 +113,10 @@ 
  * Implements hook_form_FORM_ID_alter() for block_admin_configure.
  */
 function node_comment_block_form_block_admin_configure_alter(&$form, &$form_state) {
-  if (isset($form['delta'])) {
+    if (isset($form['delta'])) {
     if ($form['delta']['#value'] == 'node_comments') {
-      $form['settings']['title']['#disabled'] = TRUE;
-      $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
+        $form['settings']['title']['#disabled'] = TRUE;
+        $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
+    }
     }
-  }
 }

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pBarcode39.class.php

Indentation +139 added lines, -139 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pBarcode39 - class to create barcodes (39B)
 
      Version     : 2.1.3
@@ -13,188 +13,188 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- /* pData class definition */
- class pBarcode39
-  {
-   var $Codes;
-   var $Reverse;
-   var $Result;
-   var $pChartObject;
-   var $CRC;
-   var $MOD43;
-
-   /* Class creator */
-   function pBarcode39($BasePath="",$EnableMOD43=FALSE)
+    /* pData class definition */
+    class pBarcode39
     {
-     $this->MOD43  = $EnableMOD43;
-     $this->Codes   = "";
-     $this->Reverse = "";
+    var $Codes;
+    var $Reverse;
+    var $Result;
+    var $pChartObject;
+    var $CRC;
+    var $MOD43;
+
+    /* Class creator */
+    function pBarcode39($BasePath="",$EnableMOD43=FALSE)
+    {
+        $this->MOD43  = $EnableMOD43;
+        $this->Codes   = "";
+        $this->Reverse = "";
 
-     $FileHandle = @fopen($BasePath."data/39.db", "r");
+        $FileHandle = @fopen($BasePath."data/39.db", "r");
 
-     if (!$FileHandle) { die("Cannot find barcode database (".$BasePath."data/39.db)."); }
+        if (!$FileHandle) { die("Cannot find barcode database (".$BasePath."data/39.db)."); }
 
-     while (!feof($FileHandle))
-      {
-       $Buffer = fgets($FileHandle,4096);
-       $Buffer = str_replace(chr(10),"",$Buffer);
-       $Buffer = str_replace(chr(13),"",$Buffer);
-       $Values = preg_split("/;/",$Buffer);
+        while (!feof($FileHandle))
+        {
+        $Buffer = fgets($FileHandle,4096);
+        $Buffer = str_replace(chr(10),"",$Buffer);
+        $Buffer = str_replace(chr(13),"",$Buffer);
+        $Values = preg_split("/;/",$Buffer);
 
-       $this->Codes[$Values[0]] = $Values[1];
-      }
-     fclose($FileHandle);
+        $this->Codes[$Values[0]] = $Values[1];
+        }
+        fclose($FileHandle);
     }
 
-   /* Return the projected size of a barcode */
-   function getSize($TextString,$Format="")
+    /* Return the projected size of a barcode */
+    function getSize($TextString,$Format="")
     {
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
-     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+        $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+        $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+        $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+        $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+        $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
+        $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
 
-     $TextString    = $this->encode39($TextString);
-     $BarcodeLength = strlen($this->Result);
+        $TextString    = $this->encode39($TextString);
+        $BarcodeLength = strlen($this->Result);
 
-     if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
-     if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
+        if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
+        if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
 
-     $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
-     $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+        $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+        $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
 
-     $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
-     $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
+        $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
+        $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
 
 
-     $AreaWidth  = max(abs($X1),abs($X2));
-     $AreaHeight = max(abs($Y1),abs($Y2));
+        $AreaWidth  = max(abs($X1),abs($X2));
+        $AreaHeight = max(abs($Y1),abs($Y2));
 
-     return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
+        return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
     }
 
-   /* Create the encoded string */
-   function encode39($Value)
+    /* Create the encoded string */
+    function encode39($Value)
     {
-     $this->Result = "100101101101"."0";
-     $TextString   = "";
-     for($i=1;$i<=strlen($Value);$i++)
-      {
-       $CharCode = ord($this->mid($Value,$i,1));
-       if ( $CharCode >= 97 && $CharCode <= 122 ) { $CharCode = $CharCode - 32; }
-
-       if ( isset($this->Codes[chr($CharCode)]) )
+        $this->Result = "100101101101"."0";
+        $TextString   = "";
+        for($i=1;$i<=strlen($Value);$i++)
+        {
+        $CharCode = ord($this->mid($Value,$i,1));
+        if ( $CharCode >= 97 && $CharCode <= 122 ) { $CharCode = $CharCode - 32; }
+
+        if ( isset($this->Codes[chr($CharCode)]) )
         {
-         $this->Result = $this->Result.$this->Codes[chr($CharCode)]."0";
-         $TextString = $TextString.chr($CharCode);
+            $this->Result = $this->Result.$this->Codes[chr($CharCode)]."0";
+            $TextString = $TextString.chr($CharCode);
+        }
         }
-      }
 
-     if ( $this->MOD43 )
-      {
-       $Checksum = $this->checksum($TextString);
-       $this->Result = $this->Result.$this->Codes[$Checksum]."0";
-      }
+        if ( $this->MOD43 )
+        {
+        $Checksum = $this->checksum($TextString);
+        $this->Result = $this->Result.$this->Codes[$Checksum]."0";
+        }
 
-     $this->Result = $this->Result."100101101101";
-     $TextString   = "*".$TextString."*";
+        $this->Result = $this->Result."100101101101";
+        $TextString   = "*".$TextString."*";
 
-     return($TextString);
+        return($TextString);
     }
 
-   /* Create the encoded string */
-   function draw($Object,$Value,$X,$Y,$Format="")
+    /* Create the encoded string */
+    function draw($Object,$Value,$X,$Y,$Format="")
     {
-     $this->pChartObject = $Object;
-
-     $R			= isset($Format["R"]) ? $Format["R"] : 0;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
-     $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
-     $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
-     $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
-     $AreaBorderR	= isset($Format["AreaBorderR"]) ? $Format["AreaBorderR"] : $AreaR;
-     $AreaBorderG	= isset($Format["AreaBorderG"]) ? $Format["AreaBorderG"] : $AreaG;
-     $AreaBorderB	= isset($Format["AreaBorderB"]) ? $Format["AreaBorderB"] : $AreaB;
-
-     $TextString   = $this->encode39($Value);
-
-     if ( $DrawArea )
-      {
-       $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
-       $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
-
-       $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
-       $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
-
-       if ( $ShowLegend )
+        $this->pChartObject = $Object;
+
+        $R			= isset($Format["R"]) ? $Format["R"] : 0;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+        $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+        $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+        $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+        $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+        $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
+        $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
+        $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
+        $AreaBorderR	= isset($Format["AreaBorderR"]) ? $Format["AreaBorderR"] : $AreaR;
+        $AreaBorderG	= isset($Format["AreaBorderG"]) ? $Format["AreaBorderG"] : $AreaG;
+        $AreaBorderB	= isset($Format["AreaBorderB"]) ? $Format["AreaBorderB"] : $AreaB;
+
+        $TextString   = $this->encode39($Value);
+
+        if ( $DrawArea )
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+        $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
+        $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
+
+        $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
+        $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
+
+        if ( $ShowLegend )
+        {
+            $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+            $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
         }
-       else
+        else
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
+            $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
+            $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
         }
 
-       $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
-       $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+        $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+        $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
 
-       $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
-       $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
-       $this->pChartObject->drawPolygon($Polygon,$Settings);
-      }
+        $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
+        $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
+        $this->pChartObject->drawPolygon($Polygon,$Settings);
+        }
 
-     for($i=1;$i<=strlen($this->Result);$i++)
-      {
-       if ( $this->mid($this->Result,$i,1) == 1 )
+        for($i=1;$i<=strlen($this->Result);$i++)
+        {
+        if ( $this->mid($this->Result,$i,1) == 1 )
         {
-         $X1 = $X + cos($Angle * PI / 180) * $i;
-         $Y1 = $Y + sin($Angle * PI / 180) * $i;
-         $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
-         $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
+            $X1 = $X + cos($Angle * PI / 180) * $i;
+            $Y1 = $Y + sin($Angle * PI / 180) * $i;
+            $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
+            $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
 
-         $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-         $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+            $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+            $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+        }
         }
-      }
 
-     if ( $ShowLegend )
-      {
-       $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
-       $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
+        if ( $ShowLegend )
+        {
+        $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
+        $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
 
-       $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
-       $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+        $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+        $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
 
-       $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
-       $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
-      }
+        $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
+        $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
+        }
     }
 
-   function checksum( $string )
+    function checksum( $string )
     {
-     $checksum = 0;
-     $length   = strlen( $string );
-     $charset  = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%';
+        $checksum = 0;
+        $length   = strlen( $string );
+        $charset  = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%';
 
-     for( $i=0; $i < $length; ++$i )
-      $checksum += strpos( $charset, $string[$i] );
+        for( $i=0; $i < $length; ++$i )
+        $checksum += strpos( $charset, $string[$i] );
  
-     return substr( $charset, ($checksum % 43), 1 );
+        return substr( $charset, ($checksum % 43), 1 );
     }
 
-   function left($value,$NbChar) { return substr($value,0,$NbChar); }  
-   function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
-   function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
-  }
+    function left($value,$NbChar) { return substr($value,0,$NbChar); }  
+    function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
+    function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
+    }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pIndicator.class.php

Indentation +175 added lines, -175 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pIndicator - class to draw indicators
 
      Version     : 2.1.3
@@ -13,229 +13,229 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("INDICATOR_CAPTION_DEFAULT"	, 700001);
- define("INDICATOR_CAPTION_EXTENDED"	, 700002);
+    define("INDICATOR_CAPTION_DEFAULT"	, 700001);
+    define("INDICATOR_CAPTION_EXTENDED"	, 700002);
 
- define("INDICATOR_CAPTION_INSIDE"	, 700011);
- define("INDICATOR_CAPTION_BOTTOM"	, 700012);
+    define("INDICATOR_CAPTION_INSIDE"	, 700011);
+    define("INDICATOR_CAPTION_BOTTOM"	, 700012);
 
- define("INDICATOR_VALUE_BUBBLE"	, 700021);
- define("INDICATOR_VALUE_LABEL"		, 700022);
+    define("INDICATOR_VALUE_BUBBLE"	, 700021);
+    define("INDICATOR_VALUE_LABEL"		, 700022);
 
- /* pIndicator class definition */
- class pIndicator
-  {
-   var $pChartObject;
+    /* pIndicator class definition */
+    class pIndicator
+    {
+    var $pChartObject;
 
-   /* Class creator */
-   function pIndicator($pChartObject)
+    /* Class creator */
+    function pIndicator($pChartObject)
     {
-     $this->pChartObject = $pChartObject;
+        $this->pChartObject = $pChartObject;
     }
 
-   /* Draw an indicator */
-   function draw($X,$Y,$Width,$Height,$Format="")
+    /* Draw an indicator */
+    function draw($X,$Y,$Width,$Height,$Format="")
     {
-     $Values			= isset($Format["Values"]) ? $Format["Values"] : VOID;
-     $IndicatorSections		= isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
-     $ValueDisplay		= isset($Format["ValueDisplay"]) ? $Format["ValueDisplay"] : INDICATOR_VALUE_BUBBLE;
-     $SectionsMargin		= isset($Format["SectionsMargin"]) ? $Format["SectionsMargin"] : 4;
-     $DrawLeftHead		= isset($Format["DrawLeftHead"]) ? $Format["DrawLeftHead"] : TRUE;
-     $DrawRightHead		= isset($Format["DrawRightHead"]) ? $Format["DrawRightHead"] : TRUE;
-     $HeadSize			= isset($Format["HeadSize"]) ? $Format["HeadSize"] : floor($Height/4);
-     $TextPadding		= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 4;
-     $CaptionLayout		= isset($Format["CaptionLayout"]) ? $Format["CaptionLayout"] : INDICATOR_CAPTION_EXTENDED;
-     $CaptionPosition		= isset($Format["CaptionPosition"]) ? $Format["CaptionPosition"] : INDICATOR_CAPTION_INSIDE;
-     $CaptionColorFactor	= isset($Format["CaptionColorFactor"]) ? $Format["CaptionColorFactor"] : NULL;
-     $CaptionR			= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
-     $CaptionG			= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
-     $CaptionB			= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
-     $CaptionAlpha		= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
-     $SubCaptionColorFactor	= isset($Format["SubCaptionColorFactor"]) ? $Format["SubCaptionColorFactor"] : NULL;
-     $SubCaptionR		= isset($Format["SubCaptionR"]) ? $Format["SubCaptionR"] : 50;
-     $SubCaptionG		= isset($Format["SubCaptionG"]) ? $Format["SubCaptionG"] : 50;
-     $SubCaptionB		= isset($Format["SubCaptionB"]) ? $Format["SubCaptionB"] : 50;
-     $SubCaptionAlpha		= isset($Format["SubCaptionAlpha"]) ? $Format["SubCaptionAlpha"] : 100;
-     $ValueFontName		= isset($Format["ValueFontName"]) ? $Format["ValueFontName"] : $this->pChartObject->FontName;
-     $ValueFontSize		= isset($Format["ValueFontSize"]) ? $Format["ValueFontSize"] : $this->pChartObject->FontSize;
-     $CaptionFontName		= isset($Format["CaptionFontName"]) ? $Format["CaptionFontName"] : $this->pChartObject->FontName;
-     $CaptionFontSize		= isset($Format["CaptionFontSize"]) ? $Format["CaptionFontSize"] : $this->pChartObject->FontSize;
-     $Unit			= isset($Format["Unit"]) ? $Format["Unit"] : "";
-
-     /* Convert the Values to display to an array if needed */
-     if ( !is_array($Values) ) { $Value = $Values; $Values = ""; $Values[] = $Value; }
-
-     /* No section, let's die */
-     if ( $IndicatorSections == NULL ) { return(0); }
-
-     /* Determine indicator visual configuration */
-     $OverallMin = $IndicatorSections[0]["End"]; $OverallMax = $IndicatorSections[0]["Start"];
-     foreach ($IndicatorSections as $Key => $Settings)
-      {
-       if ( $Settings["End"] > $OverallMax )   { $OverallMax = $Settings["End"]; }
-       if ( $Settings["Start"] < $OverallMin ) { $OverallMin = $Settings["Start"]; }
-      }
-     $RealWidth = $Width - (count($IndicatorSections)-1)*$SectionsMargin;
-     $XScale    = $RealWidth / ($OverallMax-$OverallMin);
-
-     $X1 = $X; $ValuesPos = "";
-     foreach ($IndicatorSections as $Key => $Settings)
-      {
-       $Color      = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]);
-       $Caption    = $Settings["Caption"];
-       $SubCaption = $Settings["Start"]." - ".$Settings["End"];
-
-       $X2 = $X1 + ($Settings["End"] - $Settings["Start"]) * $XScale;
-
-       if ( $Key == 0 && $DrawLeftHead )
+        $Values			= isset($Format["Values"]) ? $Format["Values"] : VOID;
+        $IndicatorSections		= isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
+        $ValueDisplay		= isset($Format["ValueDisplay"]) ? $Format["ValueDisplay"] : INDICATOR_VALUE_BUBBLE;
+        $SectionsMargin		= isset($Format["SectionsMargin"]) ? $Format["SectionsMargin"] : 4;
+        $DrawLeftHead		= isset($Format["DrawLeftHead"]) ? $Format["DrawLeftHead"] : TRUE;
+        $DrawRightHead		= isset($Format["DrawRightHead"]) ? $Format["DrawRightHead"] : TRUE;
+        $HeadSize			= isset($Format["HeadSize"]) ? $Format["HeadSize"] : floor($Height/4);
+        $TextPadding		= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 4;
+        $CaptionLayout		= isset($Format["CaptionLayout"]) ? $Format["CaptionLayout"] : INDICATOR_CAPTION_EXTENDED;
+        $CaptionPosition		= isset($Format["CaptionPosition"]) ? $Format["CaptionPosition"] : INDICATOR_CAPTION_INSIDE;
+        $CaptionColorFactor	= isset($Format["CaptionColorFactor"]) ? $Format["CaptionColorFactor"] : NULL;
+        $CaptionR			= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
+        $CaptionG			= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
+        $CaptionB			= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
+        $CaptionAlpha		= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
+        $SubCaptionColorFactor	= isset($Format["SubCaptionColorFactor"]) ? $Format["SubCaptionColorFactor"] : NULL;
+        $SubCaptionR		= isset($Format["SubCaptionR"]) ? $Format["SubCaptionR"] : 50;
+        $SubCaptionG		= isset($Format["SubCaptionG"]) ? $Format["SubCaptionG"] : 50;
+        $SubCaptionB		= isset($Format["SubCaptionB"]) ? $Format["SubCaptionB"] : 50;
+        $SubCaptionAlpha		= isset($Format["SubCaptionAlpha"]) ? $Format["SubCaptionAlpha"] : 100;
+        $ValueFontName		= isset($Format["ValueFontName"]) ? $Format["ValueFontName"] : $this->pChartObject->FontName;
+        $ValueFontSize		= isset($Format["ValueFontSize"]) ? $Format["ValueFontSize"] : $this->pChartObject->FontSize;
+        $CaptionFontName		= isset($Format["CaptionFontName"]) ? $Format["CaptionFontName"] : $this->pChartObject->FontName;
+        $CaptionFontSize		= isset($Format["CaptionFontSize"]) ? $Format["CaptionFontSize"] : $this->pChartObject->FontSize;
+        $Unit			= isset($Format["Unit"]) ? $Format["Unit"] : "";
+
+        /* Convert the Values to display to an array if needed */
+        if ( !is_array($Values) ) { $Value = $Values; $Values = ""; $Values[] = $Value; }
+
+        /* No section, let's die */
+        if ( $IndicatorSections == NULL ) { return(0); }
+
+        /* Determine indicator visual configuration */
+        $OverallMin = $IndicatorSections[0]["End"]; $OverallMax = $IndicatorSections[0]["Start"];
+        foreach ($IndicatorSections as $Key => $Settings)
+        {
+        if ( $Settings["End"] > $OverallMax )   { $OverallMax = $Settings["End"]; }
+        if ( $Settings["Start"] < $OverallMin ) { $OverallMin = $Settings["Start"]; }
+        }
+        $RealWidth = $Width - (count($IndicatorSections)-1)*$SectionsMargin;
+        $XScale    = $RealWidth / ($OverallMax-$OverallMin);
+
+        $X1 = $X; $ValuesPos = "";
+        foreach ($IndicatorSections as $Key => $Settings)
+        {
+        $Color      = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]);
+        $Caption    = $Settings["Caption"];
+        $SubCaption = $Settings["Start"]." - ".$Settings["End"];
+
+        $X2 = $X1 + ($Settings["End"] - $Settings["Start"]) * $XScale;
+
+        if ( $Key == 0 && $DrawLeftHead )
         {
-         $Poly = ""; $Poly[] = $X1-1; $Poly[] = $Y; $Poly[] = $X1-1; $Poly[] = $Y+$Height; $Poly[] = $X1-1-$HeadSize; $Poly[] = $Y+($Height/2);
-         $this->pChartObject->drawPolygon($Poly,$Color);
-         $this->pChartObject->drawLine($X1-2,$Y,$X1-2-$HeadSize,$Y+($Height/2),$Color);
-         $this->pChartObject->drawLine($X1-2,$Y+$Height,$X1-2-$HeadSize,$Y+($Height/2),$Color);
+            $Poly = ""; $Poly[] = $X1-1; $Poly[] = $Y; $Poly[] = $X1-1; $Poly[] = $Y+$Height; $Poly[] = $X1-1-$HeadSize; $Poly[] = $Y+($Height/2);
+            $this->pChartObject->drawPolygon($Poly,$Color);
+            $this->pChartObject->drawLine($X1-2,$Y,$X1-2-$HeadSize,$Y+($Height/2),$Color);
+            $this->pChartObject->drawLine($X1-2,$Y+$Height,$X1-2-$HeadSize,$Y+($Height/2),$Color);
         }
 
-       /* Determine the position of the breaks */
-       $Break = "";
-       foreach($Values as $iKey => $Value)
+        /* Determine the position of the breaks */
+        $Break = "";
+        foreach($Values as $iKey => $Value)
         {
-         if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
-          {
-           $XBreak  = $X1 + ($Value - $Settings["Start"]) * $XScale;
-           $ValuesPos[$Value] = $XBreak;
-           $Break[] = floor($XBreak);
-          }
+            if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
+            {
+            $XBreak  = $X1 + ($Value - $Settings["Start"]) * $XScale;
+            $ValuesPos[$Value] = $XBreak;
+            $Break[] = floor($XBreak);
+            }
         }
 
-       if ( $ValueDisplay == INDICATOR_VALUE_LABEL )
+        if ( $ValueDisplay == INDICATOR_VALUE_LABEL )
         {
-         if ( $Break == "" )
-          $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
-         else
-          {
-           sort($Break);
-           $Poly = ""; $Poly[] = $X1; $Poly[] = $Y; $LastPointWritten = FALSE;
-           foreach($Break as $iKey => $Value)
+            if ( $Break == "" )
+            $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
+            else
+            {
+            sort($Break);
+            $Poly = ""; $Poly[] = $X1; $Poly[] = $Y; $LastPointWritten = FALSE;
+            foreach($Break as $iKey => $Value)
             {
-             if ( $Value-5 >= $X1 )
-              { $Poly[] = $Value-5; $Poly[] = $Y; }
-             elseif ($X1 - ($Value-5) > 0 )
-              {
-               $Offset = $X1 - ($Value-5);
-               $Poly = ""; $Poly[] = $X1; $Poly[] = $Y + $Offset;
-              }
-
-             $Poly[] = $Value;   $Poly[] = $Y+5;
-
-             if ( $Value+5 <= $X2 )
-              { $Poly[] = $Value+5; $Poly[] = $Y; }
-             elseif (($Value+5) > $X2 )
-              {
-               $Offset = ($Value+5) - $X2;
-               $Poly[] = $X2; $Poly[] = $Y + $Offset;
-               $LastPointWritten = TRUE;
-              }
+                if ( $Value-5 >= $X1 )
+                { $Poly[] = $Value-5; $Poly[] = $Y; }
+                elseif ($X1 - ($Value-5) > 0 )
+                {
+                $Offset = $X1 - ($Value-5);
+                $Poly = ""; $Poly[] = $X1; $Poly[] = $Y + $Offset;
+                }
+
+                $Poly[] = $Value;   $Poly[] = $Y+5;
+
+                if ( $Value+5 <= $X2 )
+                { $Poly[] = $Value+5; $Poly[] = $Y; }
+                elseif (($Value+5) > $X2 )
+                {
+                $Offset = ($Value+5) - $X2;
+                $Poly[] = $X2; $Poly[] = $Y + $Offset;
+                $LastPointWritten = TRUE;
+                }
 
             }
-           if ( !$LastPointWritten ) { $Poly[] = $X2; $Poly[] = $Y; }
-           $Poly[] = $X2; $Poly[] = $Y+$Height;
-           $Poly[] = $X1; $Poly[] = $Y+$Height;
+            if ( !$LastPointWritten ) { $Poly[] = $X2; $Poly[] = $Y; }
+            $Poly[] = $X2; $Poly[] = $Y+$Height;
+            $Poly[] = $X1; $Poly[] = $Y+$Height;
 
-           $this->pChartObject->drawPolygon($Poly,$Color);
-          }
+            $this->pChartObject->drawPolygon($Poly,$Color);
+            }
         }
-       else
+        else
         $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
 
-       if ( $Key == count($IndicatorSections)-1 && $DrawRightHead )
+        if ( $Key == count($IndicatorSections)-1 && $DrawRightHead )
         {
-         $Poly = ""; $Poly[] = $X2+1; $Poly[] = $Y; $Poly[] = $X2+1; $Poly[] = $Y+$Height; $Poly[] = $X2+1+$HeadSize; $Poly[] = $Y+($Height/2);
-         $this->pChartObject->drawPolygon($Poly,$Color);
-         $this->pChartObject->drawLine($X2+1,$Y,$X2+1+$HeadSize,$Y+($Height/2),$Color);
-         $this->pChartObject->drawLine($X2+1,$Y+$Height,$X2+1+$HeadSize,$Y+($Height/2),$Color);
+            $Poly = ""; $Poly[] = $X2+1; $Poly[] = $Y; $Poly[] = $X2+1; $Poly[] = $Y+$Height; $Poly[] = $X2+1+$HeadSize; $Poly[] = $Y+($Height/2);
+            $this->pChartObject->drawPolygon($Poly,$Color);
+            $this->pChartObject->drawLine($X2+1,$Y,$X2+1+$HeadSize,$Y+($Height/2),$Color);
+            $this->pChartObject->drawLine($X2+1,$Y+$Height,$X2+1+$HeadSize,$Y+($Height/2),$Color);
         }
 
-       if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE )
+        if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE )
         {
-         $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
-         $YOffset = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding;
+            $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
+            $YOffset = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding;
 
-         if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
-          {
-           $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$SubCaption);
-           $YOffset = $YOffset + ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding*2;
-          }
+            if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
+            {
+            $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$SubCaption);
+            $YOffset = $YOffset + ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding*2;
+            }
 
-         $XOffset = $TextPadding;
+            $XOffset = $TextPadding;
         }
-       else
+        else
         { $YOffset = 0; $XOffset = 0; }
 
-       if ( $CaptionColorFactor == NULL )
+        if ( $CaptionColorFactor == NULL )
         { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha); }
-       else
+        else
         { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$CaptionColorFactor,"G"=>$Settings["G"]+$CaptionColorFactor,"B"=>$Settings["B"]+$CaptionColorFactor); }
 
-       if ( $SubCaptionColorFactor == NULL )
+        if ( $SubCaptionColorFactor == NULL )
         $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$SubCaptionR,"G"=>$SubCaptionG,"B"=>$SubCaptionB,"Alpha"=>$SubCaptionAlpha);
-       else
+        else
         $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$SubCaptionColorFactor,"G"=>$Settings["G"]+$SubCaptionColorFactor,"B"=>$Settings["B"]+$SubCaptionColorFactor);
 
-       $RestoreShadow = $this->pChartObject->Shadow;
-       $this->pChartObject->Shadow = FALSE;
+        $RestoreShadow = $this->pChartObject->Shadow;
+        $this->pChartObject->Shadow = FALSE;
 
-       if ( $CaptionLayout == INDICATOR_CAPTION_DEFAULT )
+        if ( $CaptionLayout == INDICATOR_CAPTION_DEFAULT )
         $this->pChartObject->drawText($X1,$Y+$Height+$TextPadding,$Caption,$CaptionColor);
-       elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
+        elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
         {
-         $TxtPos        = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
-         $CaptionHeight = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
+            $TxtPos        = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
+            $CaptionHeight = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
 
-         $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$TextPadding,$Caption,$CaptionColor);
-         $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$CaptionHeight+$TextPadding*2,$SubCaption,$SubCaptionColor);
+            $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$TextPadding,$Caption,$CaptionColor);
+            $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$CaptionHeight+$TextPadding*2,$SubCaption,$SubCaptionColor);
         }
 
-       $this->pChartObject->Shadow = $RestoreShadow;
+        $this->pChartObject->Shadow = $RestoreShadow;
 
-       $X1 = $X2 + $SectionsMargin;
-      }
+        $X1 = $X2 + $SectionsMargin;
+        }
 
-     $RestoreShadow = $this->pChartObject->Shadow;
-     $this->pChartObject->Shadow = FALSE;
+        $RestoreShadow = $this->pChartObject->Shadow;
+        $this->pChartObject->Shadow = FALSE;
 
-     foreach($Values as $Key => $Value)
-      {
-       if ( $Value >= $OverallMin && $Value <= $OverallMax )
+        foreach($Values as $Key => $Value)
+        {
+        if ( $Value >= $OverallMin && $Value <= $OverallMax )
         {
-         foreach ($IndicatorSections as $Key => $Settings)
-          {
-           if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
+            foreach ($IndicatorSections as $Key => $Settings)
             {
-             $X1 = $ValuesPos[$Value]; //$X + $Key*$SectionsMargin + ($Value - $OverallMin) * $XScale;
-
-             if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE )
-              {
-               $TxtPos = $this->pChartObject->getTextBox($X1,$Y,$ValueFontName,$ValueFontSize,0,$Value.$Unit);
-               $Radius = floor(($TxtPos[1]["X"] - $TxtPos[0]["X"] + $TextPadding*4)/2);
-
-               $this->pChartObject->drawFilledCircle($X1,$Y,$Radius+4,array("R"=>$Settings["R"]+20,"G"=>$Settings["G"]+20,"B"=>$Settings["B"]+20));
-               $this->pChartObject->drawFilledCircle($X1,$Y,$Radius,array("R"=>255,"G"=>255,"B"=>255));
-
-               $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontName"=>$ValueFontName,"FontSize"=>$ValueFontSize);
-               $this->pChartObject->drawText($X1-1,$Y-1,$Value.$Unit,$TextSettings);
-              }
-             elseif( $ValueDisplay == INDICATOR_VALUE_LABEL )
-              {
-               $Caption = "";
-               $Caption[] = array("Format"=>array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>100),"Caption"=>$Value.$Unit);
-               $this->pChartObject->drawLabelBox(floor($X1),floor($Y)+2,"Value - ".$Settings["Caption"],$Caption);
-              }
+            if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
+            {
+                $X1 = $ValuesPos[$Value]; //$X + $Key*$SectionsMargin + ($Value - $OverallMin) * $XScale;
+
+                if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE )
+                {
+                $TxtPos = $this->pChartObject->getTextBox($X1,$Y,$ValueFontName,$ValueFontSize,0,$Value.$Unit);
+                $Radius = floor(($TxtPos[1]["X"] - $TxtPos[0]["X"] + $TextPadding*4)/2);
+
+                $this->pChartObject->drawFilledCircle($X1,$Y,$Radius+4,array("R"=>$Settings["R"]+20,"G"=>$Settings["G"]+20,"B"=>$Settings["B"]+20));
+                $this->pChartObject->drawFilledCircle($X1,$Y,$Radius,array("R"=>255,"G"=>255,"B"=>255));
+
+                $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontName"=>$ValueFontName,"FontSize"=>$ValueFontSize);
+                $this->pChartObject->drawText($X1-1,$Y-1,$Value.$Unit,$TextSettings);
+                }
+                elseif( $ValueDisplay == INDICATOR_VALUE_LABEL )
+                {
+                $Caption = "";
+                $Caption[] = array("Format"=>array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>100),"Caption"=>$Value.$Unit);
+                $this->pChartObject->drawLabelBox(floor($X1),floor($Y)+2,"Value - ".$Settings["Caption"],$Caption);
+                }
+            }
+            $X1 = $X2 + $SectionsMargin;
             }
-           $X1 = $X2 + $SectionsMargin;
-          }
         }
-      }
-     $this->pChartObject->Shadow = $RestoreShadow;
+        }
+        $this->pChartObject->Shadow = $RestoreShadow;
+    }
     }
-  }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pSpring.class.php

Indentation +665 added lines, -665 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pSpring - class to draw spring graphs
 
      Version     : 2.1.3
@@ -13,856 +13,856 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("NODE_TYPE_FREE"	, 690001);
- define("NODE_TYPE_CENTRAL"	, 690002);
-
- define("NODE_SHAPE_CIRCLE"	, 690011);
- define("NODE_SHAPE_TRIANGLE"	, 690012);
- define("NODE_SHAPE_SQUARE"	, 690013);
-
- define("ALGORITHM_RANDOM"	, 690021);
- define("ALGORITHM_WEIGHTED"	, 690022);
- define("ALGORITHM_CIRCULAR"	, 690023);
- define("ALGORITHM_CENTRAL"	, 690024);
-
- define("LABEL_CLASSIC"		, 690031);
- define("LABEL_LIGHT"		, 690032);
-
- /* pSpring class definition */
- class pSpring
-  {
-   var $History;
-   var $pChartObject;
-   var $Data;
-   var $Links;
-   var $X1;
-   var $Y1;
-   var $X2;
-   var $Y2;
-   var $AutoComputeFreeZone;
-   var $Labels;
-
-   /* Class creator */
-   function pSpring()
+    define("NODE_TYPE_FREE"	, 690001);
+    define("NODE_TYPE_CENTRAL"	, 690002);
+
+    define("NODE_SHAPE_CIRCLE"	, 690011);
+    define("NODE_SHAPE_TRIANGLE"	, 690012);
+    define("NODE_SHAPE_SQUARE"	, 690013);
+
+    define("ALGORITHM_RANDOM"	, 690021);
+    define("ALGORITHM_WEIGHTED"	, 690022);
+    define("ALGORITHM_CIRCULAR"	, 690023);
+    define("ALGORITHM_CENTRAL"	, 690024);
+
+    define("LABEL_CLASSIC"		, 690031);
+    define("LABEL_LIGHT"		, 690032);
+
+    /* pSpring class definition */
+    class pSpring
     {
-     /* Initialise data arrays */
-     $this->Data = "";
-     $this->Links = "";
-
-     /* Set nodes defaults */
-     $this->Default["R"]		= 255;
-     $this->Default["G"]		= 255;
-     $this->Default["B"]		= 255;
-     $this->Default["Alpha"]		= 100;
-     $this->Default["BorderR"]		= 0;
-     $this->Default["BorderG"]		= 0;
-     $this->Default["BorderB"]		= 0;
-     $this->Default["BorderAlpha"]	= 100;
-     $this->Default["Surrounding"]	= NULL;
-     $this->Default["BackgroundR"]	= 255;
-     $this->Default["BackgroundG"]	= 255;
-     $this->Default["BackgroundB"]	= 255;
-     $this->Default["BackgroundAlpha"]	= 0;
-     $this->Default["Force"]		= 1;
-     $this->Default["NodeType"]		= NODE_TYPE_FREE;
-     $this->Default["Size"]		= 5;
-     $this->Default["Shape"]		= NODE_SHAPE_CIRCLE;
-     $this->Default["FreeZone"]		= 40;
-     $this->Default["LinkR"]		= 0;
-     $this->Default["LinkG"]		= 0;
-     $this->Default["LinkB"]		= 0;
-     $this->Default["LinkAlpha"]	= 0;
-
-     $this->Labels["Type"]		= LABEL_CLASSIC;
-     $this->Labels["R"]			= 0;
-     $this->Labels["G"]			= 0;
-     $this->Labels["B"]			= 0;
-     $this->Labels["Alpha"]		= 100;
-
-     $this->AutoComputeFreeZone         = FALSE;
+    var $History;
+    var $pChartObject;
+    var $Data;
+    var $Links;
+    var $X1;
+    var $Y1;
+    var $X2;
+    var $Y2;
+    var $AutoComputeFreeZone;
+    var $Labels;
+
+    /* Class creator */
+    function pSpring()
+    {
+        /* Initialise data arrays */
+        $this->Data = "";
+        $this->Links = "";
+
+        /* Set nodes defaults */
+        $this->Default["R"]		= 255;
+        $this->Default["G"]		= 255;
+        $this->Default["B"]		= 255;
+        $this->Default["Alpha"]		= 100;
+        $this->Default["BorderR"]		= 0;
+        $this->Default["BorderG"]		= 0;
+        $this->Default["BorderB"]		= 0;
+        $this->Default["BorderAlpha"]	= 100;
+        $this->Default["Surrounding"]	= NULL;
+        $this->Default["BackgroundR"]	= 255;
+        $this->Default["BackgroundG"]	= 255;
+        $this->Default["BackgroundB"]	= 255;
+        $this->Default["BackgroundAlpha"]	= 0;
+        $this->Default["Force"]		= 1;
+        $this->Default["NodeType"]		= NODE_TYPE_FREE;
+        $this->Default["Size"]		= 5;
+        $this->Default["Shape"]		= NODE_SHAPE_CIRCLE;
+        $this->Default["FreeZone"]		= 40;
+        $this->Default["LinkR"]		= 0;
+        $this->Default["LinkG"]		= 0;
+        $this->Default["LinkB"]		= 0;
+        $this->Default["LinkAlpha"]	= 0;
+
+        $this->Labels["Type"]		= LABEL_CLASSIC;
+        $this->Labels["R"]			= 0;
+        $this->Labels["G"]			= 0;
+        $this->Labels["B"]			= 0;
+        $this->Labels["Alpha"]		= 100;
+
+        $this->AutoComputeFreeZone         = FALSE;
     }
 
-   /* Set default links options */
-   function setLinkDefaults($Settings="")
+    /* Set default links options */
+    function setLinkDefaults($Settings="")
     {
-     if ( isset($Settings["R"]) )     { $this->Default["LinkR"] = $Settings["R"]; }
-     if ( isset($Settings["G"]) )     { $this->Default["LinkG"] = $Settings["G"]; }
-     if ( isset($Settings["B"]) )     { $this->Default["LinkB"] = $Settings["B"]; }
-     if ( isset($Settings["Alpha"]) ) { $this->Default["LinkAlpha"] = $Settings["Alpha"]; }
+        if ( isset($Settings["R"]) )     { $this->Default["LinkR"] = $Settings["R"]; }
+        if ( isset($Settings["G"]) )     { $this->Default["LinkG"] = $Settings["G"]; }
+        if ( isset($Settings["B"]) )     { $this->Default["LinkB"] = $Settings["B"]; }
+        if ( isset($Settings["Alpha"]) ) { $this->Default["LinkAlpha"] = $Settings["Alpha"]; }
     }
 
-   /* Set default links options */
-   function setLabelsSettings($Settings="")
+    /* Set default links options */
+    function setLabelsSettings($Settings="")
     {
-     if ( isset($Settings["Type"]) )  { $this->Labels["Type"] = $Settings["Type"]; }
-     if ( isset($Settings["R"]) )     { $this->Labels["R"] = $Settings["R"]; }
-     if ( isset($Settings["G"]) )     { $this->Labels["G"] = $Settings["G"]; }
-     if ( isset($Settings["B"]) )     { $this->Labels["B"] = $Settings["B"]; }
-     if ( isset($Settings["Alpha"]) ) { $this->Labels["Alpha"] = $Settings["Alpha"]; }
+        if ( isset($Settings["Type"]) )  { $this->Labels["Type"] = $Settings["Type"]; }
+        if ( isset($Settings["R"]) )     { $this->Labels["R"] = $Settings["R"]; }
+        if ( isset($Settings["G"]) )     { $this->Labels["G"] = $Settings["G"]; }
+        if ( isset($Settings["B"]) )     { $this->Labels["B"] = $Settings["B"]; }
+        if ( isset($Settings["Alpha"]) ) { $this->Labels["Alpha"] = $Settings["Alpha"]; }
     }
 
-   /* Auto compute the FreeZone size based on the number of connections */
-   function autoFreeZone()
+    /* Auto compute the FreeZone size based on the number of connections */
+    function autoFreeZone()
     {
-     /* Check connections reciprocity */
-     foreach($this->Data as $Key => $Settings)
-      {
-       if ( isset($Settings["Connections"]) )
+        /* Check connections reciprocity */
+        foreach($this->Data as $Key => $Settings)
+        {
+        if ( isset($Settings["Connections"]) )
         { $this->Data[$Key]["FreeZone"] = count($Settings["Connections"])*10 + 20; }
-       else
+        else
         { $this->Data[$Key]["FreeZone"] = 20; }
-      }
+        }
 
     }
 
-   /* Set link properties */
-   function linkProperties($FromNode,$ToNode,$Settings)
+    /* Set link properties */
+    function linkProperties($FromNode,$ToNode,$Settings)
     {
-     if ( !isset($this->Data[$FromNode]) ) { return(0); }
-     if ( !isset($this->Data[$ToNode]) )   { return(0); }
-
-     $R			= isset($Settings["R"]) ? $Settings["R"] : 0;
-     $G			= isset($Settings["G"]) ? $Settings["G"] : 0;
-     $B			= isset($Settings["B"]) ? $Settings["B"] : 0;
-     $Alpha		= isset($Settings["Alpha"]) ? $Settings["Alpha"] : 100;
-     $Name		= isset($Settings["Name"]) ? $Settings["Name"] : NULL;
-     $Ticks		= isset($Settings["Ticks"]) ? $Settings["Ticks"] : NULL;
-
-     $this->Links[$FromNode][$ToNode]["R"] = $R;         $this->Links[$ToNode][$FromNode]["R"] = $R;
-     $this->Links[$FromNode][$ToNode]["G"] = $G;         $this->Links[$ToNode][$FromNode]["G"] = $G;
-     $this->Links[$FromNode][$ToNode]["B"] = $B;         $this->Links[$ToNode][$FromNode]["B"] = $B;
-     $this->Links[$FromNode][$ToNode]["Alpha"] = $Alpha; $this->Links[$ToNode][$FromNode]["Alpha"] = $Alpha;
-     $this->Links[$FromNode][$ToNode]["Name"] = $Name;   $this->Links[$ToNode][$FromNode]["Name"] = $Name;
-     $this->Links[$FromNode][$ToNode]["Ticks"] = $Ticks; $this->Links[$ToNode][$FromNode]["Ticks"] = $Ticks;
+        if ( !isset($this->Data[$FromNode]) ) { return(0); }
+        if ( !isset($this->Data[$ToNode]) )   { return(0); }
+
+        $R			= isset($Settings["R"]) ? $Settings["R"] : 0;
+        $G			= isset($Settings["G"]) ? $Settings["G"] : 0;
+        $B			= isset($Settings["B"]) ? $Settings["B"] : 0;
+        $Alpha		= isset($Settings["Alpha"]) ? $Settings["Alpha"] : 100;
+        $Name		= isset($Settings["Name"]) ? $Settings["Name"] : NULL;
+        $Ticks		= isset($Settings["Ticks"]) ? $Settings["Ticks"] : NULL;
+
+        $this->Links[$FromNode][$ToNode]["R"] = $R;         $this->Links[$ToNode][$FromNode]["R"] = $R;
+        $this->Links[$FromNode][$ToNode]["G"] = $G;         $this->Links[$ToNode][$FromNode]["G"] = $G;
+        $this->Links[$FromNode][$ToNode]["B"] = $B;         $this->Links[$ToNode][$FromNode]["B"] = $B;
+        $this->Links[$FromNode][$ToNode]["Alpha"] = $Alpha; $this->Links[$ToNode][$FromNode]["Alpha"] = $Alpha;
+        $this->Links[$FromNode][$ToNode]["Name"] = $Name;   $this->Links[$ToNode][$FromNode]["Name"] = $Name;
+        $this->Links[$FromNode][$ToNode]["Ticks"] = $Ticks; $this->Links[$ToNode][$FromNode]["Ticks"] = $Ticks;
     }
 
-   function setNodeDefaults($Settings="")
+    function setNodeDefaults($Settings="")
     {
-     if ( isset($Settings["R"]) ) { $this->Default["R"]					= $Settings["R"]; }
-     if ( isset($Settings["G"]) ) { $this->Default["G"]					= $Settings["G"]; }
-     if ( isset($Settings["B"]) ) { $this->Default["B"]					= $Settings["B"]; }
-     if ( isset($Settings["Alpha"]) ) { $this->Default["Alpha"]				= $Settings["Alpha"]; }
-     if ( isset($Settings["BorderR"]) ) { $this->Default["BorderR"]			= $Settings["BorderR"]; }
-     if ( isset($Settings["BorderG"]) ) { $this->Default["BorderG"]			= $Settings["BorderG"]; }
-     if ( isset($Settings["BorderB"]) ) { $this->Default["BorderB"]			= $Settings["BorderB"]; }
-     if ( isset($Settings["BorderAlpha"]) ) { $this->Default["BorderAlpha"]		= $Settings["BorderAlpha"]; }
-     if ( isset($Settings["Surrounding"]) ) { $this->Default["Surrounding"]		= $Settings["Surrounding"]; }
-     if ( isset($Settings["BackgroundR"]) ) { $this->Default["BackgroundR"]		= $Settings["BackgroundR"]; }
-     if ( isset($Settings["BackgroundG"]) ) { $this->Default["BackgroundG"]		= $Settings["BackgroundG"]; }
-     if ( isset($Settings["BackgroundB"]) ) { $this->Default["BackgroundB"]		= $Settings["BackgroundB"]; }
-     if ( isset($Settings["BackgroundAlpha"]) ) { $this->Default["BackgroundAlpha"]	= $Settings["BackgroundAlpha"]; }
-     if ( isset($Settings["NodeType"]) ) { $this->Default["NodeType"]			= $Settings["NodeType"]; }
-     if ( isset($Settings["Size"]) ) { $this->Default["Size"]				= $Settings["Size"]; }
-     if ( isset($Settings["Shape"]) ) { $this->Default["Shape"]				= $Settings["Shape"]; }
-     if ( isset($Settings["FreeZone"]) ) { $this->Default["FreeZone"]			= $Settings["FreeZone"]; }
+        if ( isset($Settings["R"]) ) { $this->Default["R"]					= $Settings["R"]; }
+        if ( isset($Settings["G"]) ) { $this->Default["G"]					= $Settings["G"]; }
+        if ( isset($Settings["B"]) ) { $this->Default["B"]					= $Settings["B"]; }
+        if ( isset($Settings["Alpha"]) ) { $this->Default["Alpha"]				= $Settings["Alpha"]; }
+        if ( isset($Settings["BorderR"]) ) { $this->Default["BorderR"]			= $Settings["BorderR"]; }
+        if ( isset($Settings["BorderG"]) ) { $this->Default["BorderG"]			= $Settings["BorderG"]; }
+        if ( isset($Settings["BorderB"]) ) { $this->Default["BorderB"]			= $Settings["BorderB"]; }
+        if ( isset($Settings["BorderAlpha"]) ) { $this->Default["BorderAlpha"]		= $Settings["BorderAlpha"]; }
+        if ( isset($Settings["Surrounding"]) ) { $this->Default["Surrounding"]		= $Settings["Surrounding"]; }
+        if ( isset($Settings["BackgroundR"]) ) { $this->Default["BackgroundR"]		= $Settings["BackgroundR"]; }
+        if ( isset($Settings["BackgroundG"]) ) { $this->Default["BackgroundG"]		= $Settings["BackgroundG"]; }
+        if ( isset($Settings["BackgroundB"]) ) { $this->Default["BackgroundB"]		= $Settings["BackgroundB"]; }
+        if ( isset($Settings["BackgroundAlpha"]) ) { $this->Default["BackgroundAlpha"]	= $Settings["BackgroundAlpha"]; }
+        if ( isset($Settings["NodeType"]) ) { $this->Default["NodeType"]			= $Settings["NodeType"]; }
+        if ( isset($Settings["Size"]) ) { $this->Default["Size"]				= $Settings["Size"]; }
+        if ( isset($Settings["Shape"]) ) { $this->Default["Shape"]				= $Settings["Shape"]; }
+        if ( isset($Settings["FreeZone"]) ) { $this->Default["FreeZone"]			= $Settings["FreeZone"]; }
     }
 
-   /* Add a node */
-   function addNode($NodeID,$Settings="")
+    /* Add a node */
+    function addNode($NodeID,$Settings="")
     {
-     /* if the node already exists, ignore */
-     if (isset($this->Data[$NodeID])) { return(0); }
-
-     $Name		= isset($Settings["Name"]) ? $Settings["Name"] : "Node ".$NodeID;
-     $Connections	= isset($Settings["Connections"]) ? $Settings["Connections"] : NULL;
-
-     $R			= isset($Settings["R"]) ? $Settings["R"] : $this->Default["R"];
-     $G			= isset($Settings["G"]) ? $Settings["G"] : $this->Default["G"];
-     $B			= isset($Settings["B"]) ? $Settings["B"] : $this->Default["B"];
-     $Alpha		= isset($Settings["Alpha"]) ? $Settings["Alpha"] : $this->Default["Alpha"];
-     $BorderR		= isset($Settings["BorderR"]) ? $Settings["BorderR"] : $this->Default["BorderR"];
-     $BorderG		= isset($Settings["BorderG"]) ? $Settings["BorderG"] : $this->Default["BorderG"];
-     $BorderB		= isset($Settings["BorderB"]) ? $Settings["BorderB"] : $this->Default["BorderB"];
-     $BorderAlpha	= isset($Settings["BorderAlpha"]) ? $Settings["BorderAlpha"] : $this->Default["BorderAlpha"];
-     $Surrounding	= isset($Settings["Surrounding"]) ? $Settings["Surrounding"] : $this->Default["Surrounding"];
-     $BackgroundR	= isset($Settings["BackgroundR"]) ? $Settings["BackgroundR"] : $this->Default["BackgroundR"];
-     $BackgroundG	= isset($Settings["BackgroundG"]) ? $Settings["BackgroundG"] : $this->Default["BackgroundG"];
-     $BackgroundB	= isset($Settings["BackgroundB"]) ? $Settings["BackgroundB"] : $this->Default["BackgroundB"];
-     $BackgroundAlpha	= isset($Settings["BackgroundAlpha"]) ? $Settings["BackgroundAlpha"] : $this->Default["BackgroundAlpha"];
-     $Force		= isset($Settings["Force"]) ? $Settings["Force"] :  $this->Default["Force"];
-     $NodeType		= isset($Settings["NodeType"]) ? $Settings["NodeType"] : $this->Default["NodeType"];
-     $Size		= isset($Settings["Size"]) ? $Settings["Size"] : $this->Default["Size"];
-     $Shape		= isset($Settings["Shape"]) ? $Settings["Shape"] : $this->Default["Shape"];
-     $FreeZone		= isset($Settings["FreeZone"]) ? $Settings["FreeZone"] : $this->Default["FreeZone"];
-
-     if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
-
-     $this->Data[$NodeID]["R"] = $R; $this->Data[$NodeID]["G"] = $G; $this->Data[$NodeID]["B"] = $B; $this->Data[$NodeID]["Alpha"] = $Alpha;
-     $this->Data[$NodeID]["BorderR"] = $BorderR; $this->Data[$NodeID]["BorderG"] = $BorderG; $this->Data[$NodeID]["BorderB"] = $BorderB; $this->Data[$NodeID]["BorderAlpha"] = $BorderAlpha;
-     $this->Data[$NodeID]["BackgroundR"]	= $BackgroundR; $this->Data[$NodeID]["BackgroundG"] = $BackgroundG; $this->Data[$NodeID]["BackgroundB"] = $BackgroundB; $this->Data[$NodeID]["BackgroundAlpha"] = $BackgroundAlpha;
-     $this->Data[$NodeID]["Name"]		= $Name;
-     $this->Data[$NodeID]["Force"]		= $Force;
-     $this->Data[$NodeID]["Type"]		= $NodeType;
-     $this->Data[$NodeID]["Size"]		= $Size;
-     $this->Data[$NodeID]["Shape"]		= $Shape;
-     $this->Data[$NodeID]["FreeZone"]		= $FreeZone;
-     if ( $Connections != NULL )
-      {
-       if ( is_array($Connections ) )
-        {
-         foreach($Connections as $Key => $Value)
-          $this->Data[$NodeID]["Connections"][] = $Value;
-        }
-       else
+        /* if the node already exists, ignore */
+        if (isset($this->Data[$NodeID])) { return(0); }
+
+        $Name		= isset($Settings["Name"]) ? $Settings["Name"] : "Node ".$NodeID;
+        $Connections	= isset($Settings["Connections"]) ? $Settings["Connections"] : NULL;
+
+        $R			= isset($Settings["R"]) ? $Settings["R"] : $this->Default["R"];
+        $G			= isset($Settings["G"]) ? $Settings["G"] : $this->Default["G"];
+        $B			= isset($Settings["B"]) ? $Settings["B"] : $this->Default["B"];
+        $Alpha		= isset($Settings["Alpha"]) ? $Settings["Alpha"] : $this->Default["Alpha"];
+        $BorderR		= isset($Settings["BorderR"]) ? $Settings["BorderR"] : $this->Default["BorderR"];
+        $BorderG		= isset($Settings["BorderG"]) ? $Settings["BorderG"] : $this->Default["BorderG"];
+        $BorderB		= isset($Settings["BorderB"]) ? $Settings["BorderB"] : $this->Default["BorderB"];
+        $BorderAlpha	= isset($Settings["BorderAlpha"]) ? $Settings["BorderAlpha"] : $this->Default["BorderAlpha"];
+        $Surrounding	= isset($Settings["Surrounding"]) ? $Settings["Surrounding"] : $this->Default["Surrounding"];
+        $BackgroundR	= isset($Settings["BackgroundR"]) ? $Settings["BackgroundR"] : $this->Default["BackgroundR"];
+        $BackgroundG	= isset($Settings["BackgroundG"]) ? $Settings["BackgroundG"] : $this->Default["BackgroundG"];
+        $BackgroundB	= isset($Settings["BackgroundB"]) ? $Settings["BackgroundB"] : $this->Default["BackgroundB"];
+        $BackgroundAlpha	= isset($Settings["BackgroundAlpha"]) ? $Settings["BackgroundAlpha"] : $this->Default["BackgroundAlpha"];
+        $Force		= isset($Settings["Force"]) ? $Settings["Force"] :  $this->Default["Force"];
+        $NodeType		= isset($Settings["NodeType"]) ? $Settings["NodeType"] : $this->Default["NodeType"];
+        $Size		= isset($Settings["Size"]) ? $Settings["Size"] : $this->Default["Size"];
+        $Shape		= isset($Settings["Shape"]) ? $Settings["Shape"] : $this->Default["Shape"];
+        $FreeZone		= isset($Settings["FreeZone"]) ? $Settings["FreeZone"] : $this->Default["FreeZone"];
+
+        if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+
+        $this->Data[$NodeID]["R"] = $R; $this->Data[$NodeID]["G"] = $G; $this->Data[$NodeID]["B"] = $B; $this->Data[$NodeID]["Alpha"] = $Alpha;
+        $this->Data[$NodeID]["BorderR"] = $BorderR; $this->Data[$NodeID]["BorderG"] = $BorderG; $this->Data[$NodeID]["BorderB"] = $BorderB; $this->Data[$NodeID]["BorderAlpha"] = $BorderAlpha;
+        $this->Data[$NodeID]["BackgroundR"]	= $BackgroundR; $this->Data[$NodeID]["BackgroundG"] = $BackgroundG; $this->Data[$NodeID]["BackgroundB"] = $BackgroundB; $this->Data[$NodeID]["BackgroundAlpha"] = $BackgroundAlpha;
+        $this->Data[$NodeID]["Name"]		= $Name;
+        $this->Data[$NodeID]["Force"]		= $Force;
+        $this->Data[$NodeID]["Type"]		= $NodeType;
+        $this->Data[$NodeID]["Size"]		= $Size;
+        $this->Data[$NodeID]["Shape"]		= $Shape;
+        $this->Data[$NodeID]["FreeZone"]		= $FreeZone;
+        if ( $Connections != NULL )
+        {
+        if ( is_array($Connections ) )
+        {
+            foreach($Connections as $Key => $Value)
+            $this->Data[$NodeID]["Connections"][] = $Value;
+        }
+        else
         $this->Data[$NodeID]["Connections"][] = $Connections;
-      }
+        }
     }
 
-   /* Set color attribute for a list of nodes */
-   function setNodesColor($Nodes,$Settings="")
+    /* Set color attribute for a list of nodes */
+    function setNodesColor($Nodes,$Settings="")
     {
-     if ( is_array($Nodes) )
-      {
-       foreach ($Nodes as $Key => $NodeID)
-        {
-         if (isset($this->Data[$NodeID]) )
-          {
-           if ( isset($Settings["R"]) ) { $this->Data[$NodeID]["R"] = $Settings["R"]; }
-           if ( isset($Settings["G"]) ) { $this->Data[$NodeID]["G"] = $Settings["G"]; }
-           if ( isset($Settings["B"]) ) { $this->Data[$NodeID]["B"] = $Settings["B"]; }
-           if ( isset($Settings["Alpha"]) ) { $this->Data[$NodeID]["Alpha"] = $Settings["Alpha"]; }
-           if ( isset($Settings["BorderR"]) ) { $this->Data[$NodeID]["BorderR"] = $Settings["BorderR"]; }
-           if ( isset($Settings["BorderG"]) ) { $this->Data[$NodeID]["BorderG"] = $Settings["BorderG"]; }
-           if ( isset($Settings["BorderB"]) ) { $this->Data[$NodeID]["BorderB"] = $Settings["BorderB"]; }
-           if ( isset($Settings["BorderAlpha"]) ) { $this->Data[$NodeID]["BorderAlpha"] = $Settings["BorderAlpha"]; }
-           if ( isset($Settings["Surrounding"]) ) { $this->Data[$NodeID]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
-          }
-        }
-      }
-     else
-      {
-       if ( isset($Settings["R"]) ) { $this->Data[$Nodes]["R"] = $Settings["R"]; }
-       if ( isset($Settings["G"]) ) { $this->Data[$Nodes]["G"] = $Settings["G"]; }
-       if ( isset($Settings["B"]) ) { $this->Data[$Nodes]["B"] = $Settings["B"]; }
-       if ( isset($Settings["Alpha"]) ) { $this->Data[$Nodes]["Alpha"] = $Settings["Alpha"]; }
-       if ( isset($Settings["BorderR"]) ) { $this->Data[$Nodes]["BorderR"] = $Settings["BorderR"]; }
-       if ( isset($Settings["BorderG"]) ) { $this->Data[$Nodes]["BorderG"] = $Settings["BorderG"]; }
-       if ( isset($Settings["BorderB"]) ) { $this->Data[$Nodes]["BorderB"] = $Settings["BorderB"]; }
-       if ( isset($Settings["BorderAlpha"]) ) { $this->Data[$Nodes]["BorderAlpha"] = $Settings["BorderAlpha"]; }
-       if ( isset($Settings["Surrounding"]) ) { $this->Data[$Nodes]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
-      }
+        if ( is_array($Nodes) )
+        {
+        foreach ($Nodes as $Key => $NodeID)
+        {
+            if (isset($this->Data[$NodeID]) )
+            {
+            if ( isset($Settings["R"]) ) { $this->Data[$NodeID]["R"] = $Settings["R"]; }
+            if ( isset($Settings["G"]) ) { $this->Data[$NodeID]["G"] = $Settings["G"]; }
+            if ( isset($Settings["B"]) ) { $this->Data[$NodeID]["B"] = $Settings["B"]; }
+            if ( isset($Settings["Alpha"]) ) { $this->Data[$NodeID]["Alpha"] = $Settings["Alpha"]; }
+            if ( isset($Settings["BorderR"]) ) { $this->Data[$NodeID]["BorderR"] = $Settings["BorderR"]; }
+            if ( isset($Settings["BorderG"]) ) { $this->Data[$NodeID]["BorderG"] = $Settings["BorderG"]; }
+            if ( isset($Settings["BorderB"]) ) { $this->Data[$NodeID]["BorderB"] = $Settings["BorderB"]; }
+            if ( isset($Settings["BorderAlpha"]) ) { $this->Data[$NodeID]["BorderAlpha"] = $Settings["BorderAlpha"]; }
+            if ( isset($Settings["Surrounding"]) ) { $this->Data[$NodeID]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
+            }
+        }
+        }
+        else
+        {
+        if ( isset($Settings["R"]) ) { $this->Data[$Nodes]["R"] = $Settings["R"]; }
+        if ( isset($Settings["G"]) ) { $this->Data[$Nodes]["G"] = $Settings["G"]; }
+        if ( isset($Settings["B"]) ) { $this->Data[$Nodes]["B"] = $Settings["B"]; }
+        if ( isset($Settings["Alpha"]) ) { $this->Data[$Nodes]["Alpha"] = $Settings["Alpha"]; }
+        if ( isset($Settings["BorderR"]) ) { $this->Data[$Nodes]["BorderR"] = $Settings["BorderR"]; }
+        if ( isset($Settings["BorderG"]) ) { $this->Data[$Nodes]["BorderG"] = $Settings["BorderG"]; }
+        if ( isset($Settings["BorderB"]) ) { $this->Data[$Nodes]["BorderB"] = $Settings["BorderB"]; }
+        if ( isset($Settings["BorderAlpha"]) ) { $this->Data[$Nodes]["BorderAlpha"] = $Settings["BorderAlpha"]; }
+        if ( isset($Settings["Surrounding"]) ) { $this->Data[$Nodes]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
+        }
     }
 
-   /* Returns all the nodes details */
-   function dumpNodes()
+    /* Returns all the nodes details */
+    function dumpNodes()
     { return($this->Data); }
 
-   /* Check if a connection exists and create it if required */
-   function checkConnection($SourceID, $TargetID)
+    /* Check if a connection exists and create it if required */
+    function checkConnection($SourceID, $TargetID)
     {
-     if ( isset($this->Data[$SourceID]["Connections"]) )
-      {
-       foreach ($this->Data[$SourceID]["Connections"] as $Key => $ConnectionID)
+        if ( isset($this->Data[$SourceID]["Connections"]) )
+        {
+        foreach ($this->Data[$SourceID]["Connections"] as $Key => $ConnectionID)
         { if ( $TargetID == $ConnectionID ) { return(TRUE); } }
-      }
-     $this->Data[$SourceID]["Connections"][] = $TargetID;
+        }
+        $this->Data[$SourceID]["Connections"][] = $TargetID;
     }
-   /* Get the median linked nodes position */
-   function getMedianOffset($Key,$X,$Y)
+    /* Get the median linked nodes position */
+    function getMedianOffset($Key,$X,$Y)
     {
-     $Cpt = 1;
-     if ( isset($this->Data[$Key]["Connections"]) )
-      {
-       foreach($this->Data[$Key]["Connections"] as $ID => $NodeID)
-        {
-         if ( isset($this->Data[$NodeID]["X"]) && isset($this->Data[$NodeID]["Y"]) )
-          {
-           $X = $X + $this->Data[$NodeID]["X"];
-           $Y = $Y + $this->Data[$NodeID]["Y"];
-           $Cpt++;
-          }
-        }
-      }
-     return(array("X"=>$X/$Cpt,"Y"=>$Y/$Cpt));
+        $Cpt = 1;
+        if ( isset($this->Data[$Key]["Connections"]) )
+        {
+        foreach($this->Data[$Key]["Connections"] as $ID => $NodeID)
+        {
+            if ( isset($this->Data[$NodeID]["X"]) && isset($this->Data[$NodeID]["Y"]) )
+            {
+            $X = $X + $this->Data[$NodeID]["X"];
+            $Y = $Y + $this->Data[$NodeID]["Y"];
+            $Cpt++;
+            }
+        }
+        }
+        return(array("X"=>$X/$Cpt,"Y"=>$Y/$Cpt));
     }
 
-   /* Return the ID of the attached partner with the biggest weight */
-   function getBiggestPartner($Key)
+    /* Return the ID of the attached partner with the biggest weight */
+    function getBiggestPartner($Key)
     {
-     if ( !isset($this->Data[$Key]["Connections"]) ) { return(""); }
+        if ( !isset($this->Data[$Key]["Connections"]) ) { return(""); }
 
-     $MaxWeight = 0; $Result = "";
-     foreach($this->Data[$Key]["Connections"] as $Key => $PeerID)
-      {
-       if ( $this->Data[$PeerID]["Weight"] > $MaxWeight )
+        $MaxWeight = 0; $Result = "";
+        foreach($this->Data[$Key]["Connections"] as $Key => $PeerID)
+        {
+        if ( $this->Data[$PeerID]["Weight"] > $MaxWeight )
         { $MaxWeight = $this->Data[$PeerID]["Weight"]; $Result = $PeerID; }
-      }
-     return($Result);
+        }
+        return($Result);
     }
 
-   /* Do the initial node positions computing pass */
-   function firstPass($Algorithm)
+    /* Do the initial node positions computing pass */
+    function firstPass($Algorithm)
     {
-     $CenterX = ($this->X2 - $this->X1) / 2 + $this->X1;
-     $CenterY = ($this->Y2 - $this->Y1) / 2 + $this->Y1;
+        $CenterX = ($this->X2 - $this->X1) / 2 + $this->X1;
+        $CenterY = ($this->Y2 - $this->Y1) / 2 + $this->Y1;
 
-     /* Check connections reciprocity */
-     foreach($this->Data as $Key => $Settings)
-      {
-       if ( isset($Settings["Connections"]) )
+        /* Check connections reciprocity */
+        foreach($this->Data as $Key => $Settings)
+        {
+        if ( isset($Settings["Connections"]) )
         {
-         foreach($Settings["Connections"] as $ID => $ConnectionID)
-          $this->checkConnection($ConnectionID,$Key);
+            foreach($Settings["Connections"] as $ID => $ConnectionID)
+            $this->checkConnection($ConnectionID,$Key);
+        }
         }
-      }
 
-     if ( $this->AutoComputeFreeZone ) { $this->autoFreeZone(); }
+        if ( $this->AutoComputeFreeZone ) { $this->autoFreeZone(); }
 
-     /* Get the max number of connections */
-     $MaxConnections = 0;
-     foreach($this->Data as $Key => $Settings)
-      { if ( isset($Settings["Connections"]) ) { if ( $MaxConnections < count($Settings["Connections"] ) ) { $MaxConnections = count($Settings["Connections"]); } } }
+        /* Get the max number of connections */
+        $MaxConnections = 0;
+        foreach($this->Data as $Key => $Settings)
+        { if ( isset($Settings["Connections"]) ) { if ( $MaxConnections < count($Settings["Connections"] ) ) { $MaxConnections = count($Settings["Connections"]); } } }
 
-     if ( $Algorithm == ALGORITHM_WEIGHTED )
-      {
-       foreach($this->Data as $Key => $Settings)
+        if ( $Algorithm == ALGORITHM_WEIGHTED )
+        {
+        foreach($this->Data as $Key => $Settings)
         {
-         if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
-         if ( $Settings["Type"] == NODE_TYPE_FREE )
-          {
-           if ( isset($Settings["Connections"]) )
+            if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+            if ( $Settings["Type"] == NODE_TYPE_FREE )
+            {
+            if ( isset($Settings["Connections"]) )
             { $Connections = count($Settings["Connections"]); }
-           else
+            else
             { $Connections = 0; }
 
-           $Ring  = $MaxConnections - $Connections;
-           $Angle = rand(0,360);
+            $Ring  = $MaxConnections - $Connections;
+            $Angle = rand(0,360);
            
-           $this->Data[$Key]["X"] = cos(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterX;
-           $this->Data[$Key]["Y"] = sin(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterY;
-          }
+            $this->Data[$Key]["X"] = cos(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterX;
+            $this->Data[$Key]["Y"] = sin(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterY;
+            }
         }
-      }
-     elseif ( $Algorithm == ALGORITHM_CENTRAL )
-      {
-       /* Put a weight on each nodes */
-       foreach($this->Data as $Key => $Settings)
+        }
+        elseif ( $Algorithm == ALGORITHM_CENTRAL )
+        {
+        /* Put a weight on each nodes */
+        foreach($this->Data as $Key => $Settings)
         {
-         if ( isset($Settings["Connections"]) )
-          $this->Data[$Key]["Weight"] = count($Settings["Connections"]);
-         else
-          $this->Data[$Key]["Weight"] = 0;
+            if ( isset($Settings["Connections"]) )
+            $this->Data[$Key]["Weight"] = count($Settings["Connections"]);
+            else
+            $this->Data[$Key]["Weight"] = 0;
         }
 
-       $MaxConnections = $MaxConnections + 1;
-       for($i=$MaxConnections;$i>=0;$i--)
+        $MaxConnections = $MaxConnections + 1;
+        for($i=$MaxConnections;$i>=0;$i--)
         {
-         foreach($this->Data as $Key => $Settings)
-          {
-           if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
-           if ( $Settings["Type"] == NODE_TYPE_FREE )
+            foreach($this->Data as $Key => $Settings)
             {
-             if ( isset($Settings["Connections"]) )
-              { $Connections = count($Settings["Connections"]); }
-             else
-              { $Connections = 0; }
-
-             if ( $Connections == $i )
-              {
-               $BiggestPartner = $this->getBiggestPartner($Key);
-               if ( $BiggestPartner != "" )
+            if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+            if ( $Settings["Type"] == NODE_TYPE_FREE )
+            {
+                if ( isset($Settings["Connections"]) )
+                { $Connections = count($Settings["Connections"]); }
+                else
+                { $Connections = 0; }
+
+                if ( $Connections == $i )
                 {
-                 $Ring          = $this->Data[$BiggestPartner]["FreeZone"];
-                 $Weight        = $this->Data[$BiggestPartner]["Weight"];
-                 $AngleDivision = 360 / $this->Data[$BiggestPartner]["Weight"];
-                 $Done          = FALSE; $Tries = 0;
-                 while (!$Done && $Tries <= $Weight*2)
-                  {
-                   $Tries++;
-                   $Angle = floor(rand(0,$Weight)*$AngleDivision);
-                   if ( !isset($this->Data[$BiggestPartner]["Angular"][$Angle]) || !isset($this->Data[$BiggestPartner]["Angular"]) )
+                $BiggestPartner = $this->getBiggestPartner($Key);
+                if ( $BiggestPartner != "" )
+                {
+                    $Ring          = $this->Data[$BiggestPartner]["FreeZone"];
+                    $Weight        = $this->Data[$BiggestPartner]["Weight"];
+                    $AngleDivision = 360 / $this->Data[$BiggestPartner]["Weight"];
+                    $Done          = FALSE; $Tries = 0;
+                    while (!$Done && $Tries <= $Weight*2)
+                    {
+                    $Tries++;
+                    $Angle = floor(rand(0,$Weight)*$AngleDivision);
+                    if ( !isset($this->Data[$BiggestPartner]["Angular"][$Angle]) || !isset($this->Data[$BiggestPartner]["Angular"]) )
                     {
-                     $this->Data[$BiggestPartner]["Angular"][$Angle] = $Angle;
-                     $Done = TRUE; 
+                        $this->Data[$BiggestPartner]["Angular"][$Angle] = $Angle;
+                        $Done = TRUE; 
                     }
-                  }
-                 if ( !$Done )
-                  { $Angle = rand(0,360); $this->Data[$BiggestPartner]["Angular"][$Angle] = $Angle; }
+                    }
+                    if ( !$Done )
+                    { $Angle = rand(0,360); $this->Data[$BiggestPartner]["Angular"][$Angle] = $Angle; }
 
-                 $X = cos(deg2rad($Angle)) * ($Ring) + $this->Data[$BiggestPartner]["X"];
-                 $Y = sin(deg2rad($Angle)) * ($Ring) + $this->Data[$BiggestPartner]["Y"];
+                    $X = cos(deg2rad($Angle)) * ($Ring) + $this->Data[$BiggestPartner]["X"];
+                    $Y = sin(deg2rad($Angle)) * ($Ring) + $this->Data[$BiggestPartner]["Y"];
 
-                 $this->Data[$Key]["X"] = $X;
-                 $this->Data[$Key]["Y"] = $Y;
+                    $this->Data[$Key]["X"] = $X;
+                    $this->Data[$Key]["Y"] = $Y;
+                }
                 }
-              }
             }
-          }
-        }
-      }
-     elseif ( $Algorithm == ALGORITHM_CIRCULAR )
-      {
-       $MaxConnections = $MaxConnections + 1;
-       for($i=$MaxConnections;$i>=0;$i--)
-        {
-         foreach($this->Data as $Key => $Settings)
-          {
-           if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
-           if ( $Settings["Type"] == NODE_TYPE_FREE )
+            }
+        }
+        }
+        elseif ( $Algorithm == ALGORITHM_CIRCULAR )
+        {
+        $MaxConnections = $MaxConnections + 1;
+        for($i=$MaxConnections;$i>=0;$i--)
+        {
+            foreach($this->Data as $Key => $Settings)
+            {
+            if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+            if ( $Settings["Type"] == NODE_TYPE_FREE )
             {
-             if ( isset($Settings["Connections"]) )
-              { $Connections = count($Settings["Connections"]); }
-             else
-              { $Connections = 0; }
+                if ( isset($Settings["Connections"]) )
+                { $Connections = count($Settings["Connections"]); }
+                else
+                { $Connections = 0; }
 
-             if ( $Connections == $i )
-              {
-               $Ring  = $MaxConnections - $Connections;
-               $Angle = rand(0,360);
+                if ( $Connections == $i )
+                {
+                $Ring  = $MaxConnections - $Connections;
+                $Angle = rand(0,360);
 
-               $X = cos(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterX;
-               $Y = sin(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterY;
+                $X = cos(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterX;
+                $Y = sin(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterY;
 
-               $MedianOffset = $this->getMedianOffset($Key,$X,$Y);
+                $MedianOffset = $this->getMedianOffset($Key,$X,$Y);
 
-               $this->Data[$Key]["X"] = $MedianOffset["X"];
-               $this->Data[$Key]["Y"] = $MedianOffset["Y"];
-              }
+                $this->Data[$Key]["X"] = $MedianOffset["X"];
+                $this->Data[$Key]["Y"] = $MedianOffset["Y"];
+                }
             }
-          }
+            }
+        }
         }
-      }
-     elseif ( $Algorithm == ALGORITHM_RANDOM )
-      {
-       foreach($this->Data as $Key => $Settings)
+        elseif ( $Algorithm == ALGORITHM_RANDOM )
         {
-         if ( $Settings["Type"] == NODE_TYPE_FREE )
-          {
-           $this->Data[$Key]["X"] = $CenterX + rand(-20,20);
-           $this->Data[$Key]["Y"] = $CenterY + rand(-20,20);
-          }
-         if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+        foreach($this->Data as $Key => $Settings)
+        {
+            if ( $Settings["Type"] == NODE_TYPE_FREE )
+            {
+            $this->Data[$Key]["X"] = $CenterX + rand(-20,20);
+            $this->Data[$Key]["Y"] = $CenterY + rand(-20,20);
+            }
+            if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+        }
         }
-      }
     }
 
-   /* Compute one pass */
-   function doPass()
+    /* Compute one pass */
+    function doPass()
     {
-     /* Compute vectors */
-     foreach($this->Data as $Key => $Settings)
-      {
-       if ( $Settings["Type"] != NODE_TYPE_CENTRAL )
+        /* Compute vectors */
+        foreach($this->Data as $Key => $Settings)
         {
-         unset($this->Data[$Key]["Vectors"]);
+        if ( $Settings["Type"] != NODE_TYPE_CENTRAL )
+        {
+            unset($this->Data[$Key]["Vectors"]);
 
-         $X1 = $Settings["X"];
-         $Y1 = $Settings["Y"];
+            $X1 = $Settings["X"];
+            $Y1 = $Settings["Y"];
 
-         /* Repulsion vectors */
-         foreach($this->Data as $Key2 => $Settings2)
-          {
-           if ( $Key != $Key2 )
+            /* Repulsion vectors */
+            foreach($this->Data as $Key2 => $Settings2)
+            {
+            if ( $Key != $Key2 )
             {
-             $X2 = $this->Data[$Key2]["X"];
-             $Y2 = $this->Data[$Key2]["Y"];
-             $FreeZone = $this->Data[$Key2]["FreeZone"];
-
-             $Distance = $this->getDistance($X1,$Y1,$X2,$Y2);
-             $Angle    = $this->getAngle($X1,$Y1,$X2,$Y2) + 180;
-
-             /* Nodes too close, repulsion occurs */
-             if ( $Distance < $FreeZone )
-              {
-               $Force = log(pow(2,$FreeZone-$Distance));
-               if ( $Force > 1 )
+                $X2 = $this->Data[$Key2]["X"];
+                $Y2 = $this->Data[$Key2]["Y"];
+                $FreeZone = $this->Data[$Key2]["FreeZone"];
+
+                $Distance = $this->getDistance($X1,$Y1,$X2,$Y2);
+                $Angle    = $this->getAngle($X1,$Y1,$X2,$Y2) + 180;
+
+                /* Nodes too close, repulsion occurs */
+                if ( $Distance < $FreeZone )
+                {
+                $Force = log(pow(2,$FreeZone-$Distance));
+                if ( $Force > 1 )
                 { $this->Data[$Key]["Vectors"][] = array("Type"=>"R","Angle"=>$Angle % 360,"Force"=>$Force); }
-              }
+                }
+            }
             }
-          }
 
-         /* Attraction vectors */
-         if ( isset($Settings["Connections"]) )
-          {
-           foreach($Settings["Connections"] as $ID => $NodeID)
+            /* Attraction vectors */
+            if ( isset($Settings["Connections"]) )
             {
-             if ( isset($this->Data[$NodeID]) )
-              {
-               $X2 = $this->Data[$NodeID]["X"];
-               $Y2 = $this->Data[$NodeID]["Y"];
-               $FreeZone = $this->Data[$Key2]["FreeZone"];
+            foreach($Settings["Connections"] as $ID => $NodeID)
+            {
+                if ( isset($this->Data[$NodeID]) )
+                {
+                $X2 = $this->Data[$NodeID]["X"];
+                $Y2 = $this->Data[$NodeID]["Y"];
+                $FreeZone = $this->Data[$Key2]["FreeZone"];
 
-               $Distance = $this->getDistance($X1,$Y1,$X2,$Y2);
-               $Angle    = $this->getAngle($X1,$Y1,$X2,$Y2);
+                $Distance = $this->getDistance($X1,$Y1,$X2,$Y2);
+                $Angle    = $this->getAngle($X1,$Y1,$X2,$Y2);
 
-               if ( $Distance > $FreeZone )
+                if ( $Distance > $FreeZone )
                 $Force = log(($Distance-$FreeZone)+1);
-               else
+                else
                 { $Force = log(($FreeZone-$Distance)+1); ($Angle = $Angle + 180); }
 
-               if ( $Force > 1 )
+                if ( $Force > 1 )
                 $this->Data[$Key]["Vectors"][] = array("Type"=>"A","Angle"=>$Angle % 360,"Force"=>$Force);
-              }
+                }
+            }
             }
-          }
         }
-      }
+        }
 
-     /* Move the nodes accoding to the vectors */
-     foreach($this->Data as $Key => $Settings)
-      {
-       $X = $Settings["X"];
-       $Y = $Settings["Y"];
+        /* Move the nodes accoding to the vectors */
+        foreach($this->Data as $Key => $Settings)
+        {
+        $X = $Settings["X"];
+        $Y = $Settings["Y"];
 
-       if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL )
+        if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL )
         {
-         foreach($Settings["Vectors"] as $ID => $Vector)
-          {
-           $Type  = $Vector["Type"];
-           $Force = $Vector["Force"];
-           $Angle = $Vector["Angle"];
-           $Factor = $Type == "A" ? $this->MagneticForceA : $this->MagneticForceR;
+            foreach($Settings["Vectors"] as $ID => $Vector)
+            {
+            $Type  = $Vector["Type"];
+            $Force = $Vector["Force"];
+            $Angle = $Vector["Angle"];
+            $Factor = $Type == "A" ? $this->MagneticForceA : $this->MagneticForceR;
 
-           $X = cos(deg2rad($Angle)) * $Force * $Factor + $X;
-           $Y = sin(deg2rad($Angle)) * $Force * $Factor + $Y;
-          }
+            $X = cos(deg2rad($Angle)) * $Force * $Factor + $X;
+            $Y = sin(deg2rad($Angle)) * $Force * $Factor + $Y;
+            }
         }
 
-       $this->Data[$Key]["X"] = $X;
-       $this->Data[$Key]["Y"] = $Y;
-      }
+        $this->Data[$Key]["X"] = $X;
+        $this->Data[$Key]["Y"] = $Y;
+        }
     }
 
-   function lastPass()
+    function lastPass()
     {
-     /* Put everything inside the graph area */
-     foreach($this->Data as $Key => $Settings)
-      {
-       $X = $Settings["X"];
-       $Y = $Settings["Y"];
-
-       if ( $X < $this->X1 ) { $X = $this->X1; }
-       if ( $X > $this->X2 ) { $X = $this->X2; }
-       if ( $Y < $this->Y1 ) { $Y = $this->Y1; }
-       if ( $Y > $this->Y2 ) { $Y = $this->Y2; }
-
-       $this->Data[$Key]["X"] = $X;
-       $this->Data[$Key]["Y"] = $Y;
-      }
-
-     /* Dump all links */
-     $Links = "";
-     foreach($this->Data as $Key => $Settings)
-      {
-       $X1 = $Settings["X"];
-       $Y1 = $Settings["Y"];
-
-       if ( isset($Settings["Connections"]) )
-        {
-         foreach ($Settings["Connections"] as $ID => $NodeID)
-          {
-           if ( isset($this->Data[$NodeID]) )
+        /* Put everything inside the graph area */
+        foreach($this->Data as $Key => $Settings)
+        {
+        $X = $Settings["X"];
+        $Y = $Settings["Y"];
+
+        if ( $X < $this->X1 ) { $X = $this->X1; }
+        if ( $X > $this->X2 ) { $X = $this->X2; }
+        if ( $Y < $this->Y1 ) { $Y = $this->Y1; }
+        if ( $Y > $this->Y2 ) { $Y = $this->Y2; }
+
+        $this->Data[$Key]["X"] = $X;
+        $this->Data[$Key]["Y"] = $Y;
+        }
+
+        /* Dump all links */
+        $Links = "";
+        foreach($this->Data as $Key => $Settings)
+        {
+        $X1 = $Settings["X"];
+        $Y1 = $Settings["Y"];
+
+        if ( isset($Settings["Connections"]) )
+        {
+            foreach ($Settings["Connections"] as $ID => $NodeID)
+            {
+            if ( isset($this->Data[$NodeID]) )
             {
-             $X2 = $this->Data[$NodeID]["X"];
-             $Y2 = $this->Data[$NodeID]["Y"];
+                $X2 = $this->Data[$NodeID]["X"];
+                $Y2 = $this->Data[$NodeID]["Y"];
 
-             $Links[] = array("X1"=>$X1,"Y1"=>$Y1,"X2"=>$X2,"Y2"=>$Y2,"Source"=>$Settings["Name"],"Destination"=>$this->Data[$NodeID]["Name"]);
+                $Links[] = array("X1"=>$X1,"Y1"=>$Y1,"X2"=>$X2,"Y2"=>$Y2,"Source"=>$Settings["Name"],"Destination"=>$this->Data[$NodeID]["Name"]);
             }
-          }
+            }
+        }
         }
-      }
 
-     /* Check collisions */
-     $Conflicts = 0;
-     foreach($this->Data as $Key => $Settings)
-      {
-       $X1 = $Settings["X"];
-       $Y1 = $Settings["Y"];
+        /* Check collisions */
+        $Conflicts = 0;
+        foreach($this->Data as $Key => $Settings)
+        {
+        $X1 = $Settings["X"];
+        $Y1 = $Settings["Y"];
 
-       if ( isset($Settings["Connections"]) )
+        if ( isset($Settings["Connections"]) )
         {
-         foreach ($Settings["Connections"] as $ID => $NodeID)
-          {
-           if ( isset($this->Data[$NodeID]) )
+            foreach ($Settings["Connections"] as $ID => $NodeID)
+            {
+            if ( isset($this->Data[$NodeID]) )
             {
-             $X2 = $this->Data[$NodeID]["X"];
-             $Y2 = $this->Data[$NodeID]["Y"];
+                $X2 = $this->Data[$NodeID]["X"];
+                $Y2 = $this->Data[$NodeID]["Y"];
 
-             foreach($Links as $IDLinks => $Link)
-              {
-               $X3 = $Link["X1"]; $Y3 = $Link["Y1"]; $X4 = $Link["X2"]; $Y4 = $Link["Y2"];
+                foreach($Links as $IDLinks => $Link)
+                {
+                $X3 = $Link["X1"]; $Y3 = $Link["Y1"]; $X4 = $Link["X2"]; $Y4 = $Link["Y2"];
 
-               if ( !($X1 == $X3 && $X2 == $X4 && $Y1 == $Y3 && $Y2 == $Y4 ) )
+                if ( !($X1 == $X3 && $X2 == $X4 && $Y1 == $Y3 && $Y2 == $Y4 ) )
                 {
-                 if ( $this->intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4) )
-                  {
-                   if ( $Link["Source"] != $Settings["Name"] && $Link["Source"] != $this->Data[$NodeID]["Name"] && $Link["Destination"] != $Settings["Name"] && $Link["Destination"] != $this->Data[$NodeID]["Name"] )
+                    if ( $this->intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4) )
+                    {
+                    if ( $Link["Source"] != $Settings["Name"] && $Link["Source"] != $this->Data[$NodeID]["Name"] && $Link["Destination"] != $Settings["Name"] && $Link["Destination"] != $this->Data[$NodeID]["Name"] )
                     { $Conflicts++; }
-                  }
+                    }
+                }
                 }
-              }
             }
-          }
+            }
+        }
         }
-      }
-     return($Conflicts/2);
+        return($Conflicts/2);
     }
 
-   /* Center the graph */
-   function center()
+    /* Center the graph */
+    function center()
     {
-     /* Determine the real center */
-     $TargetCenterX = ($this->X2 - $this->X1) / 2 + $this->X1;
-     $TargetCenterY = ($this->Y2 - $this->Y1) / 2 + $this->Y1;
-
-     /* Get current boundaries */
-     $XMin = $this->X2; $XMax = $this->X1;
-     $YMin = $this->Y2; $YMax = $this->Y1;
-     foreach($this->Data as $Key => $Settings)
-      {
-       $X = $Settings["X"];
-       $Y = $Settings["Y"];
-
-       if ( $X < $XMin) { $XMin = $X; }
-       if ( $X > $XMax) { $XMax = $X; }
-       if ( $Y < $YMin) { $YMin = $Y; }
-       if ( $Y > $YMax) { $YMax = $Y; }
-      }
-     $CurrentCenterX = ($XMax - $XMin) / 2 + $XMin;
-     $CurrentCenterY = ($YMax - $YMin) / 2 + $YMin;
-
-     /* Compute the offset to apply */
-     $XOffset = $TargetCenterX - $CurrentCenterX;
-     $YOffset = $TargetCenterY - $CurrentCenterY;
-
-     /* Correct the points position */
-     foreach($this->Data as $Key => $Settings)
-      {
-       $this->Data[$Key]["X"] = $Settings["X"] + $XOffset;
-       $this->Data[$Key]["Y"] = $Settings["Y"] + $YOffset;
-      }
-    }
+        /* Determine the real center */
+        $TargetCenterX = ($this->X2 - $this->X1) / 2 + $this->X1;
+        $TargetCenterY = ($this->Y2 - $this->Y1) / 2 + $this->Y1;
+
+        /* Get current boundaries */
+        $XMin = $this->X2; $XMax = $this->X1;
+        $YMin = $this->Y2; $YMax = $this->Y1;
+        foreach($this->Data as $Key => $Settings)
+        {
+        $X = $Settings["X"];
+        $Y = $Settings["Y"];
 
-   /* Create the encoded string */
-   function drawSpring($Object,$Settings="")
-    {
-     $this->pChartObject = $Object;
+        if ( $X < $XMin) { $XMin = $X; }
+        if ( $X > $XMax) { $XMax = $X; }
+        if ( $Y < $YMin) { $YMin = $Y; }
+        if ( $Y > $YMax) { $YMax = $Y; }
+        }
+        $CurrentCenterX = ($XMax - $XMin) / 2 + $XMin;
+        $CurrentCenterY = ($YMax - $YMin) / 2 + $YMin;
 
-     $Pass			= isset($Settings["Pass"]) ? $Settings["Pass"] : 50;
-     $Retries			= isset($Settings["Retry"]) ? $Settings["Retry"] : 10;
-     $this->MagneticForceA	= isset($Settings["MagneticForceA"]) ? $Settings["MagneticForceA"] : 1.5;
-     $this->MagneticForceR	= isset($Settings["MagneticForceR"]) ? $Settings["MagneticForceR"] : 2;
-     $this->RingSize		= isset($Settings["RingSize"]) ? $Settings["RingSize"] : 40;
-     $DrawVectors		= isset($Settings["DrawVectors"]) ? $Settings["DrawVectors"] : FALSE;
-     $DrawQuietZone		= isset($Settings["DrawQuietZone"]) ? $Settings["DrawQuietZone"] : FALSE;
-     $CenterGraph		= isset($Settings["CenterGraph"]) ? $Settings["CenterGraph"] : TRUE;
-     $TextPadding		= isset($Settings["TextPadding"]) ? $Settings["TextPadding"] : 4;
-     $Algorithm			= isset($Settings["Algorithm"]) ? $Settings["Algorithm"] : ALGORITHM_WEIGHTED;
+        /* Compute the offset to apply */
+        $XOffset = $TargetCenterX - $CurrentCenterX;
+        $YOffset = $TargetCenterY - $CurrentCenterY;
 
-     $FontSize		= $Object->FontSize;
-     $this->X1		= $Object->GraphAreaX1;
-     $this->Y1		= $Object->GraphAreaY1;
-     $this->X2		= $Object->GraphAreaX2;
-     $this->Y2		= $Object->GraphAreaY2;
+        /* Correct the points position */
+        foreach($this->Data as $Key => $Settings)
+        {
+        $this->Data[$Key]["X"] = $Settings["X"] + $XOffset;
+        $this->Data[$Key]["Y"] = $Settings["Y"] + $YOffset;
+        }
+    }
 
-     $Conflicts = 1; $Jobs = 0; $this->History["MinimumConflicts"] = -1;
-     while ($Conflicts != 0 && $Jobs < $Retries )
-      {
-       $Jobs++;
+    /* Create the encoded string */
+    function drawSpring($Object,$Settings="")
+    {
+        $this->pChartObject = $Object;
+
+        $Pass			= isset($Settings["Pass"]) ? $Settings["Pass"] : 50;
+        $Retries			= isset($Settings["Retry"]) ? $Settings["Retry"] : 10;
+        $this->MagneticForceA	= isset($Settings["MagneticForceA"]) ? $Settings["MagneticForceA"] : 1.5;
+        $this->MagneticForceR	= isset($Settings["MagneticForceR"]) ? $Settings["MagneticForceR"] : 2;
+        $this->RingSize		= isset($Settings["RingSize"]) ? $Settings["RingSize"] : 40;
+        $DrawVectors		= isset($Settings["DrawVectors"]) ? $Settings["DrawVectors"] : FALSE;
+        $DrawQuietZone		= isset($Settings["DrawQuietZone"]) ? $Settings["DrawQuietZone"] : FALSE;
+        $CenterGraph		= isset($Settings["CenterGraph"]) ? $Settings["CenterGraph"] : TRUE;
+        $TextPadding		= isset($Settings["TextPadding"]) ? $Settings["TextPadding"] : 4;
+        $Algorithm			= isset($Settings["Algorithm"]) ? $Settings["Algorithm"] : ALGORITHM_WEIGHTED;
+
+        $FontSize		= $Object->FontSize;
+        $this->X1		= $Object->GraphAreaX1;
+        $this->Y1		= $Object->GraphAreaY1;
+        $this->X2		= $Object->GraphAreaX2;
+        $this->Y2		= $Object->GraphAreaY2;
+
+        $Conflicts = 1; $Jobs = 0; $this->History["MinimumConflicts"] = -1;
+        while ($Conflicts != 0 && $Jobs < $Retries )
+        {
+        $Jobs++;
 
-       /* Compute the initial settings */
-       $this->firstPass($Algorithm);
+        /* Compute the initial settings */
+        $this->firstPass($Algorithm);
 
-       /* Apply the vectors */
-       if ( $Pass > 0 ) 
+        /* Apply the vectors */
+        if ( $Pass > 0 ) 
         {
-         for ($i=0; $i<=$Pass; $i++) { $this->doPass(); }
+            for ($i=0; $i<=$Pass; $i++) { $this->doPass(); }
         }
 
-       $Conflicts = $this->lastPass();
-       if ( $this->History["MinimumConflicts"] == -1 || $Conflicts < $this->History["MinimumConflicts"] )
+        $Conflicts = $this->lastPass();
+        if ( $this->History["MinimumConflicts"] == -1 || $Conflicts < $this->History["MinimumConflicts"] )
         { $this->History["MinimumConflicts"] = $Conflicts; $this->History["Result"] = $this->Data; }
-      }
+        }
 
-     $Conflicts  = $this->History["MinimumConflicts"];
-     $this->Data = $this->History["Result"];
+        $Conflicts  = $this->History["MinimumConflicts"];
+        $this->Data = $this->History["Result"];
 
-     if ( $CenterGraph ) { $this->center(); }
+        if ( $CenterGraph ) { $this->center(); }
 
-     /* Draw the connections */
-     $Drawn = "";
-     foreach($this->Data as $Key => $Settings)
-      {
-       $X	= $Settings["X"];
-       $Y	= $Settings["Y"];
+        /* Draw the connections */
+        $Drawn = "";
+        foreach($this->Data as $Key => $Settings)
+        {
+        $X	= $Settings["X"];
+        $Y	= $Settings["Y"];
 
-       if ( isset($Settings["Connections"]) )
+        if ( isset($Settings["Connections"]) )
         {
-         foreach ($Settings["Connections"] as $ID => $NodeID)
-          {
-           if ( !isset($Drawn[$Key]) )    { $Drawn[$Key] = ""; }
-           if ( !isset($Drawn[$NodeID]) ) { $Drawn[$NodeID] = ""; }
+            foreach ($Settings["Connections"] as $ID => $NodeID)
+            {
+            if ( !isset($Drawn[$Key]) )    { $Drawn[$Key] = ""; }
+            if ( !isset($Drawn[$NodeID]) ) { $Drawn[$NodeID] = ""; }
 
-           if ( isset($this->Data[$NodeID]) && !isset($Drawn[$Key][$NodeID]) && !isset($Drawn[$NodeID][$Key]) )
+            if ( isset($this->Data[$NodeID]) && !isset($Drawn[$Key][$NodeID]) && !isset($Drawn[$NodeID][$Key]) )
             {
-             $Color = array("R"=>$this->Default["LinkR"],"G"=>$this->Default["LinkG"],"B"=>$this->Default["LinkB"],"Alpha"=>$this->Default["Alpha"]);
+                $Color = array("R"=>$this->Default["LinkR"],"G"=>$this->Default["LinkG"],"B"=>$this->Default["LinkB"],"Alpha"=>$this->Default["Alpha"]);
 
-             if ( $this->Links != "" )
-              {
-               if ( isset($this->Links[$Key][$NodeID]["R"]) )
+                if ( $this->Links != "" )
+                {
+                if ( isset($this->Links[$Key][$NodeID]["R"]) )
                 { $Color = array("R"=>$this->Links[$Key][$NodeID]["R"],"G"=>$this->Links[$Key][$NodeID]["G"],"B"=>$this->Links[$Key][$NodeID]["B"],"Alpha"=>$this->Links[$Key][$NodeID]["Alpha"]); }
 
-               if ( isset($this->Links[$Key][$NodeID]["Ticks"]) )
-                 { $Color["Ticks"] = $this->Links[$Key][$NodeID]["Ticks"]; }
-              }
+                if ( isset($this->Links[$Key][$NodeID]["Ticks"]) )
+                    { $Color["Ticks"] = $this->Links[$Key][$NodeID]["Ticks"]; }
+                }
 
-             $X2 = $this->Data[$NodeID]["X"];
-             $Y2 = $this->Data[$NodeID]["Y"];
-             $this->pChartObject->drawLine($X,$Y,$X2,$Y2,$Color);
-             $Drawn[$Key][$NodeID] = TRUE;
+                $X2 = $this->Data[$NodeID]["X"];
+                $Y2 = $this->Data[$NodeID]["Y"];
+                $this->pChartObject->drawLine($X,$Y,$X2,$Y2,$Color);
+                $Drawn[$Key][$NodeID] = TRUE;
 
-             if ( isset($this->Links) && $this->Links != "" )
-              {
-               if ( isset($this->Links[$Key][$NodeID]["Name"]) || isset($this->Links[$NodeID][$Key]["Name"]) )
+                if ( isset($this->Links) && $this->Links != "" )
+                {
+                if ( isset($this->Links[$Key][$NodeID]["Name"]) || isset($this->Links[$NodeID][$Key]["Name"]) )
                 {
-                 $Name  = isset($this->Links[$Key][$NodeID]["Name"]) ? $this->Links[$Key][$NodeID]["Name"] : $this->Links[$NodeID][$Key]["Name"];
-                 $TxtX  = ($X2 - $X)/2 + $X;
-                 $TxtY  = ($Y2 - $Y)/2 + $Y;
-
-                 if ( $X <= $X2 )
-                  $Angle = (360-$this->getAngle($X,$Y,$X2,$Y2)) % 360;
-                 else
-                  $Angle = (360-$this->getAngle($X2,$Y2,$X,$Y)) % 360;
-
-                 $Settings          = $Color;
-                 $Settings["Angle"] = $Angle;
-                 $Settings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE;
-                 $this->pChartObject->drawText($TxtX,$TxtY,$Name,$Settings);
+                    $Name  = isset($this->Links[$Key][$NodeID]["Name"]) ? $this->Links[$Key][$NodeID]["Name"] : $this->Links[$NodeID][$Key]["Name"];
+                    $TxtX  = ($X2 - $X)/2 + $X;
+                    $TxtY  = ($Y2 - $Y)/2 + $Y;
+
+                    if ( $X <= $X2 )
+                    $Angle = (360-$this->getAngle($X,$Y,$X2,$Y2)) % 360;
+                    else
+                    $Angle = (360-$this->getAngle($X2,$Y2,$X,$Y)) % 360;
+
+                    $Settings          = $Color;
+                    $Settings["Angle"] = $Angle;
+                    $Settings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE;
+                    $this->pChartObject->drawText($TxtX,$TxtY,$Name,$Settings);
                 }
-              }
+                }
+            }
             }
-          }
         }
-      }
+        }
 
-     /* Draw the quiet zones */
-     if ( $DrawQuietZone )
-      {
-       foreach($this->Data as $Key => $Settings)
+        /* Draw the quiet zones */
+        if ( $DrawQuietZone )
+        {
+        foreach($this->Data as $Key => $Settings)
         {
-         $X	 = $Settings["X"];
-         $Y	 = $Settings["Y"];
-         $FreeZone = $Settings["FreeZone"];
+            $X	 = $Settings["X"];
+            $Y	 = $Settings["Y"];
+            $FreeZone = $Settings["FreeZone"];
 
-         $this->pChartObject->drawFilledCircle($X,$Y,$FreeZone,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>2));
+            $this->pChartObject->drawFilledCircle($X,$Y,$FreeZone,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>2));
+        }
         }
-      }
 
 
-     /* Draw the nodes */
-     foreach($this->Data as $Key => $Settings)
-      {
-       $X	 = $Settings["X"];
-       $Y	 = $Settings["Y"];
-       $Name	 = $Settings["Name"];
-       $FreeZone = $Settings["FreeZone"];
-       $Shape    = $Settings["Shape"];
-       $Size     = $Settings["Size"];
+        /* Draw the nodes */
+        foreach($this->Data as $Key => $Settings)
+        {
+        $X	 = $Settings["X"];
+        $Y	 = $Settings["Y"];
+        $Name	 = $Settings["Name"];
+        $FreeZone = $Settings["FreeZone"];
+        $Shape    = $Settings["Shape"];
+        $Size     = $Settings["Size"];
 
-       $Color	 = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>$Settings["Alpha"],"BorderR"=>$Settings["BorderR"],"BorderG"=>$Settings["BorderG"],"BorderB"=>$Settings["BorderB"],"BorderApha"=>$Settings["BorderAlpha"]);
+        $Color	 = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>$Settings["Alpha"],"BorderR"=>$Settings["BorderR"],"BorderG"=>$Settings["BorderG"],"BorderB"=>$Settings["BorderB"],"BorderApha"=>$Settings["BorderAlpha"]);
 
-       if ( $Shape == NODE_SHAPE_CIRCLE )
+        if ( $Shape == NODE_SHAPE_CIRCLE )
         {
-         $this->pChartObject->drawFilledCircle($X,$Y,$Size,$Color);
+            $this->pChartObject->drawFilledCircle($X,$Y,$Size,$Color);
         }
-       elseif ( $Shape == NODE_SHAPE_TRIANGLE )
+        elseif ( $Shape == NODE_SHAPE_TRIANGLE )
         {
-         $Points = "";
-         $Points[] = cos(deg2rad(270)) * $Size + $X; $Points[] = sin(deg2rad(270)) * $Size + $Y;
-         $Points[] = cos(deg2rad(45)) * $Size + $X;  $Points[] = sin(deg2rad(45)) * $Size + $Y;
-         $Points[] = cos(deg2rad(135)) * $Size + $X; $Points[] = sin(deg2rad(135)) * $Size + $Y;
-         $this->pChartObject->drawPolygon($Points,$Color);
+            $Points = "";
+            $Points[] = cos(deg2rad(270)) * $Size + $X; $Points[] = sin(deg2rad(270)) * $Size + $Y;
+            $Points[] = cos(deg2rad(45)) * $Size + $X;  $Points[] = sin(deg2rad(45)) * $Size + $Y;
+            $Points[] = cos(deg2rad(135)) * $Size + $X; $Points[] = sin(deg2rad(135)) * $Size + $Y;
+            $this->pChartObject->drawPolygon($Points,$Color);
         }
-       elseif ( $Shape == NODE_SHAPE_SQUARE )
+        elseif ( $Shape == NODE_SHAPE_SQUARE )
         {
-         $Offset = $Size/2; $Size = $Size / 2;
-         $this->pChartObject->drawFilledRectangle($X-$Offset,$Y-$Offset,$X+$Offset,$Y+$Offset,$Color);
+            $Offset = $Size/2; $Size = $Size / 2;
+            $this->pChartObject->drawFilledRectangle($X-$Offset,$Y-$Offset,$X+$Offset,$Y+$Offset,$Color);
         }
 
-       if ( $Name != "" )
+        if ( $Name != "" )
         {
-         $LabelOptions = array("R"=>$this->Labels["R"],"G"=>$this->Labels["G"],"B"=>$this->Labels["B"],"Alpha"=>$this->Labels["Alpha"]);
+            $LabelOptions = array("R"=>$this->Labels["R"],"G"=>$this->Labels["G"],"B"=>$this->Labels["B"],"Alpha"=>$this->Labels["Alpha"]);
 
-         if ( $this->Labels["Type"] == LABEL_LIGHT )
-          {
-           $LabelOptions["Align"] = TEXT_ALIGN_BOTTOMLEFT;
-           $this->pChartObject->drawText($X,$Y,$Name,$LabelOptions);
-          }
-         elseif ( $this->Labels["Type"] == LABEL_CLASSIC )
-          {
-           $LabelOptions["Align"]         = TEXT_ALIGN_TOPMIDDLE;
-           $LabelOptions["DrawBox"]       = TRUE;
-           $LabelOptions["BoxAlpha"]      = 50;
-           $LabelOptions["BorderOffset"]  = 4;
-           $LabelOptions["RoundedRadius"] = 3;
-           $LabelOptions["BoxRounded"]    = TRUE;
-           $LabelOptions["NoShadow"]      = TRUE;
-
-           $this->pChartObject->drawText($X,$Y+$Size+$TextPadding,$Name,$LabelOptions);
-          }
+            if ( $this->Labels["Type"] == LABEL_LIGHT )
+            {
+            $LabelOptions["Align"] = TEXT_ALIGN_BOTTOMLEFT;
+            $this->pChartObject->drawText($X,$Y,$Name,$LabelOptions);
+            }
+            elseif ( $this->Labels["Type"] == LABEL_CLASSIC )
+            {
+            $LabelOptions["Align"]         = TEXT_ALIGN_TOPMIDDLE;
+            $LabelOptions["DrawBox"]       = TRUE;
+            $LabelOptions["BoxAlpha"]      = 50;
+            $LabelOptions["BorderOffset"]  = 4;
+            $LabelOptions["RoundedRadius"] = 3;
+            $LabelOptions["BoxRounded"]    = TRUE;
+            $LabelOptions["NoShadow"]      = TRUE;
+
+            $this->pChartObject->drawText($X,$Y+$Size+$TextPadding,$Name,$LabelOptions);
+            }
+        }
         }
-      }
 
-     /* Draw the vectors */
-     if ( $DrawVectors )
-      {
-       foreach($this->Data as $Key => $Settings)
+        /* Draw the vectors */
+        if ( $DrawVectors )
         {
-         $X1 = $Settings["X"];
-         $Y1 = $Settings["Y"];
+        foreach($this->Data as $Key => $Settings)
+        {
+            $X1 = $Settings["X"];
+            $Y1 = $Settings["Y"];
 
-         if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL )
-          {
-           foreach($Settings["Vectors"] as $ID => $Vector)
+            if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL )
+            {
+            foreach($Settings["Vectors"] as $ID => $Vector)
             {
-             $Type  = $Vector["Type"];
-             $Force = $Vector["Force"];
-             $Angle = $Vector["Angle"];
-             $Factor = $Type == "A" ? $this->MagneticForceA : $this->MagneticForceR;
-             $Color  = $Type == "A" ? array("FillR"=>255,"FillG"=>0,"FillB"=>0) : array("FillR"=>0,"FillG"=>255,"FillB"=>0);
+                $Type  = $Vector["Type"];
+                $Force = $Vector["Force"];
+                $Angle = $Vector["Angle"];
+                $Factor = $Type == "A" ? $this->MagneticForceA : $this->MagneticForceR;
+                $Color  = $Type == "A" ? array("FillR"=>255,"FillG"=>0,"FillB"=>0) : array("FillR"=>0,"FillG"=>255,"FillB"=>0);
 
-             $X2 = cos(deg2rad($Angle)) * $Force * $Factor + $X1;
-             $Y2 = sin(deg2rad($Angle)) * $Force * $Factor + $Y1;
+                $X2 = cos(deg2rad($Angle)) * $Force * $Factor + $X1;
+                $Y2 = sin(deg2rad($Angle)) * $Force * $Factor + $Y1;
 
-             $this->pChartObject->drawArrow($X1,$Y1,$X2,$Y2,$Color);
+                $this->pChartObject->drawArrow($X1,$Y1,$X2,$Y2,$Color);
             }
-          }
+            }
+        }
         }
-      }
 
-     return(array("Pass"=>$Jobs,"Conflicts"=>$Conflicts));
+        return(array("Pass"=>$Jobs,"Conflicts"=>$Conflicts));
     }
 
-   /* Return the distance between two points */
-   function getDistance($X1,$Y1,$X2,$Y2)
+    /* Return the distance between two points */
+    function getDistance($X1,$Y1,$X2,$Y2)
     { return (sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1))); }
 
-   /* Return the angle made by a line and the X axis */
-   function getAngle($X1,$Y1,$X2,$Y2)
+    /* Return the angle made by a line and the X axis */
+    function getAngle($X1,$Y1,$X2,$Y2)
     {
-     $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
-     if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
+        $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
+        if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
     }
 
-   function intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4)
+    function intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4)
     {
-     $A = (($X3 * $Y4 - $X4 * $Y3) * ($X1 - $X2) - ($X1 * $Y2 - $X2 * $Y1) * ($X3 - $X4));
-     $B = (($Y1 - $Y2) * ($X3 - $X4) - ($Y3 - $Y4) * ($X1 - $X2));
+        $A = (($X3 * $Y4 - $X4 * $Y3) * ($X1 - $X2) - ($X1 * $Y2 - $X2 * $Y1) * ($X3 - $X4));
+        $B = (($Y1 - $Y2) * ($X3 - $X4) - ($Y3 - $Y4) * ($X1 - $X2));
 
-     if ( $B == 0 ) { return(FALSE); }
-     $Xi = $A / $B;
+        if ( $B == 0 ) { return(FALSE); }
+        $Xi = $A / $B;
 
-     $C = ($X1 - $X2);
-     if ( $C == 0 ) { return(FALSE); }
-     $Yi = $Xi * (($Y1 - $Y2)/$C) + (($X1 * $Y2 - $X2 * $Y1)/$C);
+        $C = ($X1 - $X2);
+        if ( $C == 0 ) { return(FALSE); }
+        $Yi = $Xi * (($Y1 - $Y2)/$C) + (($X1 * $Y2 - $X2 * $Y1)/$C);
 
-     if ( $Xi >= min($X1,$X2) && $Xi >= min($X3,$X4) && $Xi <= max($X1,$X2) && $Xi <= max($X3,$X4))
-      {
-       if ( $Yi >= min($Y1,$Y2) && $Yi >= min($Y3,$Y4) && $Yi <= max($Y1,$Y2) && $Yi <= max($Y3,$Y4))
+        if ( $Xi >= min($X1,$X2) && $Xi >= min($X3,$X4) && $Xi <= max($X1,$X2) && $Xi <= max($X3,$X4))
+        {
+        if ( $Yi >= min($Y1,$Y2) && $Yi >= min($Y3,$Y4) && $Yi <= max($Y1,$Y2) && $Yi <= max($Y3,$Y4))
         { return(TRUE); }
-      }
+        }
 
-      return(FALSE);   
+        return(FALSE);   
+    }
     }
-  }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pDraw.class.php

Indentation +5013 added lines, -5013 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pDraw - class extension with drawing methods
 
      Version     : 2.1.3
@@ -13,6181 +13,6181 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("DIRECTION_VERTICAL"		, 690001);
- define("DIRECTION_HORIZONTAL"		, 690002);
-
- define("SCALE_POS_LEFTRIGHT"		, 690101);
- define("SCALE_POS_TOPBOTTOM"		, 690102);
-
- define("SCALE_MODE_FLOATING"		, 690201);
- define("SCALE_MODE_START0"		, 690202);
- define("SCALE_MODE_ADDALL"		, 690203);
- define("SCALE_MODE_ADDALL_START0"	, 690204);
- define("SCALE_MODE_MANUAL"		, 690205);
-
- define("SCALE_SKIP_NONE"		, 690301);
- define("SCALE_SKIP_SAME"		, 690302);
- define("SCALE_SKIP_NUMBERS"		, 690303);
-
- define("TEXT_ALIGN_TOPLEFT"		, 690401);
- define("TEXT_ALIGN_TOPMIDDLE"		, 690402);
- define("TEXT_ALIGN_TOPRIGHT"		, 690403);
- define("TEXT_ALIGN_MIDDLELEFT"		, 690404);
- define("TEXT_ALIGN_MIDDLEMIDDLE"	, 690405);
- define("TEXT_ALIGN_MIDDLERIGHT"	, 690406);
- define("TEXT_ALIGN_BOTTOMLEFT"		, 690407);
- define("TEXT_ALIGN_BOTTOMMIDDLE"	, 690408);
- define("TEXT_ALIGN_BOTTOMRIGHT"	, 690409);
-
- define("POSITION_TOP"                  , 690501);
- define("POSITION_BOTTOM"               , 690502);
-
- define("LABEL_POS_LEFT"		, 690601);
- define("LABEL_POS_CENTER"		, 690602);
- define("LABEL_POS_RIGHT"		, 690603);
- define("LABEL_POS_TOP"			, 690604);
- define("LABEL_POS_BOTTOM"		, 690605);
- define("LABEL_POS_INSIDE"		, 690606);
- define("LABEL_POS_OUTSIDE"		, 690607);
-
- define("ORIENTATION_HORIZONTAL"	, 690701);
- define("ORIENTATION_VERTICAL"		, 690702);
- define("ORIENTATION_AUTO"		, 690703);
-
- define("LEGEND_NOBORDER"		, 690800);
- define("LEGEND_BOX"			, 690801);
- define("LEGEND_ROUND"			, 690802);
-
- define("LEGEND_VERTICAL"		, 690901);
- define("LEGEND_HORIZONTAL"		, 690902);
-
- define("LEGEND_FAMILY_BOX"		, 691051);
- define("LEGEND_FAMILY_CIRCLE"		, 691052);
- define("LEGEND_FAMILY_LINE"		, 691053);
-
- define("DISPLAY_AUTO"			, 691001);
- define("DISPLAY_MANUAL"		, 691002);
-
- define("LABELING_ALL"			, 691011);
- define("LABELING_DIFFERENT"		, 691012);
-
- define("BOUND_MIN"			, 691021);
- define("BOUND_MAX"			, 691022);
- define("BOUND_BOTH"			, 691023);
-
- define("BOUND_LABEL_POS_TOP"		, 691031);
- define("BOUND_LABEL_POS_BOTTOM"	, 691032);
- define("BOUND_LABEL_POS_AUTO"		, 691033);
-
- define("CAPTION_LEFT_TOP"		, 691041);
- define("CAPTION_RIGHT_BOTTOM"		, 691042);
-
- define("GRADIENT_SIMPLE"		, 691051);
- define("GRADIENT_EFFECT_CAN"		, 691052);
-
- define("LABEL_TITLE_NOBACKGROUND"	, 691061);
- define("LABEL_TITLE_BACKGROUND"	, 691062);
-
- define("LABEL_POINT_NONE"		, 691071);
- define("LABEL_POINT_CIRCLE"		, 691072);
- define("LABEL_POINT_BOX"		, 691073);
-
- define("ZONE_NAME_ANGLE_AUTO"		, 691081);
-
- define("PI"		, 3.14159265);
- define("ALL"		, 69);
- define("NONE"		, 31);
- define("AUTO"		, 690000);
- define("OUT_OF_SIGHT"	, -10000000000000);
-
- class pDraw
-  {
-   /* Returns the number of drawable series */
-   function countDrawableSeries()
+    define("DIRECTION_VERTICAL"		, 690001);
+    define("DIRECTION_HORIZONTAL"		, 690002);
+
+    define("SCALE_POS_LEFTRIGHT"		, 690101);
+    define("SCALE_POS_TOPBOTTOM"		, 690102);
+
+    define("SCALE_MODE_FLOATING"		, 690201);
+    define("SCALE_MODE_START0"		, 690202);
+    define("SCALE_MODE_ADDALL"		, 690203);
+    define("SCALE_MODE_ADDALL_START0"	, 690204);
+    define("SCALE_MODE_MANUAL"		, 690205);
+
+    define("SCALE_SKIP_NONE"		, 690301);
+    define("SCALE_SKIP_SAME"		, 690302);
+    define("SCALE_SKIP_NUMBERS"		, 690303);
+
+    define("TEXT_ALIGN_TOPLEFT"		, 690401);
+    define("TEXT_ALIGN_TOPMIDDLE"		, 690402);
+    define("TEXT_ALIGN_TOPRIGHT"		, 690403);
+    define("TEXT_ALIGN_MIDDLELEFT"		, 690404);
+    define("TEXT_ALIGN_MIDDLEMIDDLE"	, 690405);
+    define("TEXT_ALIGN_MIDDLERIGHT"	, 690406);
+    define("TEXT_ALIGN_BOTTOMLEFT"		, 690407);
+    define("TEXT_ALIGN_BOTTOMMIDDLE"	, 690408);
+    define("TEXT_ALIGN_BOTTOMRIGHT"	, 690409);
+
+    define("POSITION_TOP"                  , 690501);
+    define("POSITION_BOTTOM"               , 690502);
+
+    define("LABEL_POS_LEFT"		, 690601);
+    define("LABEL_POS_CENTER"		, 690602);
+    define("LABEL_POS_RIGHT"		, 690603);
+    define("LABEL_POS_TOP"			, 690604);
+    define("LABEL_POS_BOTTOM"		, 690605);
+    define("LABEL_POS_INSIDE"		, 690606);
+    define("LABEL_POS_OUTSIDE"		, 690607);
+
+    define("ORIENTATION_HORIZONTAL"	, 690701);
+    define("ORIENTATION_VERTICAL"		, 690702);
+    define("ORIENTATION_AUTO"		, 690703);
+
+    define("LEGEND_NOBORDER"		, 690800);
+    define("LEGEND_BOX"			, 690801);
+    define("LEGEND_ROUND"			, 690802);
+
+    define("LEGEND_VERTICAL"		, 690901);
+    define("LEGEND_HORIZONTAL"		, 690902);
+
+    define("LEGEND_FAMILY_BOX"		, 691051);
+    define("LEGEND_FAMILY_CIRCLE"		, 691052);
+    define("LEGEND_FAMILY_LINE"		, 691053);
+
+    define("DISPLAY_AUTO"			, 691001);
+    define("DISPLAY_MANUAL"		, 691002);
+
+    define("LABELING_ALL"			, 691011);
+    define("LABELING_DIFFERENT"		, 691012);
+
+    define("BOUND_MIN"			, 691021);
+    define("BOUND_MAX"			, 691022);
+    define("BOUND_BOTH"			, 691023);
+
+    define("BOUND_LABEL_POS_TOP"		, 691031);
+    define("BOUND_LABEL_POS_BOTTOM"	, 691032);
+    define("BOUND_LABEL_POS_AUTO"		, 691033);
+
+    define("CAPTION_LEFT_TOP"		, 691041);
+    define("CAPTION_RIGHT_BOTTOM"		, 691042);
+
+    define("GRADIENT_SIMPLE"		, 691051);
+    define("GRADIENT_EFFECT_CAN"		, 691052);
+
+    define("LABEL_TITLE_NOBACKGROUND"	, 691061);
+    define("LABEL_TITLE_BACKGROUND"	, 691062);
+
+    define("LABEL_POINT_NONE"		, 691071);
+    define("LABEL_POINT_CIRCLE"		, 691072);
+    define("LABEL_POINT_BOX"		, 691073);
+
+    define("ZONE_NAME_ANGLE_AUTO"		, 691081);
+
+    define("PI"		, 3.14159265);
+    define("ALL"		, 69);
+    define("NONE"		, 31);
+    define("AUTO"		, 690000);
+    define("OUT_OF_SIGHT"	, -10000000000000);
+
+    class pDraw
+    {
+    /* Returns the number of drawable series */
+    function countDrawableSeries()
     {
-     $Results = 0;
-     $Data = $this->DataSet->getData();
+        $Results = 0;
+        $Data = $this->DataSet->getData();
 
-     foreach($Data["Series"] as $SerieName => $Serie)
-      { if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) { $Results++; } }
+        foreach($Data["Series"] as $SerieName => $Serie)
+        { if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) { $Results++; } }
 
-     return($Results);
+        return($Results);
     }
 
-   /* Fix box coordinates */
-   function fixBoxCoordinates($Xa,$Ya,$Xb,$Yb)
+    /* Fix box coordinates */
+    function fixBoxCoordinates($Xa,$Ya,$Xb,$Yb)
     {
-     $X1 = min($Xa,$Xb); $Y1 = min($Ya,$Yb);
-     $X2 = max($Xa,$Xb); $Y2 = max($Ya,$Yb);
+        $X1 = min($Xa,$Xb); $Y1 = min($Ya,$Yb);
+        $X2 = max($Xa,$Xb); $Y2 = max($Ya,$Yb);
 
-     return(array($X1,$Y1,$X2,$Y2));
+        return(array($X1,$Y1,$X2,$Y2));
     }
 
-   /* Draw a polygon */
-   function drawPolygon($Points,$Format="")
+    /* Draw a polygon */
+    function drawPolygon($Points,$Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : 0;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $NoFill		= isset($Format["NoFill"]) ? $Format["NoFill"] : FALSE;
-     $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
-     $BorderAlpha 	= isset($Format["Alpha"]) ? $Format["Alpha"] : $Alpha / 2;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $SkipX		= isset($Format["SkipX"]) ? $Format["SkipX"] : OUT_OF_SIGHT;
-     $SkipY		= isset($Format["SkipY"]) ? $Format["SkipY"] : OUT_OF_SIGHT;
-
-     /* Calling the ImageFilledPolygon() function over the $Points array will round it */ 	
-     $Backup = $Points;
-
-     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-
-     if ( $SkipX != OUT_OF_SIGHT ) { $SkipX = floor($SkipX); }
-     if ( $SkipY != OUT_OF_SIGHT ) { $SkipY = floor($SkipY); }
-
-     $RestoreShadow = $this->Shadow;
-     if ( !$NoFill )
-      {
-       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-        {
-         $this->Shadow = FALSE;
-         for($i=0;$i<=count($Points)-1;$i=$i+2)
-          { $Shadow[] = $Points[$i] + $this->ShadowX; $Shadow[] = $Points[$i+1] + $this->ShadowY; }
-         $this->drawPolygon($Shadow,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"NoBorder"=>TRUE));
-        }
-
-       $FillColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-
-       if ( count($Points) >= 6 )
+        $R			= isset($Format["R"]) ? $Format["R"] : 0;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $NoFill		= isset($Format["NoFill"]) ? $Format["NoFill"] : FALSE;
+        $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+        $BorderAlpha 	= isset($Format["Alpha"]) ? $Format["Alpha"] : $Alpha / 2;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $SkipX		= isset($Format["SkipX"]) ? $Format["SkipX"] : OUT_OF_SIGHT;
+        $SkipY		= isset($Format["SkipY"]) ? $Format["SkipY"] : OUT_OF_SIGHT;
+
+        /* Calling the ImageFilledPolygon() function over the $Points array will round it */ 	
+        $Backup = $Points;
+
+        if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+
+        if ( $SkipX != OUT_OF_SIGHT ) { $SkipX = floor($SkipX); }
+        if ( $SkipY != OUT_OF_SIGHT ) { $SkipY = floor($SkipY); }
+
+        $RestoreShadow = $this->Shadow;
+        if ( !$NoFill )
+        {
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+            $this->Shadow = FALSE;
+            for($i=0;$i<=count($Points)-1;$i=$i+2)
+            { $Shadow[] = $Points[$i] + $this->ShadowX; $Shadow[] = $Points[$i+1] + $this->ShadowY; }
+            $this->drawPolygon($Shadow,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"NoBorder"=>TRUE));
+        }
+
+        $FillColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+
+        if ( count($Points) >= 6 )
         { ImageFilledPolygon($this->Picture,$Points,count($Points)/2,$FillColor); }
-      }
+        }
 
-     if ( !$NoBorder )
-      {
-       $Points = $Backup;
+        if ( !$NoBorder )
+        {
+        $Points = $Backup;
 
-       if ( $NoFill )
+        if ( $NoFill )
         $BorderSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-       else
+        else
         $BorderSettings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
 
-       for($i=0;$i<=count($Points)-1;$i=$i+2)
+        for($i=0;$i<=count($Points)-1;$i=$i+2)
         {
-         if ( isset($Points[$i+2]) )
-          {
-           if ( !($Points[$i] == $Points[$i+2] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[$i+3] && $Points[$i+1] == $SkipY ) )
+            if ( isset($Points[$i+2]) )
+            {
+            if ( !($Points[$i] == $Points[$i+2] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[$i+3] && $Points[$i+1] == $SkipY ) )
             $this->drawLine($Points[$i],$Points[$i+1],$Points[$i+2],$Points[$i+3],$BorderSettings);
-          }
-         else
-          {
-           if ( !($Points[$i] == $Points[0] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[1] && $Points[$i+1] == $SkipY ) )
+            }
+            else
+            {
+            if ( !($Points[$i] == $Points[0] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[1] && $Points[$i+1] == $SkipY ) )
             $this->drawLine($Points[$i],$Points[$i+1],$Points[0],$Points[1],$BorderSettings);
-          }
+            }
+        }
         }
-      }
 
-     $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Apply AALias correction to the rounded box boundaries */
-   function offsetCorrection($Value,$Mode)
+    /* Apply AALias correction to the rounded box boundaries */
+    function offsetCorrection($Value,$Mode)
     {
-     $Value = round($Value,1);
+        $Value = round($Value,1);
 
-     if ( $Value == 0 && $Mode == 1 ) { return(.9); }
-     if ( $Value == 0 ) { return(0); }
+        if ( $Value == 0 && $Mode == 1 ) { return(.9); }
+        if ( $Value == 0 ) { return(0); }
 
-     if ( $Mode == 1) 
-      { if ( $Value == 1 ) { return(.9); }; if ( $Value == .1 ) { return(.9); }; if ( $Value == .2 ) { return(.8); }; if ( $Value == .3 ) { return(.8); }; if ( $Value == .4 ) { return(.7); }; if ( $Value == .5 ) { return(.5); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.6); }; if ( $Value == .9 ) { return(.9); }; }
+        if ( $Mode == 1) 
+        { if ( $Value == 1 ) { return(.9); }; if ( $Value == .1 ) { return(.9); }; if ( $Value == .2 ) { return(.8); }; if ( $Value == .3 ) { return(.8); }; if ( $Value == .4 ) { return(.7); }; if ( $Value == .5 ) { return(.5); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.6); }; if ( $Value == .9 ) { return(.9); }; }
 
-     if ( $Mode == 2) 
-      { if ( $Value == 1 ) { return(.9); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.4); }; if ( $Value == .5 ) { return(.5); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.8); }; if ( $Value == .9 ) { return(.9); }; }
+        if ( $Mode == 2) 
+        { if ( $Value == 1 ) { return(.9); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.4); }; if ( $Value == .5 ) { return(.5); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.8); }; if ( $Value == .9 ) { return(.9); }; }
 
-     if ( $Mode == 3) 
-      { if ( $Value == 1 ) { return(.1); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.4); }; if ( $Value == .5 ) { return(.9); }; if ( $Value == .6 ) { return(.6); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.4); }; if ( $Value == .9 ) { return(.5); }; }
+        if ( $Mode == 3) 
+        { if ( $Value == 1 ) { return(.1); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.4); }; if ( $Value == .5 ) { return(.9); }; if ( $Value == .6 ) { return(.6); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.4); }; if ( $Value == .9 ) { return(.5); }; }
 
-     if ( $Mode == 4) 
-      { if ( $Value == 1 ) { return(-1); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.1); }; if ( $Value == .5 ) { return(-.1); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.1); }; if ( $Value == .8 ) { return(.1); }; if ( $Value == .9 ) { return(.1); }; }
+        if ( $Mode == 4) 
+        { if ( $Value == 1 ) { return(-1); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.1); }; if ( $Value == .5 ) { return(-.1); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.1); }; if ( $Value == .8 ) { return(.1); }; if ( $Value == .9 ) { return(.1); }; }
     }
 
-   /* Draw a rectangle with rounded corners */
-   function drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="")
+    /* Draw a rectangle with rounded corners */
+    function drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="")
     {
-     $R	    = isset($Format["R"]) ? $Format["R"] : 0;
-     $G	    = isset($Format["G"]) ? $Format["G"] : 0;
-     $B	    = isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-
-     list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
-
-     if ( $X2 - $X1 < $Radius ) { $Radius = floor((($X2-$X1))/2); }
-     if ( $Y2 - $Y1 < $Radius ) { $Radius = floor((($Y2-$Y1))/2); }
-
-     $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE);
-
-     if ( $Radius <= 0 ) { $this->drawRectangle($X1,$Y1,$X2,$Y2,$Color); return(0); }
-
-     if ( $this->Antialias )
-      {
-       $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
-       $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
-       $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$Color);
-       $this->drawLine($X1,$Y1+$Radius,$X1,$Y2-$Radius,$Color);
-      }
-     else
-      {
-       $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-       imageline($this->Picture,$X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
-       imageline($this->Picture,$X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
-       imageline($this->Picture,$X2-$Radius,$Y2,$X1+$Radius,$Y2,$Color);
-       imageline($this->Picture,$X1,$Y1+$Radius,$X1,$Y2-$Radius,$Color);
-      }
-
-     $Step = 360 / (2 * PI * $Radius);
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
-       $X = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
-       $Y = sin(($i+180)*PI/180) * $Radius + $Y1 + $Radius;
-       $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-
-       $X = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
-       $Y = sin(($i+90)*PI/180) * $Radius + $Y2 - $Radius;
-       $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-
-       $X = cos($i*PI/180) * $Radius + $X2 - $Radius;
-       $Y = sin($i*PI/180) * $Radius + $Y2 - $Radius;
-       $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-
-       $X = cos(($i+270)*PI/180) * $Radius + $X2 - $Radius;
-       $Y = sin(($i+270)*PI/180) * $Radius + $Y1 + $Radius;
-       $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
+        $R	    = isset($Format["R"]) ? $Format["R"] : 0;
+        $G	    = isset($Format["G"]) ? $Format["G"] : 0;
+        $B	    = isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+
+        list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
+
+        if ( $X2 - $X1 < $Radius ) { $Radius = floor((($X2-$X1))/2); }
+        if ( $Y2 - $Y1 < $Radius ) { $Radius = floor((($Y2-$Y1))/2); }
+
+        $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE);
+
+        if ( $Radius <= 0 ) { $this->drawRectangle($X1,$Y1,$X2,$Y2,$Color); return(0); }
+
+        if ( $this->Antialias )
+        {
+        $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
+        $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
+        $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$Color);
+        $this->drawLine($X1,$Y1+$Radius,$X1,$Y2-$Radius,$Color);
+        }
+        else
+        {
+        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        imageline($this->Picture,$X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
+        imageline($this->Picture,$X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
+        imageline($this->Picture,$X2-$Radius,$Y2,$X1+$Radius,$Y2,$Color);
+        imageline($this->Picture,$X1,$Y1+$Radius,$X1,$Y2-$Radius,$Color);
+        }
+
+        $Step = 360 / (2 * PI * $Radius);
+        for($i=0;$i<=90;$i=$i+$Step)
+        {
+        $X = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
+        $Y = sin(($i+180)*PI/180) * $Radius + $Y1 + $Radius;
+        $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+        $X = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
+        $Y = sin(($i+90)*PI/180) * $Radius + $Y2 - $Radius;
+        $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+        $X = cos($i*PI/180) * $Radius + $X2 - $Radius;
+        $Y = sin($i*PI/180) * $Radius + $Y2 - $Radius;
+        $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+        $X = cos(($i+270)*PI/180) * $Radius + $X2 - $Radius;
+        $Y = sin(($i+270)*PI/180) * $Radius + $Y1 + $Radius;
+        $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        }
     }
 
-   /* Draw a rectangle with rounded corners */
-   function drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="")
+    /* Draw a rectangle with rounded corners */
+    function drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : 0;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-
-     /* Temporary fix for AA issue */
-     $Y1 = floor($Y1); $Y2 = floor($Y2); $X1 = floor($X1); $X2 = floor($X2);
-
-     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-     if ( $BorderR == -1 ) { $BorderR = $R; $BorderG = $G; $BorderB = $B; }
-
-     list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
-
-     if ( $X2 - $X1 < $Radius*2 ) { $Radius = floor((($X2-$X1))/4); }
-     if ( $Y2 - $Y1 < $Radius*2 ) { $Radius = floor((($Y2-$Y1))/4); }
-
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $this->Shadow = FALSE;
-       $this->drawRoundedFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
-      }
-
-     $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE);
-
-     if ( $Radius <= 0 ) { $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color); return(0); }
-
-     $YTop    = $Y1+$Radius;
-     $YBottom = $Y2-$Radius;
-
-     $Step = 360 / (2 * PI * $Radius);
-     $Positions = ""; $Radius--; $MinY = ""; $MaxY = "";
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
-       $Xp1 = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
-       $Xp2 = cos(((90-$i)+270)*PI/180) * $Radius + $X2 - $Radius;
-       $Yp  = floor(sin(($i+180)*PI/180) * $Radius + $YTop);
-       if ( $MinY == "" || $Yp > $MinY ) { $MinY = $Yp; }
-
-       if ( $Xp1 <= floor($X1) )  { $Xp1++; }
-       if ( $Xp2 >= floor($X2) )  { $Xp2--; }
-       $Xp1++;
-
-       if ( !isset($Positions[$Yp]) )
+        $R			= isset($Format["R"]) ? $Format["R"] : 0;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+
+        /* Temporary fix for AA issue */
+        $Y1 = floor($Y1); $Y2 = floor($Y2); $X1 = floor($X1); $X2 = floor($X2);
+
+        if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+        if ( $BorderR == -1 ) { $BorderR = $R; $BorderG = $G; $BorderB = $B; }
+
+        list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
+
+        if ( $X2 - $X1 < $Radius*2 ) { $Radius = floor((($X2-$X1))/4); }
+        if ( $Y2 - $Y1 < $Radius*2 ) { $Radius = floor((($Y2-$Y1))/4); }
+
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $this->Shadow = FALSE;
+        $this->drawRoundedFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+        }
+
+        $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE);
+
+        if ( $Radius <= 0 ) { $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color); return(0); }
+
+        $YTop    = $Y1+$Radius;
+        $YBottom = $Y2-$Radius;
+
+        $Step = 360 / (2 * PI * $Radius);
+        $Positions = ""; $Radius--; $MinY = ""; $MaxY = "";
+        for($i=0;$i<=90;$i=$i+$Step)
+        {
+        $Xp1 = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
+        $Xp2 = cos(((90-$i)+270)*PI/180) * $Radius + $X2 - $Radius;
+        $Yp  = floor(sin(($i+180)*PI/180) * $Radius + $YTop);
+        if ( $MinY == "" || $Yp > $MinY ) { $MinY = $Yp; }
+
+        if ( $Xp1 <= floor($X1) )  { $Xp1++; }
+        if ( $Xp2 >= floor($X2) )  { $Xp2--; }
+        $Xp1++;
+
+        if ( !isset($Positions[$Yp]) )
         { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; }
-       else
+        else
         { $Positions[$Yp]["X1"] = ($Positions[$Yp]["X1"]+$Xp1)/2; $Positions[$Yp]["X2"] = ($Positions[$Yp]["X2"]+$Xp2)/2; }
 
-       $Xp1 = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
-       $Xp2 = cos((90-$i)*PI/180) * $Radius + $X2 - $Radius;
-       $Yp  = floor(sin(($i+90)*PI/180) * $Radius + $YBottom);
-       if ( $MaxY == "" || $Yp < $MaxY ) { $MaxY = $Yp; }
+        $Xp1 = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
+        $Xp2 = cos((90-$i)*PI/180) * $Radius + $X2 - $Radius;
+        $Yp  = floor(sin(($i+90)*PI/180) * $Radius + $YBottom);
+        if ( $MaxY == "" || $Yp < $MaxY ) { $MaxY = $Yp; }
 
-       if ( $Xp1 <= floor($X1) ) { $Xp1++; }
-       if ( $Xp2 >= floor($X2) ) { $Xp2--; }
-       $Xp1++;
+        if ( $Xp1 <= floor($X1) ) { $Xp1++; }
+        if ( $Xp2 >= floor($X2) ) { $Xp2--; }
+        $Xp1++;
 
-       if ( !isset($Positions[$Yp]) )
+        if ( !isset($Positions[$Yp]) )
         { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; }
-       else
+        else
         { $Positions[$Yp]["X1"] = ($Positions[$Yp]["X1"]+$Xp1)/2; $Positions[$Yp]["X2"] = ($Positions[$Yp]["X2"]+$Xp2)/2; }
-      }
+        }
 
-     $ManualColor  = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     foreach($Positions as $Yp => $Bounds)
-      {
-       $X1 = $Bounds["X1"]; $X1Dec = $this->getFirstDecimal($X1); if ( $X1Dec != 0 ) { $X1 = floor($X1)+1; }
-       $X2 = $Bounds["X2"]; $X2Dec = $this->getFirstDecimal($X2); if ( $X2Dec != 0 ) { $X2 = floor($X2)-1; }
-       imageline($this->Picture,$X1,$Yp,$X2,$Yp,$ManualColor);
-      }
-     $this->drawFilledRectangle($X1,$MinY+1,floor($X2),$MaxY-1,$Color);
+        $ManualColor  = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        foreach($Positions as $Yp => $Bounds)
+        {
+        $X1 = $Bounds["X1"]; $X1Dec = $this->getFirstDecimal($X1); if ( $X1Dec != 0 ) { $X1 = floor($X1)+1; }
+        $X2 = $Bounds["X2"]; $X2Dec = $this->getFirstDecimal($X2); if ( $X2Dec != 0 ) { $X2 = floor($X2)-1; }
+        imageline($this->Picture,$X1,$Yp,$X2,$Yp,$ManualColor);
+        }
+        $this->drawFilledRectangle($X1,$MinY+1,floor($X2),$MaxY-1,$Color);
 
-     $Radius++;
-     $this->drawRoundedRectangle($X1,$Y1,$X2+1,$Y2-1,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+        $Radius++;
+        $this->drawRoundedRectangle($X1,$Y1,$X2+1,$Y2-1,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
 
-     $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Draw a rectangle with rounded corners */
-   function drawRoundedFilledRectangle_deprecated($X1,$Y1,$X2,$Y2,$Radius,$Format="")
+    /* Draw a rectangle with rounded corners */
+    function drawRoundedFilledRectangle_deprecated($X1,$Y1,$X2,$Y2,$Radius,$Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : 0;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $R			= isset($Format["R"]) ? $Format["R"] : 0;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
 
-     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-     if ( $BorderR == -1 ) { $BorderR = $R; $BorderG = $G; $BorderB = $B; }
+        if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+        if ( $BorderR == -1 ) { $BorderR = $R; $BorderG = $G; $BorderB = $B; }
 
-     list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
+        list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
 
-     if ( $X2 - $X1 < $Radius ) { $Radius = floor((($X2-$X1)+2)/2); }
-     if ( $Y2 - $Y1 < $Radius ) { $Radius = floor((($Y2-$Y1)+2)/2); }
+        if ( $X2 - $X1 < $Radius ) { $Radius = floor((($X2-$X1)+2)/2); }
+        if ( $Y2 - $Y1 < $Radius ) { $Radius = floor((($Y2-$Y1)+2)/2); }
 
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $this->Shadow = FALSE;
-       $this->drawRoundedFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
-      }
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $this->Shadow = FALSE;
+        $this->drawRoundedFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+        }
 
-     if ( $this->getFirstDecimal($X2) >= 5 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
-     if ( $this->getFirstDecimal($X1) <= 5 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
+        if ( $this->getFirstDecimal($X2) >= 5 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
+        if ( $this->getFirstDecimal($X1) <= 5 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
 
-     if ( !$this->Antialias ) { $XOffset1 = 1; $XOffset2 = 1; }
+        if ( !$this->Antialias ) { $XOffset1 = 1; $XOffset2 = 1; }
 
-     $YTop    = floor($Y1+$Radius);
-     $YBottom = floor($Y2-$Radius);
+        $YTop    = floor($Y1+$Radius);
+        $YBottom = floor($Y2-$Radius);
 
-     $this->drawFilledRectangle($X1-$XOffset1,$YTop,$X2+$XOffset2,$YBottom,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE));
+        $this->drawFilledRectangle($X1-$XOffset1,$YTop,$X2+$XOffset2,$YBottom,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE));
 
-     $Step = 360 / (2 * PI * $Radius);
-     $Color  = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     $Color2 = $this->allocateColor($this->Picture,255,0,0,$Alpha);
-     $Drawn = "";
+        $Step = 360 / (2 * PI * $Radius);
+        $Color  = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        $Color2 = $this->allocateColor($this->Picture,255,0,0,$Alpha);
+        $Drawn = "";
 
-     if ( $Alpha < 100 )  { $Drawn[$YTop] = FALSE; }
-     if ( $Alpha < 100 )  { $Drawn[$YBottom] = TRUE; }
+        if ( $Alpha < 100 )  { $Drawn[$YTop] = FALSE; }
+        if ( $Alpha < 100 )  { $Drawn[$YBottom] = TRUE; }
      
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
-       $Xp1 = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
-       $Xp2 = cos(((90-$i)+270)*PI/180) * $Radius + $X2 - $Radius;
-       $Yp  = sin(($i+180)*PI/180) * $Radius + $YTop;
+        for($i=0;$i<=90;$i=$i+$Step)
+        {
+        $Xp1 = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
+        $Xp2 = cos(((90-$i)+270)*PI/180) * $Radius + $X2 - $Radius;
+        $Yp  = sin(($i+180)*PI/180) * $Radius + $YTop;
 
-       if ( $this->getFirstDecimal($Xp1) > 5 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
-       if ( $this->getFirstDecimal($Xp2) > 5 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
-       if ( $this->getFirstDecimal($Yp) > 5 )  { $YOffset = 1; } else { $YOffset = 0; }
+        if ( $this->getFirstDecimal($Xp1) > 5 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
+        if ( $this->getFirstDecimal($Xp2) > 5 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
+        if ( $this->getFirstDecimal($Yp) > 5 )  { $YOffset = 1; } else { $YOffset = 0; }
 
-       if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 )
+        if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 )
         imageline($this->Picture,$Xp1+$XOffset1,$Yp+$YOffset,$Xp2+$XOffset2,$Yp+$YOffset,$Color);
 
-       $Drawn[$Yp+$YOffset] = $Xp2;
+        $Drawn[$Yp+$YOffset] = $Xp2;
 
-       $Xp1 = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
-       $Xp2 = cos((90-$i)*PI/180) * $Radius + $X2 - $Radius;
-       $Yp  = sin(($i+90)*PI/180) * $Radius + $YBottom;
+        $Xp1 = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
+        $Xp2 = cos((90-$i)*PI/180) * $Radius + $X2 - $Radius;
+        $Yp  = sin(($i+90)*PI/180) * $Radius + $YBottom;
 
-       if ( $this->getFirstDecimal($Xp1) > 7 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
-       if ( $this->getFirstDecimal($Xp2) > 7 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
-       if ( $this->getFirstDecimal($Yp) > 5 )  { $YOffset = 1; } else { $YOffset = 0; }
+        if ( $this->getFirstDecimal($Xp1) > 7 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
+        if ( $this->getFirstDecimal($Xp2) > 7 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
+        if ( $this->getFirstDecimal($Yp) > 5 )  { $YOffset = 1; } else { $YOffset = 0; }
 
-       if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 )
+        if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 )
         imageline($this->Picture,$Xp1+$XOffset1,$Yp+$YOffset,$Xp2+$XOffset2,$Yp+$YOffset,$Color);
 
-       $Drawn[$Yp+$YOffset] = $Xp2;
-      }
+        $Drawn[$Yp+$YOffset] = $Xp2;
+        }
 
-     $this->drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+        $this->drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
 
-     $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Draw a rectangle */
-   function drawRectangle($X1,$Y1,$X2,$Y2,$Format="")
+    /* Draw a rectangle */
+    function drawRectangle($X1,$Y1,$X2,$Y2,$Format="")
     {
-     $R		= isset($Format["R"]) ? $Format["R"] : 0;
-     $G		= isset($Format["G"]) ? $Format["G"] : 0;
-     $B		= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $NoAngle	= isset($Format["NoAngle"]) ? $Format["NoAngle"] : FALSE;
-
-     if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
-     if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
-
-     if ( $this->Antialias )
-      {
-       if ( $NoAngle )
-        {
-         $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-         $this->drawLine($X2,$Y1+1,$X2,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-         $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-         $this->drawLine($X1,$Y1+1,$X1,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-        }
-       else
-        {
-         $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-         $this->drawLine($X2,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-         $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-         $this->drawLine($X1,$Y1,$X1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-        }
-      }
-     else
-      {
-       $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-       imagerectangle($this->Picture,$X1,$Y1,$X2,$Y2,$Color);
-      }
+        $R		= isset($Format["R"]) ? $Format["R"] : 0;
+        $G		= isset($Format["G"]) ? $Format["G"] : 0;
+        $B		= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $NoAngle	= isset($Format["NoAngle"]) ? $Format["NoAngle"] : FALSE;
+
+        if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
+        if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
+
+        if ( $this->Antialias )
+        {
+        if ( $NoAngle )
+        {
+            $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            $this->drawLine($X2,$Y1+1,$X2,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            $this->drawLine($X1,$Y1+1,$X1,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+        }
+        else
+        {
+            $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            $this->drawLine($X2,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            $this->drawLine($X1,$Y1,$X1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+        }
+        }
+        else
+        {
+        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        imagerectangle($this->Picture,$X1,$Y1,$X2,$Y2,$Color);
+        }
     }
 
-   /* Draw a filled rectangle */
-   function drawFilledRectangle($X1,$Y1,$X2,$Y2,$Format="")
+    /* Draw a filled rectangle */
+    function drawFilledRectangle($X1,$Y1,$X2,$Y2,$Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : 0;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
-     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $NoAngle		= isset($Format["NoAngle"]) ? $Format["NoAngle"] : NULL;
-     $Dash		= isset($Format["Dash"]) ? $Format["Dash"] : FALSE;
-     $DashStep		= isset($Format["DashStep"]) ? $Format["DashStep"] : 4;
-     $DashR		= isset($Format["DashR"]) ? $Format["DashR"] : 0;
-     $DashG		= isset($Format["DashG"]) ? $Format["DashG"] : 0;
-     $DashB		= isset($Format["DashB"]) ? $Format["DashB"] : 0;
-     $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
-
-     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-
-     if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
-     if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
-
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $this->Shadow = FALSE;
-       $this->drawFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
-      }
-
-     $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     if ( $NoAngle )
-      {
-       imagefilledrectangle($this->Picture,ceil($X1)+1,ceil($Y1),floor($X2)-1,floor($Y2),$Color);
-       imageline($this->Picture,ceil($X1),ceil($Y1)+1,ceil($X1),floor($Y2)-1,$Color);
-       imageline($this->Picture,floor($X2),ceil($Y1)+1,floor($X2),floor($Y2)-1,$Color);
-      }
-     else
-      imagefilledrectangle($this->Picture,ceil($X1),ceil($Y1),floor($X2),floor($Y2),$Color);
-
-     if ( $Dash )
-      {
-       if ( $BorderR != -1 ) { $iX1=$X1+1; $iY1=$Y1+1; $iX2=$X2-1; $iY2=$Y2-1; } else { $iX1=$X1; $iY1=$Y1; $iX2=$X2; $iY2=$Y2; }
-
-       $Color = $this->allocateColor($this->Picture,$DashR,$DashG,$DashB,$Alpha);
-       $Y=$iY1-$DashStep;
-       for($X=$iX1; $X<=$iX2+($iY2-$iY1); $X=$X+$DashStep)
-        {
-         $Y=$Y+$DashStep;
-         if ( $X > $iX2 ) { $Xa = $X-($X-$iX2); $Ya = $iY1+($X-$iX2); } else { $Xa = $X; $Ya = $iY1; }
-         if ( $Y > $iY2 ) { $Xb = $iX1+($Y-$iY2); $Yb = $Y-($Y-$iY2); } else { $Xb = $iX1; $Yb = $Y; }
-         imageline($this->Picture,$Xa,$Ya,$Xb,$Yb,$Color);
-        }
-      }
-
-     if ( $this->Antialias && !$NoBorder )
-      {
-       if ( $X1 < ceil($X1) )
-        {
-         $AlphaA = $Alpha * (ceil($X1) - $X1);
-         $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
-         imageline($this->Picture,ceil($X1)-1,ceil($Y1),ceil($X1)-1,floor($Y2),$Color);
-        }
-
-       if ( $Y1 < ceil($Y1) )
-        {
-         $AlphaA = $Alpha * (ceil($Y1) - $Y1);
-         $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
-         imageline($this->Picture,ceil($X1),ceil($Y1)-1,floor($X2),ceil($Y1)-1,$Color);
-        }
-
-       if ( $X2 > floor($X2) )
-        {
-         $AlphaA = $Alpha * (.5-($X2 - floor($X2)));
-         $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
-         imageline($this->Picture,floor($X2)+1,ceil($Y1),floor($X2)+1,floor($Y2),$Color);
+        $R			= isset($Format["R"]) ? $Format["R"] : 0;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+        $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $NoAngle		= isset($Format["NoAngle"]) ? $Format["NoAngle"] : NULL;
+        $Dash		= isset($Format["Dash"]) ? $Format["Dash"] : FALSE;
+        $DashStep		= isset($Format["DashStep"]) ? $Format["DashStep"] : 4;
+        $DashR		= isset($Format["DashR"]) ? $Format["DashR"] : 0;
+        $DashG		= isset($Format["DashG"]) ? $Format["DashG"] : 0;
+        $DashB		= isset($Format["DashB"]) ? $Format["DashB"] : 0;
+        $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
+
+        if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+
+        if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
+        if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
+
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $this->Shadow = FALSE;
+        $this->drawFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
+        }
+
+        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        if ( $NoAngle )
+        {
+        imagefilledrectangle($this->Picture,ceil($X1)+1,ceil($Y1),floor($X2)-1,floor($Y2),$Color);
+        imageline($this->Picture,ceil($X1),ceil($Y1)+1,ceil($X1),floor($Y2)-1,$Color);
+        imageline($this->Picture,floor($X2),ceil($Y1)+1,floor($X2),floor($Y2)-1,$Color);
+        }
+        else
+        imagefilledrectangle($this->Picture,ceil($X1),ceil($Y1),floor($X2),floor($Y2),$Color);
+
+        if ( $Dash )
+        {
+        if ( $BorderR != -1 ) { $iX1=$X1+1; $iY1=$Y1+1; $iX2=$X2-1; $iY2=$Y2-1; } else { $iX1=$X1; $iY1=$Y1; $iX2=$X2; $iY2=$Y2; }
+
+        $Color = $this->allocateColor($this->Picture,$DashR,$DashG,$DashB,$Alpha);
+        $Y=$iY1-$DashStep;
+        for($X=$iX1; $X<=$iX2+($iY2-$iY1); $X=$X+$DashStep)
+        {
+            $Y=$Y+$DashStep;
+            if ( $X > $iX2 ) { $Xa = $X-($X-$iX2); $Ya = $iY1+($X-$iX2); } else { $Xa = $X; $Ya = $iY1; }
+            if ( $Y > $iY2 ) { $Xb = $iX1+($Y-$iY2); $Yb = $Y-($Y-$iY2); } else { $Xb = $iX1; $Yb = $Y; }
+            imageline($this->Picture,$Xa,$Ya,$Xb,$Yb,$Color);
+        }
+        }
+
+        if ( $this->Antialias && !$NoBorder )
+        {
+        if ( $X1 < ceil($X1) )
+        {
+            $AlphaA = $Alpha * (ceil($X1) - $X1);
+            $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
+            imageline($this->Picture,ceil($X1)-1,ceil($Y1),ceil($X1)-1,floor($Y2),$Color);
+        }
+
+        if ( $Y1 < ceil($Y1) )
+        {
+            $AlphaA = $Alpha * (ceil($Y1) - $Y1);
+            $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
+            imageline($this->Picture,ceil($X1),ceil($Y1)-1,floor($X2),ceil($Y1)-1,$Color);
+        }
+
+        if ( $X2 > floor($X2) )
+        {
+            $AlphaA = $Alpha * (.5-($X2 - floor($X2)));
+            $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
+            imageline($this->Picture,floor($X2)+1,ceil($Y1),floor($X2)+1,floor($Y2),$Color);
         } 
 
-       if ( $Y2 > floor($Y2) )
+        if ( $Y2 > floor($Y2) )
         {
-         $AlphaA = $Alpha * (.5-($Y2 - floor($Y2)));
-         $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
-         imageline($this->Picture,ceil($X1),floor($Y2)+1,floor($X2),floor($Y2)+1,$Color);
+            $AlphaA = $Alpha * (.5-($Y2 - floor($Y2)));
+            $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
+            imageline($this->Picture,ceil($X1),floor($Y2)+1,floor($X2),floor($Y2)+1,$Color);
+        }
         }
-      }
 
-     if ( $BorderR != -1 )
-      $this->drawRectangle($X1,$Y1,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
+        if ( $BorderR != -1 )
+        $this->drawRectangle($X1,$Y1,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
 
-     $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Draw a rectangular marker of the specified size */
-   function drawRectangleMarker($X,$Y,$Format="")
+    /* Draw a rectangular marker of the specified size */
+    function drawRectangleMarker($X,$Y,$Format="")
     {
-     $Size = isset($Format["Size"]) ? $Format["Size"] : 4;
+        $Size = isset($Format["Size"]) ? $Format["Size"] : 4;
 
-     $HalfSize = floor($Size/2);
-     $this->drawFilledRectangle($X-$HalfSize,$Y-$HalfSize,$X+$HalfSize,$Y+$HalfSize,$Format);
+        $HalfSize = floor($Size/2);
+        $this->drawFilledRectangle($X-$HalfSize,$Y-$HalfSize,$X+$HalfSize,$Y+$HalfSize,$Format);
     }
 
-   /* Drawn a spline based on the bezier function */
-   function drawSpline($Coordinates,$Format="")
+    /* Drawn a spline based on the bezier function */
+    function drawSpline($Coordinates,$Format="")
     {
-     $R		= isset($Format["R"]) ? $Format["R"] : 0;
-     $G		= isset($Format["G"]) ? $Format["G"] : 0;
-     $B		= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Force	= isset($Format["Force"]) ? $Format["Force"] : 30;
-     $Forces	= isset($Format["Forces"]) ? $Format["Forces"] : NULL;
-     $ShowC	= isset($Format["ShowControl"]) ? $Format["ShowControl"] : FALSE;
-     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $PathOnly	= isset($Format["PathOnly"]) ? $Format["PathOnly"] : FALSE;
-     $Weight	= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
-
-     $Cpt = NULL; $Mode = NULL; $Result = "";
-     for($i=1;$i<=count($Coordinates)-1;$i++)
-      {
-       $X1 = $Coordinates[$i-1][0]; $Y1 = $Coordinates[$i-1][1];
-       $X2 = $Coordinates[$i][0];   $Y2 = $Coordinates[$i][1];
-
-       if ( $Forces != NULL ) { $Force = $Forces[$i]; }
-
-       /* First segment */
-       if ( $i == 1 )
+        $R		= isset($Format["R"]) ? $Format["R"] : 0;
+        $G		= isset($Format["G"]) ? $Format["G"] : 0;
+        $B		= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Force	= isset($Format["Force"]) ? $Format["Force"] : 30;
+        $Forces	= isset($Format["Forces"]) ? $Format["Forces"] : NULL;
+        $ShowC	= isset($Format["ShowControl"]) ? $Format["ShowControl"] : FALSE;
+        $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $PathOnly	= isset($Format["PathOnly"]) ? $Format["PathOnly"] : FALSE;
+        $Weight	= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+
+        $Cpt = NULL; $Mode = NULL; $Result = "";
+        for($i=1;$i<=count($Coordinates)-1;$i++)
+        {
+        $X1 = $Coordinates[$i-1][0]; $Y1 = $Coordinates[$i-1][1];
+        $X2 = $Coordinates[$i][0];   $Y2 = $Coordinates[$i][1];
+
+        if ( $Forces != NULL ) { $Force = $Forces[$i]; }
+
+        /* First segment */
+        if ( $i == 1 )
         { $Xv1 = $X1; $Yv1 = $Y1; }
-       else
+        else
         {
-         $Angle1 = $this->getAngle($XLast,$YLast,$X1,$Y1);
-         $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
-         $XOff = cos($Angle2 * PI / 180) * $Force + $X1;
-         $YOff = sin($Angle2 * PI / 180) * $Force + $Y1;
+            $Angle1 = $this->getAngle($XLast,$YLast,$X1,$Y1);
+            $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
+            $XOff = cos($Angle2 * PI / 180) * $Force + $X1;
+            $YOff = sin($Angle2 * PI / 180) * $Force + $Y1;
 
-         $Xv1 = cos($Angle1 * PI / 180) * $Force + $XOff;
-         $Yv1 = sin($Angle1 * PI / 180) * $Force + $YOff;
+            $Xv1 = cos($Angle1 * PI / 180) * $Force + $XOff;
+            $Yv1 = sin($Angle1 * PI / 180) * $Force + $YOff;
         }
 
-       /* Last segment */
-       if ( $i == count($Coordinates)-1 )
+        /* Last segment */
+        if ( $i == count($Coordinates)-1 )
         { $Xv2 = $X2; $Yv2 = $Y2; }
-       else
+        else
         {
-         $Angle1 = $this->getAngle($X2,$Y2,$Coordinates[$i+1][0],$Coordinates[$i+1][1]);
-         $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
-         $XOff = cos(($Angle2+180) * PI / 180) * $Force + $X2;
-         $YOff = sin(($Angle2+180) * PI / 180) * $Force + $Y2;
+            $Angle1 = $this->getAngle($X2,$Y2,$Coordinates[$i+1][0],$Coordinates[$i+1][1]);
+            $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
+            $XOff = cos(($Angle2+180) * PI / 180) * $Force + $X2;
+            $YOff = sin(($Angle2+180) * PI / 180) * $Force + $Y2;
 
-         $Xv2 = cos(($Angle1+180) * PI / 180) * $Force + $XOff;
-         $Yv2 = sin(($Angle1+180) * PI / 180) * $Force + $YOff;
+            $Xv2 = cos(($Angle1+180) * PI / 180) * $Force + $XOff;
+            $Yv2 = sin(($Angle1+180) * PI / 180) * $Force + $YOff;
         }
 
-       $Path = $this->drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format);
-       if ($PathOnly) { $Result[] = $Path; }
+        $Path = $this->drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format);
+        if ($PathOnly) { $Result[] = $Path; }
 
-       $XLast = $X1; $YLast = $Y1;
-      }
+        $XLast = $X1; $YLast = $Y1;
+        }
 
-     return($Result);
+        return($Result);
     }
 
-   /* Draw a bezier curve with two controls points */
-   function drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format="")
+    /* Draw a bezier curve with two controls points */
+    function drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format="")
     {
-     $R		= isset($Format["R"]) ? $Format["R"] : 0;
-     $G		= isset($Format["G"]) ? $Format["G"] : 0;
-     $B		= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $ShowC	= isset($Format["ShowControl"]) ? $Format["ShowControl"] : FALSE;
-     $Segments	= isset($Format["Segments"]) ? $Format["Segments"] : NULL;
-     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $NoDraw    = isset($Format["NoDraw"]) ? $Format["NoDraw"] : FALSE;
-     $PathOnly  = isset($Format["PathOnly"]) ? $Format["PathOnly"] : FALSE;
-     $Weight    = isset($Format["Weight"]) ? $Format["Weight"] : NULL;
-     $DrawArrow		= isset($Format["DrawArrow"]) ? $Format["DrawArrow"] : FALSE;
-     $ArrowSize		= isset($Format["ArrowSize"]) ? $Format["ArrowSize"] : 10;
-     $ArrowRatio	= isset($Format["ArrowRatio"]) ? $Format["ArrowRatio"] : .5;
-     $ArrowTwoHeads	= isset($Format["ArrowTwoHeads"]) ? $Format["ArrowTwoHeads"] : FALSE;
-
-     if ( $Segments == NULL )
-      {
-       $Length    = $this->getLength($X1,$Y1,$X2,$Y2);
-       $Precision = ($Length*125)/1000;
-      }
-     else
-      $Precision = $Segments;
+        $R		= isset($Format["R"]) ? $Format["R"] : 0;
+        $G		= isset($Format["G"]) ? $Format["G"] : 0;
+        $B		= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $ShowC	= isset($Format["ShowControl"]) ? $Format["ShowControl"] : FALSE;
+        $Segments	= isset($Format["Segments"]) ? $Format["Segments"] : NULL;
+        $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $NoDraw    = isset($Format["NoDraw"]) ? $Format["NoDraw"] : FALSE;
+        $PathOnly  = isset($Format["PathOnly"]) ? $Format["PathOnly"] : FALSE;
+        $Weight    = isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+        $DrawArrow		= isset($Format["DrawArrow"]) ? $Format["DrawArrow"] : FALSE;
+        $ArrowSize		= isset($Format["ArrowSize"]) ? $Format["ArrowSize"] : 10;
+        $ArrowRatio	= isset($Format["ArrowRatio"]) ? $Format["ArrowRatio"] : .5;
+        $ArrowTwoHeads	= isset($Format["ArrowTwoHeads"]) ? $Format["ArrowTwoHeads"] : FALSE;
+
+        if ( $Segments == NULL )
+        {
+        $Length    = $this->getLength($X1,$Y1,$X2,$Y2);
+        $Precision = ($Length*125)/1000;
+        }
+        else
+        $Precision = $Segments;
 
-     $P[0]["X"] = $X1;  $P[0]["Y"] = $Y1;
-     $P[1]["X"] = $Xv1; $P[1]["Y"] = $Yv1;
-     $P[2]["X"] = $Xv2; $P[2]["Y"] = $Yv2;
-     $P[3]["X"] = $X2;  $P[3]["Y"] = $Y2;
+        $P[0]["X"] = $X1;  $P[0]["Y"] = $Y1;
+        $P[1]["X"] = $Xv1; $P[1]["Y"] = $Yv1;
+        $P[2]["X"] = $Xv2; $P[2]["Y"] = $Yv2;
+        $P[3]["X"] = $X2;  $P[3]["Y"] = $Y2;
 
-     /* Compute the bezier points */
-     $Q = ""; $ID = 0; $Path = "";
-     for($i=0;$i<=$Precision;$i=$i+1)
-      {
-       $u = $i / $Precision;
+        /* Compute the bezier points */
+        $Q = ""; $ID = 0; $Path = "";
+        for($i=0;$i<=$Precision;$i=$i+1)
+        {
+        $u = $i / $Precision;
 
-       $C    = "";
-       $C[0] = (1 - $u) * (1 - $u) * (1 - $u);
-       $C[1] = ($u * 3) * (1 - $u) * (1 - $u);
-       $C[2] = 3 * $u * $u * (1 - $u);
-       $C[3] = $u * $u * $u;
+        $C    = "";
+        $C[0] = (1 - $u) * (1 - $u) * (1 - $u);
+        $C[1] = ($u * 3) * (1 - $u) * (1 - $u);
+        $C[2] = 3 * $u * $u * (1 - $u);
+        $C[3] = $u * $u * $u;
 
-       for($j=0;$j<=3;$j++)
+        for($j=0;$j<=3;$j++)
         {
-         if ( !isset($Q[$ID]) ) { $Q[$ID] = ""; }
-         if ( !isset($Q[$ID]["X"]) ) { $Q[$ID]["X"] = 0; }
-         if ( !isset($Q[$ID]["Y"]) ) { $Q[$ID]["Y"] = 0; }
+            if ( !isset($Q[$ID]) ) { $Q[$ID] = ""; }
+            if ( !isset($Q[$ID]["X"]) ) { $Q[$ID]["X"] = 0; }
+            if ( !isset($Q[$ID]["Y"]) ) { $Q[$ID]["Y"] = 0; }
 
-         $Q[$ID]["X"] = $Q[$ID]["X"] + $P[$j]["X"] * $C[$j];
-         $Q[$ID]["Y"] = $Q[$ID]["Y"] + $P[$j]["Y"] * $C[$j];
+            $Q[$ID]["X"] = $Q[$ID]["X"] + $P[$j]["X"] * $C[$j];
+            $Q[$ID]["Y"] = $Q[$ID]["Y"] + $P[$j]["Y"] * $C[$j];
         }
-       $ID++;
-      }        
-     $Q[$ID]["X"] = $X2; $Q[$ID]["Y"] = $Y2;
+        $ID++;
+        }        
+        $Q[$ID]["X"] = $X2; $Q[$ID]["Y"] = $Y2;
 
-     if ( !$NoDraw )
-      {
-       /* Display the control points */
-       if ( $ShowC && !$PathOnly )
+        if ( !$NoDraw )
+        {
+        /* Display the control points */
+        if ( $ShowC && !$PathOnly )
         {
-         $Xv1 = floor($Xv1); $Yv1 = floor($Yv1); $Xv2 = floor($Xv2); $Yv2 = floor($Yv2);
+            $Xv1 = floor($Xv1); $Yv1 = floor($Yv1); $Xv2 = floor($Xv2); $Yv2 = floor($Yv2);
 
-         $this->drawLine($X1,$Y1,$X2,$Y2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>30));
+            $this->drawLine($X1,$Y1,$X2,$Y2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>30));
 
-         $MyMarkerSettings = array("R"=>255,"G"=>0,"B"=>0,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
-         $this->drawRectangleMarker($Xv1,$Yv1,$MyMarkerSettings);
-         $this->drawText($Xv1+4,$Yv1,"v1");
-         $MyMarkerSettings = array("R"=>0,"G"=>0,"B"=>255,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
-         $this->drawRectangleMarker($Xv2,$Yv2,$MyMarkerSettings);
-         $this->drawText($Xv2+4,$Yv2,"v2");
+            $MyMarkerSettings = array("R"=>255,"G"=>0,"B"=>0,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
+            $this->drawRectangleMarker($Xv1,$Yv1,$MyMarkerSettings);
+            $this->drawText($Xv1+4,$Yv1,"v1");
+            $MyMarkerSettings = array("R"=>0,"G"=>0,"B"=>255,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
+            $this->drawRectangleMarker($Xv2,$Yv2,$MyMarkerSettings);
+            $this->drawText($Xv2+4,$Yv2,"v2");
         }
 
-       /* Draw the bezier */
-       $LastX = NULL; $LastY = NULL; $Cpt = NULL; $Mode = NULL; $ArrowS = NULL;
-       foreach ($Q as $Key => $Point)
+        /* Draw the bezier */
+        $LastX = NULL; $LastY = NULL; $Cpt = NULL; $Mode = NULL; $ArrowS = NULL;
+        foreach ($Q as $Key => $Point)
         {
-         $X = $Point["X"]; $Y = $Point["Y"];
+            $X = $Point["X"]; $Y = $Point["Y"];
 
-         /* Get the first segment */
-         if ( $ArrowS == NULL && $LastX != NULL && $LastY != NULL )
-          { $ArrowS["X2"] = $LastX; $ArrowS["Y2"] = $LastY; $ArrowS["X1"] = $X; $ArrowS["Y1"] = $Y; }
+            /* Get the first segment */
+            if ( $ArrowS == NULL && $LastX != NULL && $LastY != NULL )
+            { $ArrowS["X2"] = $LastX; $ArrowS["Y2"] = $LastY; $ArrowS["X1"] = $X; $ArrowS["Y1"] = $Y; }
 
-         if ( $LastX != NULL && $LastY != NULL && !$PathOnly)
-          list($Cpt,$Mode) = $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Cpt"=>$Cpt,"Mode"=>$Mode,"Weight"=>$Weight));
+            if ( $LastX != NULL && $LastY != NULL && !$PathOnly)
+            list($Cpt,$Mode) = $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Cpt"=>$Cpt,"Mode"=>$Mode,"Weight"=>$Weight));
 
-         /* Get the last segment */
-         $ArrowE["X1"] = $LastX; $ArrowE["Y1"] = $LastY; $ArrowE["X2"] = $X; $ArrowE["Y2"] = $Y;
+            /* Get the last segment */
+            $ArrowE["X1"] = $LastX; $ArrowE["Y1"] = $LastY; $ArrowE["X2"] = $X; $ArrowE["Y2"] = $Y;
 
-         $LastX = $X; $LastY = $Y;
+            $LastX = $X; $LastY = $Y;
         }
 
-       if ( $DrawArrow && !$PathOnly )
+        if ( $DrawArrow && !$PathOnly )
         {
-         $ArrowSettings = array("FillR"=>$R,"FillG"=>$G,"FillB"=>$B,"Alpha"=>$Alpha,"Size"=>$ArrowSize,"Ratio"=>$ArrowRatio);
-         if ( $ArrowTwoHeads )
-          $this->drawArrow($ArrowS["X1"],$ArrowS["Y1"],$ArrowS["X2"],$ArrowS["Y2"],$ArrowSettings);
+            $ArrowSettings = array("FillR"=>$R,"FillG"=>$G,"FillB"=>$B,"Alpha"=>$Alpha,"Size"=>$ArrowSize,"Ratio"=>$ArrowRatio);
+            if ( $ArrowTwoHeads )
+            $this->drawArrow($ArrowS["X1"],$ArrowS["Y1"],$ArrowS["X2"],$ArrowS["Y2"],$ArrowSettings);
 
-         $this->drawArrow($ArrowE["X1"],$ArrowE["Y1"],$ArrowE["X2"],$ArrowE["Y2"],$ArrowSettings);
+            $this->drawArrow($ArrowE["X1"],$ArrowE["Y1"],$ArrowE["X2"],$ArrowE["Y2"],$ArrowSettings);
         }
-      }
-     return($Q);
+        }
+        return($Q);
     }
 
-   /* Draw a line between two points */
-   function drawLine($X1,$Y1,$X2,$Y2,$Format="")
+    /* Draw a line between two points */
+    function drawLine($X1,$Y1,$X2,$Y2,$Format="")
     {
-     $R		= isset($Format["R"]) ? $Format["R"] : 0;
-     $G		= isset($Format["G"]) ? $Format["G"] : 0;
-     $B		= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $Cpt	= isset($Format["Cpt"]) ? $Format["Cpt"] : 1;
-     $Mode	= isset($Format["Mode"]) ? $Format["Mode"] : 1;
-     $Weight	= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
-     $Threshold	= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
-
-     if ( $this->Antialias == FALSE && $Ticks == NULL )
-      {
-       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        $R		= isset($Format["R"]) ? $Format["R"] : 0;
+        $G		= isset($Format["G"]) ? $Format["G"] : 0;
+        $B		= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $Cpt	= isset($Format["Cpt"]) ? $Format["Cpt"] : 1;
+        $Mode	= isset($Format["Mode"]) ? $Format["Mode"] : 1;
+        $Weight	= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+        $Threshold	= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
+
+        if ( $this->Antialias == FALSE && $Ticks == NULL )
         {
-         $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
-         imageline($this->Picture,$X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$ShadowColor);
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+            $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
+            imageline($this->Picture,$X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$ShadowColor);
         }
 
-       $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-       imageline($this->Picture,$X1,$Y1,$X2,$Y2,$Color);
-       return(0);
-      }
+        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        imageline($this->Picture,$X1,$Y1,$X2,$Y2,$Color);
+        return(0);
+        }
 
-     $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1));  
-     if ( $Distance == 0 ) { return(-1); }
+        $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1));  
+        if ( $Distance == 0 ) { return(-1); }
 
-     /* Derivative algorithm for overweighted lines, re-route to polygons primitives */
-     if ( $Weight != NULL )
-      {
-       $Angle        = $this->getAngle($X1,$Y1,$X2,$Y2);
-       $PolySettings = array ("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderAlpha"=>$Alpha);
+        /* Derivative algorithm for overweighted lines, re-route to polygons primitives */
+        if ( $Weight != NULL )
+        {
+        $Angle        = $this->getAngle($X1,$Y1,$X2,$Y2);
+        $PolySettings = array ("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderAlpha"=>$Alpha);
 
-       if ( $Ticks == NULL )
+        if ( $Ticks == NULL )
         {
-         $Points   = ""; 
-         $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X1; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y1;
-         $Points[] = cos(deg2rad($Angle+90)) * $Weight + $X1; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Y1;
-         $Points[] = cos(deg2rad($Angle+90)) * $Weight + $X2; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Y2;
-         $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X2; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y2;
+            $Points   = ""; 
+            $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X1; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y1;
+            $Points[] = cos(deg2rad($Angle+90)) * $Weight + $X1; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Y1;
+            $Points[] = cos(deg2rad($Angle+90)) * $Weight + $X2; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Y2;
+            $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X2; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y2;
 
-         $this->drawPolygon($Points,$PolySettings);
+            $this->drawPolygon($Points,$PolySettings);
         }
-       else
+        else
         {
-         for($i=0;$i<=$Distance;$i=$i+$Ticks*2)
-          {
-           $Xa = (($X2-$X1)/$Distance) * $i + $X1; $Ya = (($Y2-$Y1)/$Distance) * $i + $Y1;
-           $Xb = (($X2-$X1)/$Distance) * ($i+$Ticks) + $X1; $Yb = (($Y2-$Y1)/$Distance) * ($i+$Ticks) + $Y1;
+            for($i=0;$i<=$Distance;$i=$i+$Ticks*2)
+            {
+            $Xa = (($X2-$X1)/$Distance) * $i + $X1; $Ya = (($Y2-$Y1)/$Distance) * $i + $Y1;
+            $Xb = (($X2-$X1)/$Distance) * ($i+$Ticks) + $X1; $Yb = (($Y2-$Y1)/$Distance) * ($i+$Ticks) + $Y1;
 
-           $Points   = ""; 
-           $Points[] = cos(deg2rad($Angle-90)) * $Weight + $Xa; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Ya;
-           $Points[] = cos(deg2rad($Angle+90)) * $Weight + $Xa; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Ya;
-           $Points[] = cos(deg2rad($Angle+90)) * $Weight + $Xb; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Yb;
-           $Points[] = cos(deg2rad($Angle-90)) * $Weight + $Xb; $Points[] = sin(deg2rad($Angle-90)) * $Weight 	+ $Yb;
+            $Points   = ""; 
+            $Points[] = cos(deg2rad($Angle-90)) * $Weight + $Xa; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Ya;
+            $Points[] = cos(deg2rad($Angle+90)) * $Weight + $Xa; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Ya;
+            $Points[] = cos(deg2rad($Angle+90)) * $Weight + $Xb; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Yb;
+            $Points[] = cos(deg2rad($Angle-90)) * $Weight + $Xb; $Points[] = sin(deg2rad($Angle-90)) * $Weight 	+ $Yb;
 
-           $this->drawPolygon($Points,$PolySettings);
-          }
+            $this->drawPolygon($Points,$PolySettings);
+            }
         }
 
-       return(1);
-      }
+        return(1);
+        }
 
-     $XStep = ($X2-$X1) / $Distance;
-     $YStep = ($Y2-$Y1) / $Distance;
+        $XStep = ($X2-$X1) / $Distance;
+        $YStep = ($Y2-$Y1) / $Distance;
 
-     for($i=0;$i<=$Distance;$i++)
-      {
-       $X = $i * $XStep + $X1;
-       $Y = $i * $YStep + $Y1;
+        for($i=0;$i<=$Distance;$i++)
+        {
+        $X = $i * $XStep + $X1;
+        $Y = $i * $YStep + $Y1;
 
-       $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+        $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
 
-       if ( $Threshold != NULL )
+        if ( $Threshold != NULL )
         {
-         foreach($Threshold as $Key => $Parameters)
-          {
-           if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"])
+            foreach($Threshold as $Key => $Parameters)
+            {
+            if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"])
             {
-             if ( isset($Parameters["R"]) ) { $RT = $Parameters["R"]; } else { $RT = 0; }
-             if ( isset($Parameters["G"]) ) { $GT = $Parameters["G"]; } else { $GT = 0; }
-             if ( isset($Parameters["B"]) ) { $BT = $Parameters["B"]; } else { $BT = 0; }
-             if ( isset($Parameters["Alpha"]) ) { $AlphaT = $Parameters["Alpha"]; } else { $AlphaT = 0; }
-             $Color = array("R"=>$RT,"G"=>$GT,"B"=>$BT,"Alpha"=>$AlphaT);
+                if ( isset($Parameters["R"]) ) { $RT = $Parameters["R"]; } else { $RT = 0; }
+                if ( isset($Parameters["G"]) ) { $GT = $Parameters["G"]; } else { $GT = 0; }
+                if ( isset($Parameters["B"]) ) { $BT = $Parameters["B"]; } else { $BT = 0; }
+                if ( isset($Parameters["Alpha"]) ) { $AlphaT = $Parameters["Alpha"]; } else { $AlphaT = 0; }
+                $Color = array("R"=>$RT,"G"=>$GT,"B"=>$BT,"Alpha"=>$AlphaT);
+            }
             }
-          }
         }
 
-       if ( $Ticks != NULL )
+        if ( $Ticks != NULL )
         {
-         if ( $Cpt % $Ticks == 0 )
-          { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
+            if ( $Cpt % $Ticks == 0 )
+            { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
 
-         if ( $Mode == 1 )
-          $this->drawAntialiasPixel($X,$Y,$Color);
+            if ( $Mode == 1 )
+            $this->drawAntialiasPixel($X,$Y,$Color);
 
-         $Cpt++;
+            $Cpt++;
         }
-       else
+        else
         $this->drawAntialiasPixel($X,$Y,$Color);
-      }
+        }
 
-     return(array($Cpt,$Mode));
+        return(array($Cpt,$Mode));
     }
 
-   /* Draw a circle */
-   function drawCircle($Xc,$Yc,$Height,$Width,$Format="")
+    /* Draw a circle */
+    function drawCircle($Xc,$Yc,$Height,$Width,$Format="")
     {
-     $R	    = isset($Format["R"]) ? $Format["R"] : 0;
-     $G	    = isset($Format["G"]) ? $Format["G"] : 0;
-     $B	    = isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Ticks = isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $R	    = isset($Format["R"]) ? $Format["R"] : 0;
+        $G	    = isset($Format["G"]) ? $Format["G"] : 0;
+        $B	    = isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Ticks = isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
 
-     $Height	= abs($Height);
-     $Width	= abs($Width);
+        $Height	= abs($Height);
+        $Width	= abs($Width);
 
-     if ( $Height == 0 ) { $Height = 1; }
-     if ( $Width == 0 )  { $Width = 1; }
-     $Xc = floor($Xc); $Yc = floor($Yc);
+        if ( $Height == 0 ) { $Height = 1; }
+        if ( $Width == 0 )  { $Width = 1; }
+        $Xc = floor($Xc); $Yc = floor($Yc);
 
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $this->Shadow = FALSE;
-       $this->drawCircle($Xc+$this->ShadowX,$Yc+$this->ShadowY,$Height,$Width,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks));
-      }
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $this->Shadow = FALSE;
+        $this->drawCircle($Xc+$this->ShadowX,$Yc+$this->ShadowY,$Height,$Width,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks));
+        }
 
-     if ( $Width == 0 ) { $Width = $Height; }
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+        if ( $Width == 0 ) { $Width = $Height; }
+        if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+        if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+        if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
 
-     $Step = 360 / (2 * PI * max($Width,$Height));
-     $Mode = 1; $Cpt = 1;
-     for($i=0;$i<=360;$i=$i+$Step)
-      {
-       $X = cos($i*PI/180) * $Height + $Xc;
-       $Y = sin($i*PI/180) * $Width + $Yc;
+        $Step = 360 / (2 * PI * max($Width,$Height));
+        $Mode = 1; $Cpt = 1;
+        for($i=0;$i<=360;$i=$i+$Step)
+        {
+        $X = cos($i*PI/180) * $Height + $Xc;
+        $Y = sin($i*PI/180) * $Width + $Yc;
 
-       if ( $Ticks != NULL )
+        if ( $Ticks != NULL )
         {
-         if ( $Cpt % $Ticks == 0 )
-          { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
+            if ( $Cpt % $Ticks == 0 )
+            { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
 
-         if ( $Mode == 1 )
-          $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+            if ( $Mode == 1 )
+            $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
 
-         $Cpt++;
+            $Cpt++;
         }
-       else
+        else
         $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
 
-      }
-     $this->Shadow = $RestoreShadow;
+        }
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Draw a filled circle */
-   function drawFilledCircle($X,$Y,$Radius,$Format="")
+    /* Draw a filled circle */
+    function drawFilledCircle($X,$Y,$Radius,$Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : 0;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
-     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha;
-     $Ticks     	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $Surrounding 	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-
-     if ( $Radius == 0 ) { $Radius = 1; }
-     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-     $X = floor($X); $Y = floor($Y);
-
-     $Radius = abs($Radius);
-
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $this->Shadow = FALSE;
-       $this->drawFilledCircle($X+$this->ShadowX,$Y+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks));
-      }
-
-     $this->Mask  = "";
-     $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     for ($i=0; $i<=$Radius*2; $i++)
-      {
-       $Slice  = sqrt($Radius * $Radius - ($Radius - $i) * ($Radius - $i));
-       $XPos   = floor($Slice);
-       $YPos   = $Y + $i - $Radius;
-       $AAlias = $Slice - floor($Slice);
-
-       $this->Mask[$X-$XPos][$YPos] = TRUE;
-       $this->Mask[$X+$XPos][$YPos] = TRUE;
-       imageline($this->Picture,$X-$XPos,$YPos,$X+$XPos,$YPos,$Color);
-      }
-     if ( $this->Antialias )
-      $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-
-     $this->Mask = "";
-
-     if ( $BorderR != -1 )
-      $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks));
-
-     $this->Shadow	= $RestoreShadow;
+        $R			= isset($Format["R"]) ? $Format["R"] : 0;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+        $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha;
+        $Ticks     	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $Surrounding 	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+
+        if ( $Radius == 0 ) { $Radius = 1; }
+        if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+        $X = floor($X); $Y = floor($Y);
+
+        $Radius = abs($Radius);
+
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $this->Shadow = FALSE;
+        $this->drawFilledCircle($X+$this->ShadowX,$Y+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks));
+        }
+
+        $this->Mask  = "";
+        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        for ($i=0; $i<=$Radius*2; $i++)
+        {
+        $Slice  = sqrt($Radius * $Radius - ($Radius - $i) * ($Radius - $i));
+        $XPos   = floor($Slice);
+        $YPos   = $Y + $i - $Radius;
+        $AAlias = $Slice - floor($Slice);
+
+        $this->Mask[$X-$XPos][$YPos] = TRUE;
+        $this->Mask[$X+$XPos][$YPos] = TRUE;
+        imageline($this->Picture,$X-$XPos,$YPos,$X+$XPos,$YPos,$Color);
+        }
+        if ( $this->Antialias )
+        $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+
+        $this->Mask = "";
+
+        if ( $BorderR != -1 )
+        $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks));
+
+        $this->Shadow	= $RestoreShadow;
     }
 
-   /* Write text */
-   function drawText($X,$Y,$Text,$Format="")
+    /* Write text */
+    function drawText($X,$Y,$Text,$Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : $this->FontColorR;
-     $G			= isset($Format["G"]) ? $Format["G"] : $this->FontColorG;
-     $B			= isset($Format["B"]) ? $Format["B"] : $this->FontColorB;
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $Align		= isset($Format["Align"]) ? $Format["Align"] : TEXT_ALIGN_BOTTOMLEFT;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->FontColorA;
-     $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
-     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
-     $ShowOrigine	= isset($Format["ShowOrigine"]) ? $Format["ShowOrigine"] : FALSE;
-     $TOffset		= isset($Format["TOffset"]) ? $Format["TOffset"] : 2;
-     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : FALSE;
-     $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : TRUE;
-     $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 6;
-     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : FALSE;
-     $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 6;
-     $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 255;
-     $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 255;
-     $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 255;
-     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 50;
-     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
-     $BoxBorderR	= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
-     $BoxBorderG	= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
-     $BoxBorderB	= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
-     $BoxBorderAlpha	= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 50;
-     $NoShadow		= isset($Format["NoShadow"]) ? $Format["NoShadow"] : FALSE;
-
-     $Shadow = $this->Shadow;
-     if ( $NoShadow ) { $this->Shadow = FALSE; }
-
-     if ( $BoxSurrounding != "" ) { $BoxBorderR = $BoxR - $BoxSurrounding; $BoxBorderG = $BoxG - $BoxSurrounding; $BoxBorderB = $BoxB - $BoxSurrounding; $BoxBorderAlpha = $BoxAlpha; }
-
-     if ( $ShowOrigine )
-      {
-       $MyMarkerSettings = array("R"=>255,"G"=>0,"B"=>0,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
-       $this->drawRectangleMarker($X,$Y,$MyMarkerSettings);
-      }
-
-     $TxtPos = $this->getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text);
-
-     if ( $DrawBox && ($Angle == 0 || $Angle == 90 || $Angle == 180 || $Angle == 270))
-      {
-       $T[0]["X"]=0;$T[0]["Y"]=0;$T[1]["X"]=0;$T[1]["Y"]=0;$T[2]["X"]=0;$T[2]["Y"]=0;$T[3]["X"]=0;$T[3]["Y"]=0;
-       if ( $Angle == 0 ) { $T[0]["X"]=-$TOffset;$T[0]["Y"]=$TOffset;$T[1]["X"]=$TOffset;$T[1]["Y"]=$TOffset;$T[2]["X"]=$TOffset;$T[2]["Y"]=-$TOffset;$T[3]["X"]=-$TOffset;$T[3]["Y"]=-$TOffset; }
-
-       $X1 = min($TxtPos[0]["X"],$TxtPos[1]["X"],$TxtPos[2]["X"],$TxtPos[3]["X"]) - $BorderOffset + 3;
-       $Y1 = min($TxtPos[0]["Y"],$TxtPos[1]["Y"],$TxtPos[2]["Y"],$TxtPos[3]["Y"]) - $BorderOffset;
-       $X2 = max($TxtPos[0]["X"],$TxtPos[1]["X"],$TxtPos[2]["X"],$TxtPos[3]["X"]) + $BorderOffset + 3;
-       $Y2 = max($TxtPos[0]["Y"],$TxtPos[1]["Y"],$TxtPos[2]["Y"],$TxtPos[3]["Y"]) + $BorderOffset - 3;
-
-       $X1 = $X1 - $TxtPos[$Align]["X"] + $X + $T[0]["X"];
-       $Y1 = $Y1 - $TxtPos[$Align]["Y"] + $Y + $T[0]["Y"];
-       $X2 = $X2 - $TxtPos[$Align]["X"] + $X + $T[0]["X"];
-       $Y2 = $Y2 - $TxtPos[$Align]["Y"] + $Y + $T[0]["Y"];
-
-       $Settings = array("R"=>$BoxR,"G"=>$BoxG,"B"=>$BoxB,"Alpha"=>$BoxAlpha,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"BorderAlpha"=>$BoxBorderAlpha);
-
-       if ( $BoxRounded )
+        $R			= isset($Format["R"]) ? $Format["R"] : $this->FontColorR;
+        $G			= isset($Format["G"]) ? $Format["G"] : $this->FontColorG;
+        $B			= isset($Format["B"]) ? $Format["B"] : $this->FontColorB;
+        $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+        $Align		= isset($Format["Align"]) ? $Format["Align"] : TEXT_ALIGN_BOTTOMLEFT;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->FontColorA;
+        $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+        $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+        $ShowOrigine	= isset($Format["ShowOrigine"]) ? $Format["ShowOrigine"] : FALSE;
+        $TOffset		= isset($Format["TOffset"]) ? $Format["TOffset"] : 2;
+        $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : FALSE;
+        $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : TRUE;
+        $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 6;
+        $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : FALSE;
+        $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 6;
+        $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 255;
+        $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 255;
+        $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 255;
+        $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 50;
+        $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+        $BoxBorderR	= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
+        $BoxBorderG	= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
+        $BoxBorderB	= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
+        $BoxBorderAlpha	= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 50;
+        $NoShadow		= isset($Format["NoShadow"]) ? $Format["NoShadow"] : FALSE;
+
+        $Shadow = $this->Shadow;
+        if ( $NoShadow ) { $this->Shadow = FALSE; }
+
+        if ( $BoxSurrounding != "" ) { $BoxBorderR = $BoxR - $BoxSurrounding; $BoxBorderG = $BoxG - $BoxSurrounding; $BoxBorderB = $BoxB - $BoxSurrounding; $BoxBorderAlpha = $BoxAlpha; }
+
+        if ( $ShowOrigine )
+        {
+        $MyMarkerSettings = array("R"=>255,"G"=>0,"B"=>0,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
+        $this->drawRectangleMarker($X,$Y,$MyMarkerSettings);
+        }
+
+        $TxtPos = $this->getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text);
+
+        if ( $DrawBox && ($Angle == 0 || $Angle == 90 || $Angle == 180 || $Angle == 270))
+        {
+        $T[0]["X"]=0;$T[0]["Y"]=0;$T[1]["X"]=0;$T[1]["Y"]=0;$T[2]["X"]=0;$T[2]["Y"]=0;$T[3]["X"]=0;$T[3]["Y"]=0;
+        if ( $Angle == 0 ) { $T[0]["X"]=-$TOffset;$T[0]["Y"]=$TOffset;$T[1]["X"]=$TOffset;$T[1]["Y"]=$TOffset;$T[2]["X"]=$TOffset;$T[2]["Y"]=-$TOffset;$T[3]["X"]=-$TOffset;$T[3]["Y"]=-$TOffset; }
+
+        $X1 = min($TxtPos[0]["X"],$TxtPos[1]["X"],$TxtPos[2]["X"],$TxtPos[3]["X"]) - $BorderOffset + 3;
+        $Y1 = min($TxtPos[0]["Y"],$TxtPos[1]["Y"],$TxtPos[2]["Y"],$TxtPos[3]["Y"]) - $BorderOffset;
+        $X2 = max($TxtPos[0]["X"],$TxtPos[1]["X"],$TxtPos[2]["X"],$TxtPos[3]["X"]) + $BorderOffset + 3;
+        $Y2 = max($TxtPos[0]["Y"],$TxtPos[1]["Y"],$TxtPos[2]["Y"],$TxtPos[3]["Y"]) + $BorderOffset - 3;
+
+        $X1 = $X1 - $TxtPos[$Align]["X"] + $X + $T[0]["X"];
+        $Y1 = $Y1 - $TxtPos[$Align]["Y"] + $Y + $T[0]["Y"];
+        $X2 = $X2 - $TxtPos[$Align]["X"] + $X + $T[0]["X"];
+        $Y2 = $Y2 - $TxtPos[$Align]["Y"] + $Y + $T[0]["Y"];
+
+        $Settings = array("R"=>$BoxR,"G"=>$BoxG,"B"=>$BoxB,"Alpha"=>$BoxAlpha,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"BorderAlpha"=>$BoxBorderAlpha);
+
+        if ( $BoxRounded )
         { $this->drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$RoundedRadius,$Settings); }
-       else
+        else
         { $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Settings); }
-      }
+        }
 
-     $X = $X - $TxtPos[$Align]["X"] + $X;
-     $Y = $Y - $TxtPos[$Align]["Y"] + $Y;
+        $X = $X - $TxtPos[$Align]["X"] + $X;
+        $Y = $Y - $TxtPos[$Align]["Y"] + $Y;
 
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $C_ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
-       imagettftext($this->Picture,$FontSize,$Angle,$X+$this->ShadowX,$Y+$this->ShadowY,$C_ShadowColor,$FontName,$Text);
-      }
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $C_ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
+        imagettftext($this->Picture,$FontSize,$Angle,$X+$this->ShadowX,$Y+$this->ShadowY,$C_ShadowColor,$FontName,$Text);
+        }
 
-     $C_TextColor = $this->AllocateColor($this->Picture,$R,$G,$B,$Alpha);
-     imagettftext($this->Picture,$FontSize,$Angle,$X,$Y,$C_TextColor,$FontName,$Text);
+        $C_TextColor = $this->AllocateColor($this->Picture,$R,$G,$B,$Alpha);
+        imagettftext($this->Picture,$FontSize,$Angle,$X,$Y,$C_TextColor,$FontName,$Text);
 
-     $this->Shadow = $Shadow;
+        $this->Shadow = $Shadow;
 
-     return($TxtPos);
+        return($TxtPos);
     }
 
-   /* Draw a gradient within a defined area */
-   function drawGradientArea($X1,$Y1,$X2,$Y2,$Direction,$Format="")
+    /* Draw a gradient within a defined area */
+    function drawGradientArea($X1,$Y1,$X2,$Y2,$Direction,$Format="")
     {
-     $StartR	= isset($Format["StartR"]) ? $Format["StartR"] : 90;
-     $StartG	= isset($Format["StartG"]) ? $Format["StartG"] : 90;
-     $StartB	= isset($Format["StartB"]) ? $Format["StartB"] : 90;
-     $EndR	= isset($Format["EndR"]) ? $Format["EndR"] : 0;
-     $EndG	= isset($Format["EndG"]) ? $Format["EndG"] : 0;
-     $EndB	= isset($Format["EndB"]) ? $Format["EndB"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Levels	= isset($Format["Levels"]) ? $Format["Levels"] : NULL;
-
-     $Shadow = $this->Shadow;
-     $this->Shadow = FALSE;
-
-     if ( $StartR == $EndR && $StartG == $EndG && $StartB == $EndB )
-      {
-       $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,array("R"=>$StartR,"G"=>$StartG,"B"=>$StartB,"Alpha"=>$Alpha));
-       return(0);
-      }
-
-     if ( $Levels != NULL )
-      { $EndR=$StartR+$Levels; $EndG=$StartG+$Levels; $EndB=$StartB+$Levels; }
-
-     if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
-     if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
-
-     if ( $Direction == DIRECTION_VERTICAL )   { $Width = abs($Y2-$Y1); }
-     if ( $Direction == DIRECTION_HORIZONTAL ) { $Width = abs($X2-$X1); }
-
-     $Step     = max(abs($EndR-$StartR),abs($EndG-$StartG),abs($EndB-$StartB));
-     $StepSize = $Width/$Step;
-     $RStep    = ($EndR-$StartR)/$Step;
-     $GStep    = ($EndG-$StartG)/$Step;
-     $BStep    = ($EndB-$StartB)/$Step;
-
-     $R=$StartR;$G=$StartG;$B=$StartB;
-     switch($Direction)
-      {
-       case DIRECTION_VERTICAL:
+        $StartR	= isset($Format["StartR"]) ? $Format["StartR"] : 90;
+        $StartG	= isset($Format["StartG"]) ? $Format["StartG"] : 90;
+        $StartB	= isset($Format["StartB"]) ? $Format["StartB"] : 90;
+        $EndR	= isset($Format["EndR"]) ? $Format["EndR"] : 0;
+        $EndG	= isset($Format["EndG"]) ? $Format["EndG"] : 0;
+        $EndB	= isset($Format["EndB"]) ? $Format["EndB"] : 0;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Levels	= isset($Format["Levels"]) ? $Format["Levels"] : NULL;
+
+        $Shadow = $this->Shadow;
+        $this->Shadow = FALSE;
+
+        if ( $StartR == $EndR && $StartG == $EndG && $StartB == $EndB )
+        {
+        $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,array("R"=>$StartR,"G"=>$StartG,"B"=>$StartB,"Alpha"=>$Alpha));
+        return(0);
+        }
+
+        if ( $Levels != NULL )
+        { $EndR=$StartR+$Levels; $EndG=$StartG+$Levels; $EndB=$StartB+$Levels; }
+
+        if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
+        if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
+
+        if ( $Direction == DIRECTION_VERTICAL )   { $Width = abs($Y2-$Y1); }
+        if ( $Direction == DIRECTION_HORIZONTAL ) { $Width = abs($X2-$X1); }
+
+        $Step     = max(abs($EndR-$StartR),abs($EndG-$StartG),abs($EndB-$StartB));
+        $StepSize = $Width/$Step;
+        $RStep    = ($EndR-$StartR)/$Step;
+        $GStep    = ($EndG-$StartG)/$Step;
+        $BStep    = ($EndB-$StartB)/$Step;
+
+        $R=$StartR;$G=$StartG;$B=$StartB;
+        switch($Direction)
+        {
+        case DIRECTION_VERTICAL:
         $StartY = $Y1; $EndY = floor($Y2)+1; $LastY2 = $StartY;
         for($i=0;$i<=$Step;$i++)
-         {
-          $Y2 = floor($StartY + ($i * $StepSize));
+            {
+            $Y2 = floor($StartY + ($i * $StepSize));
 
-          if ($Y2 > $EndY) { $Y2 = $EndY; }
-          if (($Y1 != $Y2 && $Y1 < $Y2) || $Y2 == $EndY)
-           {
+            if ($Y2 > $EndY) { $Y2 = $EndY; }
+            if (($Y1 != $Y2 && $Y1 < $Y2) || $Y2 == $EndY)
+            {
             $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
             $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color);
             $LastY2 = max($LastY2,$Y2);
             $Y1 = $Y2+1;
-           }
-          $R = $R + $RStep; $G = $G + $GStep; $B = $B + $BStep;
-         }
+            }
+            $R = $R + $RStep; $G = $G + $GStep; $B = $B + $BStep;
+            }
         if ( $LastY2 < $EndY && isset($Color)) { for ($i=$LastY2+1;$i<=$EndY;$i++) { $this->drawLine($X1,$i,$X2,$i,$Color); } }
         break;
 
-       case DIRECTION_HORIZONTAL:
+        case DIRECTION_HORIZONTAL:
         $StartX = $X1; $EndX = $X2;
         for($i=0;$i<=$Step;$i++)
-         {
-          $X2 = floor($StartX + ($i * $StepSize));
+            {
+            $X2 = floor($StartX + ($i * $StepSize));
 
-          if ($X2 > $EndX) { $X2 = $EndX; }
-          if (($X1 != $X2 && $X1 < $X2) || $X2 == $EndX)
-           {
+            if ($X2 > $EndX) { $X2 = $EndX; }
+            if (($X1 != $X2 && $X1 < $X2) || $X2 == $EndX)
+            {
             $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
             $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color);
             $X1 = $X2+1;
-           }
-          $R = $R + $RStep; $G = $G + $GStep; $B = $B + $BStep; 
-         }
+            }
+            $R = $R + $RStep; $G = $G + $GStep; $B = $B + $BStep; 
+            }
         if ( $X2 < $EndX && isset($Color)) { $this->drawFilledRectangle($X2,$Y1,$EndX,$Y2,$Color); }
         break;
-      }
+        }
 
-     $this->Shadow = $Shadow;
+        $this->Shadow = $Shadow;
 
     }
 
-   /* Draw an aliased pixel */
-   function drawAntialiasPixel($X,$Y,$Format="")
+    /* Draw an aliased pixel */
+    function drawAntialiasPixel($X,$Y,$Format="")
     {
-     $R     = isset($Format["R"]) ? $Format["R"] : 0;
-     $G     = isset($Format["G"]) ? $Format["G"] : 0;
-     $B     = isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $R     = isset($Format["R"]) ? $Format["R"] : 0;
+        $G     = isset($Format["G"]) ? $Format["G"] : 0;
+        $B     = isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
 
-     if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
-      return(-1);
+        if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
+        return(-1);
 
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+        if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+        if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+        if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
 
-     if ( !$this->Antialias )
-      {
-       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        if ( !$this->Antialias )
+        {
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
         {
-         $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
-         imagesetpixel($this->Picture,$X+$this->ShadowX,$Y+$this->ShadowY,$ShadowColor);
+            $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
+            imagesetpixel($this->Picture,$X+$this->ShadowX,$Y+$this->ShadowY,$ShadowColor);
         }
 
-       $PlotColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-       imagesetpixel($this->Picture,$X,$Y,$PlotColor);
+        $PlotColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        imagesetpixel($this->Picture,$X,$Y,$PlotColor);
 
-       return(0);
-      }
+        return(0);
+        }
 
-     $Plot = "";
-     $Xi   = floor($X);
-     $Yi   = floor($Y);
+        $Plot = "";
+        $Xi   = floor($X);
+        $Yi   = floor($Y);
 
-     if ( $Xi == $X && $Yi == $Y)
-      {
-       if ( $Alpha == 100 )
+        if ( $Xi == $X && $Yi == $Y)
+        {
+        if ( $Alpha == 100 )
         $this->drawAlphaPixel($X,$Y,100,$R,$G,$B);
-       else
+        else
         $this->drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B);
-      }
-     else
-      {
-       $Alpha1 = (((1 - ($X - floor($X))) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
-       if ( $Alpha1 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi,$Alpha1,$R,$G,$B); }
+        }
+        else
+        {
+        $Alpha1 = (((1 - ($X - floor($X))) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
+        if ( $Alpha1 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi,$Alpha1,$R,$G,$B); }
 
-       $Alpha2 = ((($X - floor($X)) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
-       if ( $Alpha2 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi,$Alpha2,$R,$G,$B); }
+        $Alpha2 = ((($X - floor($X)) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
+        if ( $Alpha2 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi,$Alpha2,$R,$G,$B); }
 
-       $Alpha3 = (((1 - ($X - floor($X))) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
-       if ( $Alpha3 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi+1,$Alpha3,$R,$G,$B); }
+        $Alpha3 = (((1 - ($X - floor($X))) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
+        if ( $Alpha3 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi+1,$Alpha3,$R,$G,$B); }
 
-       $Alpha4 = ((($X - floor($X)) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
-       if ( $Alpha4 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi+1,$Alpha4,$R,$G,$B); }
-      }
+        $Alpha4 = ((($X - floor($X)) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
+        if ( $Alpha4 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi+1,$Alpha4,$R,$G,$B); }
+        }
     }
 
-   /* Draw a semi-transparent pixel */
-   function drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B)
+    /* Draw a semi-transparent pixel */
+    function drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B)
     {
-     if ( isset($this->Mask[$X])) { if ( isset($this->Mask[$X][$Y]) ) { return(0); } }
+        if ( isset($this->Mask[$X])) { if ( isset($this->Mask[$X][$Y]) ) { return(0); } }
 
-     if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
-      return(-1);
+        if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
+        return(-1);
 
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+        if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+        if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+        if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
 
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $AlphaFactor = floor(($Alpha / 100) * $this->Shadowa);
-       $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$AlphaFactor);
-       imagesetpixel($this->Picture,$X+$this->ShadowX,$Y+$this->ShadowY,$ShadowColor);
-      }
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $AlphaFactor = floor(($Alpha / 100) * $this->Shadowa);
+        $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$AlphaFactor);
+        imagesetpixel($this->Picture,$X+$this->ShadowX,$Y+$this->ShadowY,$ShadowColor);
+        }
 
-     $C_Aliased = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
+        $C_Aliased = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
     }
 
-   /* Convert apha to base 10 */
-   function convertAlpha($AlphaValue)
+    /* Convert apha to base 10 */
+    function convertAlpha($AlphaValue)
     { return((127/100)*(100-$AlphaValue)); }
 
-   /* Allocate a color with transparency */
-   function allocateColor($Picture,$R,$G,$B,$Alpha=100)
+    /* Allocate a color with transparency */
+    function allocateColor($Picture,$R,$G,$B,$Alpha=100)
     {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-     if ( $Alpha < 0 )  { $Alpha = 0; }
-     if ( $Alpha > 100) { $Alpha = 100; }
-
-     $Alpha = $this->convertAlpha($Alpha);
-     return(imagecolorallocatealpha($Picture,$R,$G,$B,$Alpha));
+        if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+        if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+        if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+        if ( $Alpha < 0 )  { $Alpha = 0; }
+        if ( $Alpha > 100) { $Alpha = 100; }
+
+        $Alpha = $this->convertAlpha($Alpha);
+        return(imagecolorallocatealpha($Picture,$R,$G,$B,$Alpha));
     }
 
-   /* Load a PNG file and draw it over the chart */
-   function drawFromPNG($X,$Y,$FileName)
+    /* Load a PNG file and draw it over the chart */
+    function drawFromPNG($X,$Y,$FileName)
     { $this->drawFromPicture(1,$FileName,$X,$Y); }
 
-   /* Load a GIF file and draw it over the chart */
-   function drawFromGIF($X,$Y,$FileName)
+    /* Load a GIF file and draw it over the chart */
+    function drawFromGIF($X,$Y,$FileName)
     { $this->drawFromPicture(2,$FileName,$X,$Y); }
 
-   /* Load a JPEG file and draw it over the chart */
-   function drawFromJPG($X,$Y,$FileName)
+    /* Load a JPEG file and draw it over the chart */
+    function drawFromJPG($X,$Y,$FileName)
     { $this->drawFromPicture(3,$FileName,$X,$Y); }
 
-   function getPicInfo($FileName)
+    function getPicInfo($FileName)
     {
-     $Infos  = getimagesize($FileName);
-     $Width  = $Infos[0];
-     $Height = $Infos[1];
-     $Type   = $Infos["mime"];
+        $Infos  = getimagesize($FileName);
+        $Width  = $Infos[0];
+        $Height = $Infos[1];
+        $Type   = $Infos["mime"];
 
-     if ( $Type == "image/png") { $Type = 1; }
-     if ( $Type == "image/gif") { $Type = 2; }
-     if ( $Type == "image/jpeg ") { $Type = 3; }
+        if ( $Type == "image/png") { $Type = 1; }
+        if ( $Type == "image/gif") { $Type = 2; }
+        if ( $Type == "image/jpeg ") { $Type = 3; }
 
-     return(array($Width,$Height,$Type));
+        return(array($Width,$Height,$Type));
     }
 
-   /* Generic loader function for external pictures */
-   function drawFromPicture($PicType,$FileName,$X,$Y)
+    /* Generic loader function for external pictures */
+    function drawFromPicture($PicType,$FileName,$X,$Y)
     {
-     if ( file_exists($FileName))
-      {
-       list($Width,$Height) = $this->getPicInfo($FileName);
+        if ( file_exists($FileName))
+        {
+        list($Width,$Height) = $this->getPicInfo($FileName);
 
-       if ( $PicType == 1 )
+        if ( $PicType == 1 )
         { $Raster = imagecreatefrompng($FileName); }
-       elseif ( $PicType == 2 )
+        elseif ( $PicType == 2 )
         { $Raster = imagecreatefromgif($FileName); }
-       elseif ( $PicType == 3 )
+        elseif ( $PicType == 3 )
         { $Raster = imagecreatefromjpeg($FileName); }
-       else
+        else
         { return(0); }
 
 
-       $RestoreShadow = $this->Shadow;
-       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
         {
-         $this->Shadow = FALSE;
-         if ( $PicType == 3 )
-          $this->drawFilledRectangle($X+$this->ShadowX,$Y+$this->ShadowY,$X+$Width+$this->ShadowX,$Y+$Height+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
-         else
-          {
-           $TranparentID = imagecolortransparent($Raster);
-           for ($Xc=0;$Xc<=$Width-1;$Xc++)
+            $this->Shadow = FALSE;
+            if ( $PicType == 3 )
+            $this->drawFilledRectangle($X+$this->ShadowX,$Y+$this->ShadowY,$X+$Width+$this->ShadowX,$Y+$Height+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+            else
             {
-             for ($Yc=0;$Yc<=$Height-1;$Yc++)
-              {
-               $RGBa   = imagecolorat($Raster,$Xc,$Yc);
-               $Values = imagecolorsforindex($Raster,$RGBa);
-               if ( $Values["alpha"] < 120 )
+            $TranparentID = imagecolortransparent($Raster);
+            for ($Xc=0;$Xc<=$Width-1;$Xc++)
+            {
+                for ($Yc=0;$Yc<=$Height-1;$Yc++)
+                {
+                $RGBa   = imagecolorat($Raster,$Xc,$Yc);
+                $Values = imagecolorsforindex($Raster,$RGBa);
+                if ( $Values["alpha"] < 120 )
                 {
-                 $AlphaFactor = floor(($this->Shadowa / 100) * ((100 / 127) * (127-$Values["alpha"])));
-                 $this->drawAlphaPixel($X+$Xc+$this->ShadowX,$Y+$Yc+$this->ShadowY,$AlphaFactor,$this->ShadowR,$this->ShadowG,$this->ShadowB);
+                    $AlphaFactor = floor(($this->Shadowa / 100) * ((100 / 127) * (127-$Values["alpha"])));
+                    $this->drawAlphaPixel($X+$Xc+$this->ShadowX,$Y+$Yc+$this->ShadowY,$AlphaFactor,$this->ShadowR,$this->ShadowG,$this->ShadowB);
                 }
-              }
+                }
+            }
             }
-          }
         }
-       $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
 
-       imagecopy($this->Picture,$Raster,$X,$Y,0,0,$Width,$Height);
-       imagedestroy($Raster);
-      }
+        imagecopy($this->Picture,$Raster,$X,$Y,0,0,$Width,$Height);
+        imagedestroy($Raster);
+        }
     }
 
-   /* Draw an arrow */
-   function drawArrow($X1,$Y1,$X2,$Y2,$Format="")
+    /* Draw an arrow */
+    function drawArrow($X1,$Y1,$X2,$Y2,$Format="")
     {
-     $FillR	= isset($Format["FillR"]) ? $Format["FillR"] : 0;
-     $FillG	= isset($Format["FillG"]) ? $Format["FillG"] : 0;
-     $FillB	= isset($Format["FillB"]) ? $Format["FillB"] : 0;
-     $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : $FillR;
-     $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : $FillG;
-     $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : $FillB;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Size	= isset($Format["Size"]) ? $Format["Size"] : 10;
-     $Ratio	= isset($Format["Ratio"]) ? $Format["Ratio"] : .5;
-     $TwoHeads	= isset($Format["TwoHeads"]) ? $Format["TwoHeads"] : FALSE;
-     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : FALSE;
-
-     /* Calculate the line angle */
-     $Angle = $this->getAngle($X1,$Y1,$X2,$Y2);
-
-     /* Override Shadow support, this will be managed internally */
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $this->Shadow = FALSE;
-       $this->drawArrow($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,array("FillR"=>$this->ShadowR,"FillG"=>$this->ShadowG,"FillB"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Size"=>$Size,"Ratio"=>$Ratio,"TwoHeads"=>$TwoHeads,"Ticks"=>$Ticks));
-      }
-
-     /* Draw the 1st Head */
-     $TailX = cos(($Angle-180)*PI/180)*$Size+$X2;
-     $TailY = sin(($Angle-180)*PI/180)*$Size+$Y2;
-
-     $Points	= "";
-     $Points[]  = $X2; $Points[]  = $Y2;
-     $Points[]	= cos(($Angle-90)*PI/180)*$Size*$Ratio+$TailX; $Points[] = sin(($Angle-90)*PI/180)*$Size*$Ratio+$TailY;
-     $Points[]	= cos(($Angle-270)*PI/180)*$Size*$Ratio+$TailX; $Points[] = sin(($Angle-270)*PI/180)*$Size*$Ratio+$TailY;
-     $Points[]  = $X2; $Points[]  = $Y2;
-
-     /* Visual correction */
-     if ($Angle == 180 || $Angle == 360 ) { $Points[4] = $Points[2]; }
-     if ($Angle == 90 || $Angle == 270 ) { $Points[5] = $Points[3]; }
-
-     $ArrowColor = $this->allocateColor($this->Picture,$FillR,$FillG,$FillB,$Alpha);
-     ImageFilledPolygon($this->Picture,$Points,4,$ArrowColor);
-
-     $this->drawLine($Points[0],$Points[1],$Points[2],$Points[3],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-     $this->drawLine($Points[2],$Points[3],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-     $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-
-     /* Draw the second head */
-     if ( $TwoHeads )
-      {
-       $Angle = $this->getAngle($X2,$Y2,$X1,$Y1);
-
-       $TailX2 = cos(($Angle-180)*PI/180)*$Size+$X1;
-       $TailY2 = sin(($Angle-180)*PI/180)*$Size+$Y1;
-
-       $Points   = "";
-       $Points[] = $X1; $Points[]  = $Y1;
-       $Points[] = cos(($Angle-90)*PI/180)*$Size*$Ratio+$TailX2; $Points[] = sin(($Angle-90)*PI/180)*$Size*$Ratio+$TailY2;
-       $Points[] = cos(($Angle-270)*PI/180)*$Size*$Ratio+$TailX2; $Points[] = sin(($Angle-270)*PI/180)*$Size*$Ratio+$TailY2;
-       $Points[] = $X1; $Points[]  = $Y1;
-
-       /* Visual correction */
-       if ($Angle == 180 || $Angle == 360 ) { $Points[4] = $Points[2]; }
-       if ($Angle == 90 || $Angle == 270 ) { $Points[5] = $Points[3]; }
-
-       $ArrowColor = $this->allocateColor($this->Picture,$FillR,$FillG,$FillB,$Alpha);
-       ImageFilledPolygon($this->Picture,$Points,4,$ArrowColor);
-
-       $this->drawLine($Points[0],$Points[1],$Points[2],$Points[3],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-       $this->drawLine($Points[2],$Points[3],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-       $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-
-       $this->drawLine($TailX,$TailY,$TailX2,$TailY2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-      }
-     else
-      $this->drawLine($X1,$Y1,$TailX,$TailY,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-
-     /* Re-enable shadows */
-     $this->Shadow = $RestoreShadow;
+        $FillR	= isset($Format["FillR"]) ? $Format["FillR"] : 0;
+        $FillG	= isset($Format["FillG"]) ? $Format["FillG"] : 0;
+        $FillB	= isset($Format["FillB"]) ? $Format["FillB"] : 0;
+        $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : $FillR;
+        $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : $FillG;
+        $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : $FillB;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Size	= isset($Format["Size"]) ? $Format["Size"] : 10;
+        $Ratio	= isset($Format["Ratio"]) ? $Format["Ratio"] : .5;
+        $TwoHeads	= isset($Format["TwoHeads"]) ? $Format["TwoHeads"] : FALSE;
+        $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : FALSE;
+
+        /* Calculate the line angle */
+        $Angle = $this->getAngle($X1,$Y1,$X2,$Y2);
+
+        /* Override Shadow support, this will be managed internally */
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $this->Shadow = FALSE;
+        $this->drawArrow($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,array("FillR"=>$this->ShadowR,"FillG"=>$this->ShadowG,"FillB"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Size"=>$Size,"Ratio"=>$Ratio,"TwoHeads"=>$TwoHeads,"Ticks"=>$Ticks));
+        }
+
+        /* Draw the 1st Head */
+        $TailX = cos(($Angle-180)*PI/180)*$Size+$X2;
+        $TailY = sin(($Angle-180)*PI/180)*$Size+$Y2;
+
+        $Points	= "";
+        $Points[]  = $X2; $Points[]  = $Y2;
+        $Points[]	= cos(($Angle-90)*PI/180)*$Size*$Ratio+$TailX; $Points[] = sin(($Angle-90)*PI/180)*$Size*$Ratio+$TailY;
+        $Points[]	= cos(($Angle-270)*PI/180)*$Size*$Ratio+$TailX; $Points[] = sin(($Angle-270)*PI/180)*$Size*$Ratio+$TailY;
+        $Points[]  = $X2; $Points[]  = $Y2;
+
+        /* Visual correction */
+        if ($Angle == 180 || $Angle == 360 ) { $Points[4] = $Points[2]; }
+        if ($Angle == 90 || $Angle == 270 ) { $Points[5] = $Points[3]; }
+
+        $ArrowColor = $this->allocateColor($this->Picture,$FillR,$FillG,$FillB,$Alpha);
+        ImageFilledPolygon($this->Picture,$Points,4,$ArrowColor);
+
+        $this->drawLine($Points[0],$Points[1],$Points[2],$Points[3],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+        $this->drawLine($Points[2],$Points[3],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+        $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+
+        /* Draw the second head */
+        if ( $TwoHeads )
+        {
+        $Angle = $this->getAngle($X2,$Y2,$X1,$Y1);
+
+        $TailX2 = cos(($Angle-180)*PI/180)*$Size+$X1;
+        $TailY2 = sin(($Angle-180)*PI/180)*$Size+$Y1;
+
+        $Points   = "";
+        $Points[] = $X1; $Points[]  = $Y1;
+        $Points[] = cos(($Angle-90)*PI/180)*$Size*$Ratio+$TailX2; $Points[] = sin(($Angle-90)*PI/180)*$Size*$Ratio+$TailY2;
+        $Points[] = cos(($Angle-270)*PI/180)*$Size*$Ratio+$TailX2; $Points[] = sin(($Angle-270)*PI/180)*$Size*$Ratio+$TailY2;
+        $Points[] = $X1; $Points[]  = $Y1;
+
+        /* Visual correction */
+        if ($Angle == 180 || $Angle == 360 ) { $Points[4] = $Points[2]; }
+        if ($Angle == 90 || $Angle == 270 ) { $Points[5] = $Points[3]; }
+
+        $ArrowColor = $this->allocateColor($this->Picture,$FillR,$FillG,$FillB,$Alpha);
+        ImageFilledPolygon($this->Picture,$Points,4,$ArrowColor);
+
+        $this->drawLine($Points[0],$Points[1],$Points[2],$Points[3],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+        $this->drawLine($Points[2],$Points[3],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+        $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+
+        $this->drawLine($TailX,$TailY,$TailX2,$TailY2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+        }
+        else
+        $this->drawLine($X1,$Y1,$TailX,$TailY,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+
+        /* Re-enable shadows */
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Draw a label with associated arrow */
-   function drawArrowLabel($X1,$Y1,$Text,$Format="")
+    /* Draw a label with associated arrow */
+    function drawArrowLabel($X1,$Y1,$Text,$Format="")
     {
-     $FillR    = isset($Format["FillR"]) ? $Format["FillR"] : 0;
-     $FillG    = isset($Format["FillG"]) ? $Format["FillG"] : 0;
-     $FillB    = isset($Format["FillB"]) ? $Format["FillB"] : 0;
-     $BorderR  = isset($Format["BorderR"]) ? $Format["BorderR"] : $FillR;
-     $BorderG  = isset($Format["BorderG"]) ? $Format["BorderG"] : $FillG;
-     $BorderB  = isset($Format["BorderB"]) ? $Format["BorderB"] : $FillB;
-     $FontName = isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
-     $FontSize = isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
-     $Alpha    = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Length   = isset($Format["Length"]) ? $Format["Length"] : 50;
-     $Angle    = isset($Format["Angle"]) ? $Format["Angle"] : 315;
-     $Size     = isset($Format["Size"]) ? $Format["Size"] : 10;
-     $Position = isset($Format["Position"]) ? $Format["Position"] : POSITION_TOP;
-     $RoundPos = isset($Format["RoundPos"]) ? $Format["RoundPos"] : FALSE;
-     $Ticks    = isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-
-     $Angle = $Angle % 360;
-
-     $X2 = sin(($Angle+180)*PI/180)*$Length+$X1;
-     $Y2 = cos(($Angle+180)*PI/180)*$Length+$Y1;
-
-     if ( $RoundPos && $Angle > 0 && $Angle < 180 ) { $Y2 = ceil($Y2); }
-     if ( $RoundPos && $Angle > 180 ) { $Y2 = floor($Y2); }
-
-     $this->drawArrow($X2,$Y2,$X1,$Y1,$Format);
-
-     $Size	= imagettfbbox($FontSize,0,$FontName,$Text);
-     $TxtWidth	= max(abs($Size[2]-$Size[0]),abs($Size[0]-$Size[6]));
-     $TxtHeight	= max(abs($Size[1]-$Size[7]),abs($Size[3]-$Size[1]));
-
-     if ( $Angle > 0 && $Angle < 180 )
-      {
-       $this->drawLine($X2,$Y2,$X2-$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-       if ( $Position == POSITION_TOP )
+        $FillR    = isset($Format["FillR"]) ? $Format["FillR"] : 0;
+        $FillG    = isset($Format["FillG"]) ? $Format["FillG"] : 0;
+        $FillB    = isset($Format["FillB"]) ? $Format["FillB"] : 0;
+        $BorderR  = isset($Format["BorderR"]) ? $Format["BorderR"] : $FillR;
+        $BorderG  = isset($Format["BorderG"]) ? $Format["BorderG"] : $FillG;
+        $BorderB  = isset($Format["BorderB"]) ? $Format["BorderB"] : $FillB;
+        $FontName = isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+        $FontSize = isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+        $Alpha    = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Length   = isset($Format["Length"]) ? $Format["Length"] : 50;
+        $Angle    = isset($Format["Angle"]) ? $Format["Angle"] : 315;
+        $Size     = isset($Format["Size"]) ? $Format["Size"] : 10;
+        $Position = isset($Format["Position"]) ? $Format["Position"] : POSITION_TOP;
+        $RoundPos = isset($Format["RoundPos"]) ? $Format["RoundPos"] : FALSE;
+        $Ticks    = isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+
+        $Angle = $Angle % 360;
+
+        $X2 = sin(($Angle+180)*PI/180)*$Length+$X1;
+        $Y2 = cos(($Angle+180)*PI/180)*$Length+$Y1;
+
+        if ( $RoundPos && $Angle > 0 && $Angle < 180 ) { $Y2 = ceil($Y2); }
+        if ( $RoundPos && $Angle > 180 ) { $Y2 = floor($Y2); }
+
+        $this->drawArrow($X2,$Y2,$X1,$Y1,$Format);
+
+        $Size	= imagettfbbox($FontSize,0,$FontName,$Text);
+        $TxtWidth	= max(abs($Size[2]-$Size[0]),abs($Size[0]-$Size[6]));
+        $TxtHeight	= max(abs($Size[1]-$Size[7]),abs($Size[3]-$Size[1]));
+
+        if ( $Angle > 0 && $Angle < 180 )
+        {
+        $this->drawLine($X2,$Y2,$X2-$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+        if ( $Position == POSITION_TOP )
         $this->drawText($X2,$Y2-2,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_BOTTOMRIGHT));
-       else
+        else
         $this->drawText($X2,$Y2+4,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_TOPRIGHT));
-      }
-     else
-      {
-       $this->drawLine($X2,$Y2,$X2+$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-       if ( $Position == POSITION_TOP )
+        }
+        else
+        {
+        $this->drawLine($X2,$Y2,$X2+$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+        if ( $Position == POSITION_TOP )
         $this->drawText($X2,$Y2-2,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-       else
+        else
         $this->drawText($X2,$Y2+4,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_TOPLEFT));
-      }
+        }
     }
 
-   /* Draw a progress bar filled with specified % */
-   function drawProgress($X,$Y,$Percent,$Format="")
+    /* Draw a progress bar filled with specified % */
+    function drawProgress($X,$Y,$Percent,$Format="")
     {
-     if ( $Percent > 100 ) { $Percent = 100; }
-     if ( $Percent < 0 ) { $Percent = 0; }
-
-     $Width	= isset($Format["Width"]) ? $Format["Width"] : 200;
-     $Height	= isset($Format["Height"]) ? $Format["Height"] : 20;
-     $Orientation = isset($Format["Orientation"]) ? $Format["Orientation"] : ORIENTATION_HORIZONTAL;
-     $ShowLabel = isset($Format["ShowLabel"]) ? $Format["ShowLabel"] : FALSE;
-     $LabelPos	= isset($Format["LabelPos"]) ? $Format["LabelPos"] : LABEL_POS_INSIDE;
-     $Margin    = isset($Format["Margin"]) ? $Format["Margin"] : 10;
-     $R		= isset($Format["R"]) ? $Format["R"] : 130;
-     $G		= isset($Format["G"]) ? $Format["G"] : 130;
-     $B		= isset($Format["B"]) ? $Format["B"] : 130;
-     $RFade	= isset($Format["RFade"]) ? $Format["RFade"] : -1;
-     $GFade	= isset($Format["GFade"]) ? $Format["GFade"] : -1;
-     $BFade	= isset($Format["BFade"]) ? $Format["BFade"] : -1;
-     $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
-     $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
-     $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
-     $BoxBorderR = isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 0;
-     $BoxBorderG = isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 0;
-     $BoxBorderB = isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 0;
-     $BoxBackR	= isset($Format["BoxBackR"]) ? $Format["BoxBackR"] : 255;
-     $BoxBackG	= isset($Format["BoxBackG"]) ? $Format["BoxBackG"] : 255;
-     $BoxBackB	= isset($Format["BoxBackB"]) ? $Format["BoxBackB"] : 255;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $BoxSurrounding = isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : NULL;
-     $NoAngle	= isset($Format["NoAngle"]) ? $Format["NoAngle"] : FALSE;
-
-     if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
-      {
-       $RFade = (($RFade-$R)/100)*$Percent+$R;
-       $GFade = (($GFade-$G)/100)*$Percent+$G;
-       $BFade = (($BFade-$B)/100)*$Percent+$B;
-      }
-
-     if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
-     if ( $BoxSurrounding != NULL ) { $BoxBorderR = $BoxBackR + $Surrounding; $BoxBorderG = $BoxBackG + $Surrounding; $BoxBorderB = $BoxBackB + $Surrounding; }
-
-     if ( $Orientation == ORIENTATION_VERTICAL )
-      {
-       $InnerHeight = (($Height-2)/100)*$Percent;
-       $this->drawFilledRectangle($X,$Y,$X+$Width,$Y-$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
-
-       $RestoreShadow = $this->Shadow; $this->Shadow  = FALSE;
-       if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
-        {
-         $GradientOptions = array("StartR"=>$RFade,"StartG"=>$GFade,"StartB"=>$BFade,"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
-         $this->drawGradientArea($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,DIRECTION_VERTICAL,$GradientOptions);
-
-         if ( $Surrounding )
-          $this->drawRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
-        }
-       else
+        if ( $Percent > 100 ) { $Percent = 100; }
+        if ( $Percent < 0 ) { $Percent = 0; }
+
+        $Width	= isset($Format["Width"]) ? $Format["Width"] : 200;
+        $Height	= isset($Format["Height"]) ? $Format["Height"] : 20;
+        $Orientation = isset($Format["Orientation"]) ? $Format["Orientation"] : ORIENTATION_HORIZONTAL;
+        $ShowLabel = isset($Format["ShowLabel"]) ? $Format["ShowLabel"] : FALSE;
+        $LabelPos	= isset($Format["LabelPos"]) ? $Format["LabelPos"] : LABEL_POS_INSIDE;
+        $Margin    = isset($Format["Margin"]) ? $Format["Margin"] : 10;
+        $R		= isset($Format["R"]) ? $Format["R"] : 130;
+        $G		= isset($Format["G"]) ? $Format["G"] : 130;
+        $B		= isset($Format["B"]) ? $Format["B"] : 130;
+        $RFade	= isset($Format["RFade"]) ? $Format["RFade"] : -1;
+        $GFade	= isset($Format["GFade"]) ? $Format["GFade"] : -1;
+        $BFade	= isset($Format["BFade"]) ? $Format["BFade"] : -1;
+        $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+        $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+        $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+        $BoxBorderR = isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 0;
+        $BoxBorderG = isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 0;
+        $BoxBorderB = isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 0;
+        $BoxBackR	= isset($Format["BoxBackR"]) ? $Format["BoxBackR"] : 255;
+        $BoxBackG	= isset($Format["BoxBackG"]) ? $Format["BoxBackG"] : 255;
+        $BoxBackB	= isset($Format["BoxBackB"]) ? $Format["BoxBackB"] : 255;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $BoxSurrounding = isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : NULL;
+        $NoAngle	= isset($Format["NoAngle"]) ? $Format["NoAngle"] : FALSE;
+
+        if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
+        {
+        $RFade = (($RFade-$R)/100)*$Percent+$R;
+        $GFade = (($GFade-$G)/100)*$Percent+$G;
+        $BFade = (($BFade-$B)/100)*$Percent+$B;
+        }
+
+        if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+        if ( $BoxSurrounding != NULL ) { $BoxBorderR = $BoxBackR + $Surrounding; $BoxBorderG = $BoxBackG + $Surrounding; $BoxBorderB = $BoxBackB + $Surrounding; }
+
+        if ( $Orientation == ORIENTATION_VERTICAL )
+        {
+        $InnerHeight = (($Height-2)/100)*$Percent;
+        $this->drawFilledRectangle($X,$Y,$X+$Width,$Y-$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
+
+        $RestoreShadow = $this->Shadow; $this->Shadow  = FALSE;
+        if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
+        {
+            $GradientOptions = array("StartR"=>$RFade,"StartG"=>$GFade,"StartB"=>$BFade,"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
+            $this->drawGradientArea($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,DIRECTION_VERTICAL,$GradientOptions);
+
+            if ( $Surrounding )
+            $this->drawRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
+        }
+        else
         $this->drawFilledRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
 
-       $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
 
-       if ( $ShowLabel && $LabelPos == LABEL_POS_BOTTOM )	{ $this->drawText($X+($Width/2),$Y+$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_TOPMIDDLE)); }
-       if ( $ShowLabel && $LabelPos == LABEL_POS_TOP )		{ $this->drawText($X+($Width/2),$Y-$Height-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
-       if ( $ShowLabel && $LabelPos == LABEL_POS_INSIDE )	{ $this->drawText($X+($Width/2),$Y-$InnerHeight-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT,"Angle"=>90)); }
-       if ( $ShowLabel && $LabelPos == LABEL_POS_CENTER )	{ $this->drawText($X+($Width/2),$Y-($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"Angle"=>90)); }
-      }
-     else
-      {
-       if ( $Percent == 100 )
+        if ( $ShowLabel && $LabelPos == LABEL_POS_BOTTOM )	{ $this->drawText($X+($Width/2),$Y+$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_TOPMIDDLE)); }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_TOP )		{ $this->drawText($X+($Width/2),$Y-$Height-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_INSIDE )	{ $this->drawText($X+($Width/2),$Y-$InnerHeight-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT,"Angle"=>90)); }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_CENTER )	{ $this->drawText($X+($Width/2),$Y-($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"Angle"=>90)); }
+        }
+        else
+        {
+        if ( $Percent == 100 )
         $InnerWidth = $Width-1;
-       else
+        else
         $InnerWidth = (($Width-2)/100)*$Percent;
 
-       $this->drawFilledRectangle($X,$Y,$X+$Width,$Y+$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
+        $this->drawFilledRectangle($X,$Y,$X+$Width,$Y+$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
 
-       $RestoreShadow = $this->Shadow; $this->Shadow  = FALSE;
-       if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
+        $RestoreShadow = $this->Shadow; $this->Shadow  = FALSE;
+        if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
         {
-         $GradientOptions = array("StartR"=>$R,"StartG"=>$G,"StartB"=>$B,"EndR"=>$RFade,"EndG"=>$GFade,"EndB"=>$BFade);
-         $this->drawGradientArea($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,DIRECTION_HORIZONTAL,$GradientOptions);
+            $GradientOptions = array("StartR"=>$R,"StartG"=>$G,"StartB"=>$B,"EndR"=>$RFade,"EndG"=>$GFade,"EndB"=>$BFade);
+            $this->drawGradientArea($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,DIRECTION_HORIZONTAL,$GradientOptions);
 
-         if ( $Surrounding )
-          $this->drawRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
+            if ( $Surrounding )
+            $this->drawRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
         }
-       else
+        else
         $this->drawFilledRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
  
-       $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
 
-       if ( $ShowLabel && $LabelPos == LABEL_POS_LEFT )		{ $this->drawText($X-$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLERIGHT)); }
-       if ( $ShowLabel && $LabelPos == LABEL_POS_RIGHT )	{ $this->drawText($X+$Width+$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT)); }
-       if ( $ShowLabel && $LabelPos == LABEL_POS_CENTER )	{ $this->drawText($X+($Width/2),$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE)); }
-       if ( $ShowLabel && $LabelPos == LABEL_POS_INSIDE )	{ $this->drawText($X+$InnerWidth+$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT)); }
-      }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_LEFT )		{ $this->drawText($X-$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLERIGHT)); }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_RIGHT )	{ $this->drawText($X+$Width+$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT)); }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_CENTER )	{ $this->drawText($X+($Width/2),$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE)); }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_INSIDE )	{ $this->drawText($X+$InnerWidth+$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT)); }
+        }
     }
 
-   /* Get the legend box size */
-   function getLegendSize($Format="")
+    /* Get the legend box size */
+    function getLegendSize($Format="")
     {
-     $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
-     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
-     $BoxSize		= isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
-     $Margin		= isset($Format["Margin"]) ? $Format["Margin"] : 5;
-     $Style		= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
-     $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
-     $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 5;
-     $BoxHeight		= isset($Format["BoxHeight"]) ? $Format["BoxHeight"] : 5;
-     $IconAreaWidth	= isset($Format["IconAreaWidth"]) ? $Format["IconAreaWidth"] : $BoxWidth;
-     $IconAreaHeight	= isset($Format["IconAreaHeight"]) ? $Format["IconAreaHeight"] : $BoxHeight;
-     $XSpacing		= isset($Format["XSpacing"]) ? $Format["XSpacing"] : 5;
-
-     $Data = $this->DataSet->getData();
-
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"]))
+        $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+        $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+        $BoxSize		= isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
+        $Margin		= isset($Format["Margin"]) ? $Format["Margin"] : 5;
+        $Style		= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
+        $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
+        $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 5;
+        $BoxHeight		= isset($Format["BoxHeight"]) ? $Format["BoxHeight"] : 5;
+        $IconAreaWidth	= isset($Format["IconAreaWidth"]) ? $Format["IconAreaWidth"] : $BoxWidth;
+        $IconAreaHeight	= isset($Format["IconAreaHeight"]) ? $Format["IconAreaHeight"] : $BoxHeight;
+        $XSpacing		= isset($Format["XSpacing"]) ? $Format["XSpacing"] : 5;
+
+        $Data = $this->DataSet->getData();
+
+        foreach($Data["Series"] as $SerieName => $Serie)
         {
-         list($PicWidth,$PicHeight) = $this->getPicInfo($Serie["Picture"]);
-         if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
-         if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"]))
+        {
+            list($PicWidth,$PicHeight) = $this->getPicInfo($Serie["Picture"]);
+            if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
+            if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
+        }
         }
-      }
 
-     $YStep = max($this->FontSize,$IconAreaHeight) + 5;
-     $XStep = $IconAreaWidth + 5;
-     $XStep = $XSpacing;
+        $YStep = max($this->FontSize,$IconAreaHeight) + 5;
+        $XStep = $IconAreaWidth + 5;
+        $XStep = $XSpacing;
 
-     $X=100; $Y=100;
+        $X=100; $Y=100;
 
-     $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
+        foreach($Data["Series"] as $SerieName => $Serie)
         {
-         if ( $Mode == LEGEND_VERTICAL )
-          {
-           $BoxArray = $this->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Serie["Description"]);
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            if ( $Mode == LEGEND_VERTICAL )
+            {
+            $BoxArray = $this->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Serie["Description"]);
 
-           if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
-           if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-           if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+            if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
+            if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+            if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
 
-           $Lines = preg_split("/\n/",$Serie["Description"]);
-           $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
-           $Lines = preg_split("/\n/",$Serie["Description"]);
-           $Width = "";
-           foreach($Lines as $Key => $Value)
+            $Lines = preg_split("/\n/",$Serie["Description"]);
+            $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
+            }
+            elseif ( $Mode == LEGEND_HORIZONTAL )
+            {
+            $Lines = preg_split("/\n/",$Serie["Description"]);
+            $Width = "";
+            foreach($Lines as $Key => $Value)
             {
-             $BoxArray = $this->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
+                $BoxArray = $this->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
 
-             if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
-             if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-             if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+                if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
+                if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+                if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
 
-             $Width[] = $BoxArray[1]["X"];
+                $Width[] = $BoxArray[1]["X"];
             }
 
-           $vX=max($Width)+$XStep;
-          }
+            $vX=max($Width)+$XStep;
+            }
+        }
         }
-      }
-     $vY=$vY-$YStep; $vX=$vX-$XStep;
+        $vY=$vY-$YStep; $vX=$vX-$XStep;
 
-     $TopOffset  = $Y - $Boundaries["T"];
-     if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
+        $TopOffset  = $Y - $Boundaries["T"];
+        if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
 
-     $Width  = ($Boundaries["R"]+$Margin) - ($Boundaries["L"]-$Margin);
-     $Height = ($Boundaries["B"]+$Margin) - ($Boundaries["T"]-$Margin);
+        $Width  = ($Boundaries["R"]+$Margin) - ($Boundaries["L"]-$Margin);
+        $Height = ($Boundaries["B"]+$Margin) - ($Boundaries["T"]-$Margin);
 
-     return(array("Width"=>$Width,"Height"=>$Height));
+        return(array("Width"=>$Width,"Height"=>$Height));
     }
 
-   /* Draw the legend of the active series */
-   function drawLegend($X,$Y,$Format="")
+    /* Draw the legend of the active series */
+    function drawLegend($X,$Y,$Format="")
     {
-     $Family	= isset($Format["Family"]) ? $Format["Family"] : LEGEND_FAMILY_BOX;
-     $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
-     $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
-     $FontR	= isset($Format["FontR"]) ? $Format["FontR"] : $this->FontColorR;
-     $FontG	= isset($Format["FontG"]) ? $Format["FontG"] : $this->FontColorG;
-     $FontB	= isset($Format["FontB"]) ? $Format["FontB"] : $this->FontColorB;
-     $BoxWidth	= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 5;
-     $BoxHeight	= isset($Format["BoxHeight"]) ? $Format["BoxHeight"] : 5;
-     $IconAreaWidth	= isset($Format["IconAreaWidth"]) ? $Format["IconAreaWidth"] : $BoxWidth;
-     $IconAreaHeight	= isset($Format["IconAreaHeight"]) ? $Format["IconAreaHeight"] : $BoxHeight;
-     $XSpacing	= isset($Format["XSpacing"]) ? $Format["XSpacing"] : 5;
-     $Margin	= isset($Format["Margin"]) ? $Format["Margin"] : 5;
-     $R		= isset($Format["R"]) ? $Format["R"] : 200;
-     $G		= isset($Format["G"]) ? $Format["G"] : 200;
-     $B		= isset($Format["B"]) ? $Format["B"] : 200;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
-     $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
-     $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
-     $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $Style	= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
-     $Mode	= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
-
-     if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
-
-     $Data = $this->DataSet->getData();
-
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"]))
-        {
-         list($PicWidth,$PicHeight) = $this->getPicInfo($Serie["Picture"]);
-         if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
-         if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
-        }
-      }
-
-     $YStep = max($this->FontSize,$IconAreaHeight) + 5;
-     $XStep = $IconAreaWidth + 5;
-     $XStep = $XSpacing;
-
-     $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         if ( $Mode == LEGEND_VERTICAL )
-          {
-           $BoxArray = $this->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Serie["Description"]);
-
-           if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
-           if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-           if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
-
-           $Lines = preg_split("/\n/",$Serie["Description"]);
-           $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
-           $Lines = preg_split("/\n/",$Serie["Description"]);
-           $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
-             $BoxArray = $this->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
-
-             if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
-             if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-             if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
-
-             $Width[] = $BoxArray[1]["X"];
-            }
-
-           $vX=max($Width)+$XStep;
-          }
-        }
-      }
-     $vY=$vY-$YStep; $vX=$vX-$XStep;
-
-     $TopOffset  = $Y - $Boundaries["T"];
-     if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
-
-     if ( $Style == LEGEND_ROUND )
-      $this->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
-     elseif ( $Style == LEGEND_BOX )
-      $this->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
-
-     $RestoreShadow = $this->Shadow; $this->Shadow = FALSE;
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"];
-         $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
-
-         if ( isset($Serie["Picture"]) )
-          {
-           $Picture = $Serie["Picture"];
-           list($PicWidth,$PicHeight) = $this->getPicInfo($Picture);
-           $PicX = $X+$IconAreaWidth/2; $PicY = $Y+$IconAreaHeight/2; 
-
-           $this->drawFromPNG($PicX-$PicWidth/2,$PicY-$PicHeight/2,$Picture);
-          }
-         else
-          {
-           if ( $Family == LEGEND_FAMILY_BOX )
+        $Family	= isset($Format["Family"]) ? $Format["Family"] : LEGEND_FAMILY_BOX;
+        $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+        $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+        $FontR	= isset($Format["FontR"]) ? $Format["FontR"] : $this->FontColorR;
+        $FontG	= isset($Format["FontG"]) ? $Format["FontG"] : $this->FontColorG;
+        $FontB	= isset($Format["FontB"]) ? $Format["FontB"] : $this->FontColorB;
+        $BoxWidth	= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 5;
+        $BoxHeight	= isset($Format["BoxHeight"]) ? $Format["BoxHeight"] : 5;
+        $IconAreaWidth	= isset($Format["IconAreaWidth"]) ? $Format["IconAreaWidth"] : $BoxWidth;
+        $IconAreaHeight	= isset($Format["IconAreaHeight"]) ? $Format["IconAreaHeight"] : $BoxHeight;
+        $XSpacing	= isset($Format["XSpacing"]) ? $Format["XSpacing"] : 5;
+        $Margin	= isset($Format["Margin"]) ? $Format["Margin"] : 5;
+        $R		= isset($Format["R"]) ? $Format["R"] : 200;
+        $G		= isset($Format["G"]) ? $Format["G"] : 200;
+        $B		= isset($Format["B"]) ? $Format["B"] : 200;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
+        $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
+        $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
+        $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $Style	= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
+        $Mode	= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
+
+        if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+
+        $Data = $this->DataSet->getData();
+
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"]))
+        {
+            list($PicWidth,$PicHeight) = $this->getPicInfo($Serie["Picture"]);
+            if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
+            if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
+        }
+        }
+
+        $YStep = max($this->FontSize,$IconAreaHeight) + 5;
+        $XStep = $IconAreaWidth + 5;
+        $XStep = $XSpacing;
+
+        $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            if ( $Mode == LEGEND_VERTICAL )
             {
-             if ( $BoxWidth != $IconAreaWidth ) { $XOffset = floor(($IconAreaWidth-$BoxWidth)/2); } else { $XOffset = 0; }
-             if ( $BoxHeight != $IconAreaHeight ) { $YOffset = floor(($IconAreaHeight-$BoxHeight)/2); } else { $YOffset = 0; }
+            $BoxArray = $this->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Serie["Description"]);
 
-             $this->drawFilledRectangle($X+1+$XOffset,$Y+1+$YOffset,$X+$BoxWidth+$XOffset+1,$Y+$BoxHeight+1+$YOffset,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
-             $this->drawFilledRectangle($X+$XOffset,$Y+$YOffset,$X+$BoxWidth+$XOffset,$Y+$BoxHeight+$YOffset,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
+            if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
+            if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+            if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+
+            $Lines = preg_split("/\n/",$Serie["Description"]);
+            $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
             }
-           elseif ( $Family == LEGEND_FAMILY_CIRCLE )
+            elseif ( $Mode == LEGEND_HORIZONTAL )
             {
-             $this->drawFilledCircle($X+1+$IconAreaWidth/2,$Y+1+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
-             $this->drawFilledCircle($X+$IconAreaWidth/2,$Y+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-            }
-           elseif ( $Family == LEGEND_FAMILY_LINE )
+            $Lines = preg_split("/\n/",$Serie["Description"]);
+            $Width = "";
+            foreach($Lines as $Key => $Value)
             {
-             $this->drawLine($X+1,$Y+1+$IconAreaHeight/2,$X+1+$IconAreaWidth,$Y+1+$IconAreaHeight/2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20,"Ticks"=>$Ticks,"Weight"=>$Weight));
-             $this->drawLine($X,$Y+$IconAreaHeight/2,$X+$IconAreaWidth,$Y+$IconAreaHeight/2,array("R"=>$R,"G"=>$G,"B"=>$B,"Ticks"=>$Ticks,"Weight"=>$Weight));
-            }
-          }
+                $BoxArray = $this->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
 
-         if ( $Mode == LEGEND_VERTICAL )
-          {
-           $Lines = preg_split("/\n/",$Serie["Description"]);
-           foreach($Lines as $Key => $Value)
-            $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
+                if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
+                if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+                if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
 
-           $Y=$Y+max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
-           $Lines = preg_split("/\n/",$Serie["Description"]);
-           $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
-             $BoxArray = $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
-             $Width[] = $BoxArray[1]["X"];
+                $Width[] = $BoxArray[1]["X"];
+            }
+
+            $vX=max($Width)+$XStep;
             }
-           $X=max($Width)+2+$XStep;
-          }
         }
-      }
+        }
+        $vY=$vY-$YStep; $vX=$vX-$XStep;
 
+        $TopOffset  = $Y - $Boundaries["T"];
+        if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
 
-     $this->Shadow = $RestoreShadow;
-    }
+        if ( $Style == LEGEND_ROUND )
+        $this->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+        elseif ( $Style == LEGEND_BOX )
+        $this->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
 
-   function drawScale($Format="")
-    {
-     $Pos		= isset($Format["Pos"]) ? $Format["Pos"] : SCALE_POS_LEFTRIGHT;
-     $Floating		= isset($Format["Floating"]) ? $Format["Floating"] : FALSE;
-     $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : SCALE_MODE_FLOATING;
-     $RemoveXAxis	= isset($Format["RemoveXAxis"]) ? $Format["RemoveXAxis"] : FALSE;
-     $MinDivHeight	= isset($Format["MinDivHeight"]) ? $Format["MinDivHeight"] : 20;
-     $Factors		= isset($Format["Factors"]) ? $Format["Factors"] : array(1,2,5);
-     $ManualScale	= isset($Format["ManualScale"]) ? $Format["ManualScale"] : array("0"=>array("Min"=>-100,"Max"=>100));
-     $XMargin		= isset($Format["XMargin"]) ? $Format["XMargin"] : AUTO;
-     $YMargin		= isset($Format["YMargin"]) ? $Format["YMargin"] : 0;
-     $ScaleSpacing	= isset($Format["ScaleSpacing"]) ? $Format["ScaleSpacing"] : 15;
-     $InnerTickWidth	= isset($Format["InnerTickWidth"]) ? $Format["InnerTickWidth"] : 2;
-     $OuterTickWidth	= isset($Format["OuterTickWidth"]) ? $Format["OuterTickWidth"] : 2;
-     $DrawXLines	= isset($Format["DrawXLines"]) ? $Format["DrawXLines"] : TRUE;
-     $DrawYLines	= isset($Format["DrawYLines"]) ? $Format["DrawYLines"] : ALL;
-     $GridTicks		= isset($Format["GridTicks"]) ? $Format["GridTicks"] : 4;
-     $GridR		= isset($Format["GridR"]) ? $Format["GridR"] : 255;
-     $GridG		= isset($Format["GridG"]) ? $Format["GridG"] : 255;
-     $GridB		= isset($Format["GridB"]) ? $Format["GridB"] : 255;
-     $GridAlpha		= isset($Format["GridAlpha"]) ? $Format["GridAlpha"] : 40;
-     $AxisRo		= isset($Format["AxisR"]) ? $Format["AxisR"] : 0;
-     $AxisGo		= isset($Format["AxisG"]) ? $Format["AxisG"] : 0;
-     $AxisBo		= isset($Format["AxisB"]) ? $Format["AxisB"] : 0;
-     $AxisAlpha		= isset($Format["AxisAlpha"]) ? $Format["AxisAlpha"] : 100;
-     $TickRo		= isset($Format["TickR"]) ? $Format["TickR"] : 0;
-     $TickGo		= isset($Format["TickG"]) ? $Format["TickG"] : 0;
-     $TickBo		= isset($Format["TickB"]) ? $Format["TickB"] : 0;
-     $TickAlpha		= isset($Format["TickAlpha"]) ? $Format["TickAlpha"] : 100;
-     $DrawSubTicks	= isset($Format["DrawSubTicks"]) ? $Format["DrawSubTicks"] : FALSE;
-     $InnerSubTickWidth	= isset($Format["InnerSubTickWidth"]) ? $Format["InnerSubTickWidth"] : 0;
-     $OuterSubTickWidth	= isset($Format["OuterSubTickWidth"]) ? $Format["OuterSubTickWidth"] : 2;
-     $SubTickR		= isset($Format["SubTickR"]) ? $Format["SubTickR"] : 255;
-     $SubTickG		= isset($Format["SubTickG"]) ? $Format["SubTickG"] : 0;
-     $SubTickB		= isset($Format["SubTickB"]) ? $Format["SubTickB"] : 0;
-     $SubTickAlpha	= isset($Format["SubTickAlpha"]) ? $Format["SubTickAlpha"] : 100;
-     $AutoAxisLabels	= isset($Format["AutoAxisLabels"]) ? $Format["AutoAxisLabels"] : TRUE;
-     $XReleasePercent	= isset($Format["XReleasePercent"]) ? $Format["XReleasePercent"] : 1;
-     $DrawArrows	= isset($Format["DrawArrows"]) ? $Format["DrawArrows"] : FALSE;
-     $ArrowSize         = isset($Format["ArrowSize"]) ? $Format["ArrowSize"] : 8;
-     $CycleBackground	= isset($Format["CycleBackground"]) ? $Format["CycleBackground"] : FALSE;
-     $BackgroundR1	= isset($Format["BackgroundR1"]) ? $Format["BackgroundR1"] : 255;
-     $BackgroundG1	= isset($Format["BackgroundG1"]) ? $Format["BackgroundG1"] : 255;
-     $BackgroundB1	= isset($Format["BackgroundB1"]) ? $Format["BackgroundB1"] : 255;
-     $BackgroundAlpha1	= isset($Format["BackgroundAlpha1"]) ? $Format["BackgroundAlpha1"] : 20;
-     $BackgroundR2	= isset($Format["BackgroundR2"]) ? $Format["BackgroundR2"] : 230;
-     $BackgroundG2	= isset($Format["BackgroundG2"]) ? $Format["BackgroundG2"] : 230;
-     $BackgroundB2	= isset($Format["BackgroundB2"]) ? $Format["BackgroundB2"] : 230;
-     $BackgroundAlpha2	= isset($Format["BackgroundAlpha2"]) ? $Format["BackgroundAlpha2"] : 20;
-     $LabelingMethod	= isset($Format["LabelingMethod"]) ? $Format["LabelingMethod"] : LABELING_ALL;
-     $LabelSkip		= isset($Format["LabelSkip"]) ? $Format["LabelSkip"] : 0;
-     $LabelRotation	= isset($Format["LabelRotation"]) ? $Format["LabelRotation"] : 0;
-     $SkippedAxisTicks	= isset($Format["SkippedAxisTicks"]) ? $Format["SkippedAxisTicks"] : $GridTicks+2;
-     $SkippedAxisR	= isset($Format["SkippedAxisR"]) ? $Format["SkippedAxisR"] : $GridR;
-     $SkippedAxisG	= isset($Format["SkippedAxisG"]) ? $Format["SkippedAxisG"] : $GridG;
-     $SkippedAxisB	= isset($Format["SkippedAxisB"]) ? $Format["SkippedAxisB"] : $GridB;
-     $SkippedAxisAlpha	= isset($Format["SkippedAxisAlpha"]) ? $Format["SkippedAxisAlpha"] : $GridAlpha-30;
-     $SkippedTickR	= isset($Format["SkippedTickR"]) ? $Format["SkippedTickR"] : $TickRo;
-     $SkippedTickG	= isset($Format["SkippedTickG"]) ? $Format["SkippedTickG"] : $TickGo;
-     $SkippedTickB	= isset($Format["SkippedTicksB"]) ? $Format["SkippedTickB"] : $TickBo;
-     $SkippedTickAlpha	= isset($Format["SkippedTickAlpha"]) ? $Format["SkippedTickAlpha"] : $TickAlpha-80;
-     $SkippedInnerTickWidth	= isset($Format["SkippedInnerTickWidth"]) ? $Format["SkippedInnerTickWidth"] : 0;
-     $SkippedOuterTickWidth	= isset($Format["SkippedOuterTickWidth"]) ? $Format["SkippedOuterTickWidth"] : 2;
-
-     /* Floating scale require X & Y margins to be set manually */
-     if ( $Floating && ( $XMargin == AUTO || $YMargin == 0 ) ) { $Floating = FALSE; }
-
-     /* Skip a NOTICE event in case of an empty array */
-     if ( $DrawYLines == NONE || $DrawYLines == FALSE ) { $DrawYLines = array("zarma"=>"31"); }
-
-     /* Define the color for the skipped elements */
-     $SkippedAxisColor = array("R"=>$SkippedAxisR,"G"=>$SkippedAxisG,"B"=>$SkippedAxisB,"Alpha"=>$SkippedAxisAlpha,"Ticks"=>$SkippedAxisTicks);
-     $SkippedTickColor = array("R"=>$SkippedTickR,"G"=>$SkippedTickG,"B"=>$SkippedTickB,"Alpha"=>$SkippedTickAlpha);
-
-     $Data = $this->DataSet->getData();
-     if ( isset($Data["Abscissa"]) ) { $Abscissa = $Data["Abscissa"]; } else { $Abscissa = NULL; }
-
-     /* Unset the abscissa axis, needed if we display multiple charts on the same picture */
-     if ( $Abscissa != NULL )
-      {
-       foreach($Data["Axis"] as $AxisID => $Parameters)
-        { if ($Parameters["Identity"] == AXIS_X) { unset($Data["Axis"][$AxisID]); } }
-      }
+        $RestoreShadow = $this->Shadow; $this->Shadow = FALSE;
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"];
+            $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
-     /* Build the scale settings */
-     $GotXAxis = FALSE;
-     foreach($Data["Axis"] as $AxisID => $AxisParameter)
-      {
-       if ( $AxisParameter["Identity"] == AXIS_X ) { $GotXAxis = TRUE; }
+            if ( isset($Serie["Picture"]) )
+            {
+            $Picture = $Serie["Picture"];
+            list($PicWidth,$PicHeight) = $this->getPicInfo($Picture);
+            $PicX = $X+$IconAreaWidth/2; $PicY = $Y+$IconAreaHeight/2; 
 
-       if ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_Y)
-        { $Height = $this->GraphAreaY2-$this->GraphAreaY1 - $YMargin*2; }
-       elseif ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_X)
-        { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
-       elseif ( $Pos == SCALE_POS_TOPBOTTOM && $AxisParameter["Identity"] == AXIS_Y)
-        { $Height = $this->GraphAreaX2-$this->GraphAreaX1 - $YMargin*2;; }
-       else
-        { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
+            $this->drawFromPNG($PicX-$PicWidth/2,$PicY-$PicHeight/2,$Picture);
+            }
+            else
+            {
+            if ( $Family == LEGEND_FAMILY_BOX )
+            {
+                if ( $BoxWidth != $IconAreaWidth ) { $XOffset = floor(($IconAreaWidth-$BoxWidth)/2); } else { $XOffset = 0; }
+                if ( $BoxHeight != $IconAreaHeight ) { $YOffset = floor(($IconAreaHeight-$BoxHeight)/2); } else { $YOffset = 0; }
 
-       $AxisMin = ABSOLUTE_MAX; $AxisMax = OUT_OF_SIGHT;
-       if ( $Mode == SCALE_MODE_FLOATING || $Mode == SCALE_MODE_START0 )
-        {
-         foreach($Data["Series"] as $SerieID => $SerieParameter)
-          {
-           if ( $SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"] && $Data["Abscissa"] != $SerieID)
+                $this->drawFilledRectangle($X+1+$XOffset,$Y+1+$YOffset,$X+$BoxWidth+$XOffset+1,$Y+$BoxHeight+1+$YOffset,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
+                $this->drawFilledRectangle($X+$XOffset,$Y+$YOffset,$X+$BoxWidth+$XOffset,$Y+$BoxHeight+$YOffset,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
+            }
+            elseif ( $Family == LEGEND_FAMILY_CIRCLE )
             {
-             $AxisMax = max($AxisMax,$Data["Series"][$SerieID]["Max"]);
-             $AxisMin = min($AxisMin,$Data["Series"][$SerieID]["Min"]);
+                $this->drawFilledCircle($X+1+$IconAreaWidth/2,$Y+1+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
+                $this->drawFilledCircle($X+$IconAreaWidth/2,$Y+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
             }
-          }
-         $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
-
-         $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
-         if ( $Mode == SCALE_MODE_START0 ) { $Data["Axis"][$AxisID]["Min"] = 0; }
+            elseif ( $Family == LEGEND_FAMILY_LINE )
+            {
+                $this->drawLine($X+1,$Y+1+$IconAreaHeight/2,$X+1+$IconAreaWidth,$Y+1+$IconAreaHeight/2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20,"Ticks"=>$Ticks,"Weight"=>$Weight));
+                $this->drawLine($X,$Y+$IconAreaHeight/2,$X+$IconAreaWidth,$Y+$IconAreaHeight/2,array("R"=>$R,"G"=>$G,"B"=>$B,"Ticks"=>$Ticks,"Weight"=>$Weight));
+            }
+            }
+
+            if ( $Mode == LEGEND_VERTICAL )
+            {
+            $Lines = preg_split("/\n/",$Serie["Description"]);
+            foreach($Lines as $Key => $Value)
+            $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
+
+            $Y=$Y+max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
+            }
+            elseif ( $Mode == LEGEND_HORIZONTAL )
+            {
+            $Lines = preg_split("/\n/",$Serie["Description"]);
+            $Width = "";
+            foreach($Lines as $Key => $Value)
+            {
+                $BoxArray = $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
+                $Width[] = $BoxArray[1]["X"];
+            }
+            $X=max($Width)+2+$XStep;
+            }
+        }
+        }
+
+
+        $this->Shadow = $RestoreShadow;
+    }
+
+    function drawScale($Format="")
+    {
+        $Pos		= isset($Format["Pos"]) ? $Format["Pos"] : SCALE_POS_LEFTRIGHT;
+        $Floating		= isset($Format["Floating"]) ? $Format["Floating"] : FALSE;
+        $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : SCALE_MODE_FLOATING;
+        $RemoveXAxis	= isset($Format["RemoveXAxis"]) ? $Format["RemoveXAxis"] : FALSE;
+        $MinDivHeight	= isset($Format["MinDivHeight"]) ? $Format["MinDivHeight"] : 20;
+        $Factors		= isset($Format["Factors"]) ? $Format["Factors"] : array(1,2,5);
+        $ManualScale	= isset($Format["ManualScale"]) ? $Format["ManualScale"] : array("0"=>array("Min"=>-100,"Max"=>100));
+        $XMargin		= isset($Format["XMargin"]) ? $Format["XMargin"] : AUTO;
+        $YMargin		= isset($Format["YMargin"]) ? $Format["YMargin"] : 0;
+        $ScaleSpacing	= isset($Format["ScaleSpacing"]) ? $Format["ScaleSpacing"] : 15;
+        $InnerTickWidth	= isset($Format["InnerTickWidth"]) ? $Format["InnerTickWidth"] : 2;
+        $OuterTickWidth	= isset($Format["OuterTickWidth"]) ? $Format["OuterTickWidth"] : 2;
+        $DrawXLines	= isset($Format["DrawXLines"]) ? $Format["DrawXLines"] : TRUE;
+        $DrawYLines	= isset($Format["DrawYLines"]) ? $Format["DrawYLines"] : ALL;
+        $GridTicks		= isset($Format["GridTicks"]) ? $Format["GridTicks"] : 4;
+        $GridR		= isset($Format["GridR"]) ? $Format["GridR"] : 255;
+        $GridG		= isset($Format["GridG"]) ? $Format["GridG"] : 255;
+        $GridB		= isset($Format["GridB"]) ? $Format["GridB"] : 255;
+        $GridAlpha		= isset($Format["GridAlpha"]) ? $Format["GridAlpha"] : 40;
+        $AxisRo		= isset($Format["AxisR"]) ? $Format["AxisR"] : 0;
+        $AxisGo		= isset($Format["AxisG"]) ? $Format["AxisG"] : 0;
+        $AxisBo		= isset($Format["AxisB"]) ? $Format["AxisB"] : 0;
+        $AxisAlpha		= isset($Format["AxisAlpha"]) ? $Format["AxisAlpha"] : 100;
+        $TickRo		= isset($Format["TickR"]) ? $Format["TickR"] : 0;
+        $TickGo		= isset($Format["TickG"]) ? $Format["TickG"] : 0;
+        $TickBo		= isset($Format["TickB"]) ? $Format["TickB"] : 0;
+        $TickAlpha		= isset($Format["TickAlpha"]) ? $Format["TickAlpha"] : 100;
+        $DrawSubTicks	= isset($Format["DrawSubTicks"]) ? $Format["DrawSubTicks"] : FALSE;
+        $InnerSubTickWidth	= isset($Format["InnerSubTickWidth"]) ? $Format["InnerSubTickWidth"] : 0;
+        $OuterSubTickWidth	= isset($Format["OuterSubTickWidth"]) ? $Format["OuterSubTickWidth"] : 2;
+        $SubTickR		= isset($Format["SubTickR"]) ? $Format["SubTickR"] : 255;
+        $SubTickG		= isset($Format["SubTickG"]) ? $Format["SubTickG"] : 0;
+        $SubTickB		= isset($Format["SubTickB"]) ? $Format["SubTickB"] : 0;
+        $SubTickAlpha	= isset($Format["SubTickAlpha"]) ? $Format["SubTickAlpha"] : 100;
+        $AutoAxisLabels	= isset($Format["AutoAxisLabels"]) ? $Format["AutoAxisLabels"] : TRUE;
+        $XReleasePercent	= isset($Format["XReleasePercent"]) ? $Format["XReleasePercent"] : 1;
+        $DrawArrows	= isset($Format["DrawArrows"]) ? $Format["DrawArrows"] : FALSE;
+        $ArrowSize         = isset($Format["ArrowSize"]) ? $Format["ArrowSize"] : 8;
+        $CycleBackground	= isset($Format["CycleBackground"]) ? $Format["CycleBackground"] : FALSE;
+        $BackgroundR1	= isset($Format["BackgroundR1"]) ? $Format["BackgroundR1"] : 255;
+        $BackgroundG1	= isset($Format["BackgroundG1"]) ? $Format["BackgroundG1"] : 255;
+        $BackgroundB1	= isset($Format["BackgroundB1"]) ? $Format["BackgroundB1"] : 255;
+        $BackgroundAlpha1	= isset($Format["BackgroundAlpha1"]) ? $Format["BackgroundAlpha1"] : 20;
+        $BackgroundR2	= isset($Format["BackgroundR2"]) ? $Format["BackgroundR2"] : 230;
+        $BackgroundG2	= isset($Format["BackgroundG2"]) ? $Format["BackgroundG2"] : 230;
+        $BackgroundB2	= isset($Format["BackgroundB2"]) ? $Format["BackgroundB2"] : 230;
+        $BackgroundAlpha2	= isset($Format["BackgroundAlpha2"]) ? $Format["BackgroundAlpha2"] : 20;
+        $LabelingMethod	= isset($Format["LabelingMethod"]) ? $Format["LabelingMethod"] : LABELING_ALL;
+        $LabelSkip		= isset($Format["LabelSkip"]) ? $Format["LabelSkip"] : 0;
+        $LabelRotation	= isset($Format["LabelRotation"]) ? $Format["LabelRotation"] : 0;
+        $SkippedAxisTicks	= isset($Format["SkippedAxisTicks"]) ? $Format["SkippedAxisTicks"] : $GridTicks+2;
+        $SkippedAxisR	= isset($Format["SkippedAxisR"]) ? $Format["SkippedAxisR"] : $GridR;
+        $SkippedAxisG	= isset($Format["SkippedAxisG"]) ? $Format["SkippedAxisG"] : $GridG;
+        $SkippedAxisB	= isset($Format["SkippedAxisB"]) ? $Format["SkippedAxisB"] : $GridB;
+        $SkippedAxisAlpha	= isset($Format["SkippedAxisAlpha"]) ? $Format["SkippedAxisAlpha"] : $GridAlpha-30;
+        $SkippedTickR	= isset($Format["SkippedTickR"]) ? $Format["SkippedTickR"] : $TickRo;
+        $SkippedTickG	= isset($Format["SkippedTickG"]) ? $Format["SkippedTickG"] : $TickGo;
+        $SkippedTickB	= isset($Format["SkippedTicksB"]) ? $Format["SkippedTickB"] : $TickBo;
+        $SkippedTickAlpha	= isset($Format["SkippedTickAlpha"]) ? $Format["SkippedTickAlpha"] : $TickAlpha-80;
+        $SkippedInnerTickWidth	= isset($Format["SkippedInnerTickWidth"]) ? $Format["SkippedInnerTickWidth"] : 0;
+        $SkippedOuterTickWidth	= isset($Format["SkippedOuterTickWidth"]) ? $Format["SkippedOuterTickWidth"] : 2;
+
+        /* Floating scale require X & Y margins to be set manually */
+        if ( $Floating && ( $XMargin == AUTO || $YMargin == 0 ) ) { $Floating = FALSE; }
+
+        /* Skip a NOTICE event in case of an empty array */
+        if ( $DrawYLines == NONE || $DrawYLines == FALSE ) { $DrawYLines = array("zarma"=>"31"); }
+
+        /* Define the color for the skipped elements */
+        $SkippedAxisColor = array("R"=>$SkippedAxisR,"G"=>$SkippedAxisG,"B"=>$SkippedAxisB,"Alpha"=>$SkippedAxisAlpha,"Ticks"=>$SkippedAxisTicks);
+        $SkippedTickColor = array("R"=>$SkippedTickR,"G"=>$SkippedTickG,"B"=>$SkippedTickB,"Alpha"=>$SkippedTickAlpha);
+
+        $Data = $this->DataSet->getData();
+        if ( isset($Data["Abscissa"]) ) { $Abscissa = $Data["Abscissa"]; } else { $Abscissa = NULL; }
+
+        /* Unset the abscissa axis, needed if we display multiple charts on the same picture */
+        if ( $Abscissa != NULL )
+        {
+        foreach($Data["Axis"] as $AxisID => $Parameters)
+        { if ($Parameters["Identity"] == AXIS_X) { unset($Data["Axis"][$AxisID]); } }
+        }
+
+        /* Build the scale settings */
+        $GotXAxis = FALSE;
+        foreach($Data["Axis"] as $AxisID => $AxisParameter)
+        {
+        if ( $AxisParameter["Identity"] == AXIS_X ) { $GotXAxis = TRUE; }
+
+        if ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_Y)
+        { $Height = $this->GraphAreaY2-$this->GraphAreaY1 - $YMargin*2; }
+        elseif ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_X)
+        { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
+        elseif ( $Pos == SCALE_POS_TOPBOTTOM && $AxisParameter["Identity"] == AXIS_Y)
+        { $Height = $this->GraphAreaX2-$this->GraphAreaX1 - $YMargin*2;; }
+        else
+        { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
+
+        $AxisMin = ABSOLUTE_MAX; $AxisMax = OUT_OF_SIGHT;
+        if ( $Mode == SCALE_MODE_FLOATING || $Mode == SCALE_MODE_START0 )
+        {
+            foreach($Data["Series"] as $SerieID => $SerieParameter)
+            {
+            if ( $SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"] && $Data["Abscissa"] != $SerieID)
+            {
+                $AxisMax = max($AxisMax,$Data["Series"][$SerieID]["Max"]);
+                $AxisMin = min($AxisMin,$Data["Series"][$SerieID]["Min"]);
+            }
+            }
+            $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
+
+            $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
+            if ( $Mode == SCALE_MODE_START0 ) { $Data["Axis"][$AxisID]["Min"] = 0; }
         }
-       elseif ( $Mode == SCALE_MODE_MANUAL )
+        elseif ( $Mode == SCALE_MODE_MANUAL )
         {
-         if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) )
-          {
-           $Data["Axis"][$AxisID]["Min"] = $ManualScale[$AxisID]["Min"];
-           $Data["Axis"][$AxisID]["Max"] = $ManualScale[$AxisID]["Max"];
-          }
-         else
-          { echo "Manual scale boundaries not set."; exit(); }
+            if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) )
+            {
+            $Data["Axis"][$AxisID]["Min"] = $ManualScale[$AxisID]["Min"];
+            $Data["Axis"][$AxisID]["Max"] = $ManualScale[$AxisID]["Max"];
+            }
+            else
+            { echo "Manual scale boundaries not set."; exit(); }
         }
-       elseif ( $Mode == SCALE_MODE_ADDALL || $Mode == SCALE_MODE_ADDALL_START0 )
+        elseif ( $Mode == SCALE_MODE_ADDALL || $Mode == SCALE_MODE_ADDALL_START0 )
         {
-         $Series = "";
-         foreach($Data["Series"] as $SerieID => $SerieParameter)
-          { if ( $SerieParameter["Axis"] == $AxisID && $SerieParameter["isDrawable"] && $Data["Abscissa"] != $SerieID ) { $Series[$SerieID] = count($Data["Series"][$SerieID]["Data"]); } }
+            $Series = "";
+            foreach($Data["Series"] as $SerieID => $SerieParameter)
+            { if ( $SerieParameter["Axis"] == $AxisID && $SerieParameter["isDrawable"] && $Data["Abscissa"] != $SerieID ) { $Series[$SerieID] = count($Data["Series"][$SerieID]["Data"]); } }
 
-         for ($ID=0;$ID<=max($Series)-1;$ID++)
-          {
-           $PointMin = 0; $PointMax = 0;
-           foreach($Series as $SerieID => $ValuesCount )
+            for ($ID=0;$ID<=max($Series)-1;$ID++)
             {
-             if (isset($Data["Series"][$SerieID]["Data"][$ID]) && $Data["Series"][$SerieID]["Data"][$ID] != NULL )
-              {
-               $Value = $Data["Series"][$SerieID]["Data"][$ID];
-               if ( $Value > 0 ) { $PointMax = $PointMax + $Value; } else { $PointMin = $PointMin + $Value; }
-              }
+            $PointMin = 0; $PointMax = 0;
+            foreach($Series as $SerieID => $ValuesCount )
+            {
+                if (isset($Data["Series"][$SerieID]["Data"][$ID]) && $Data["Series"][$SerieID]["Data"][$ID] != NULL )
+                {
+                $Value = $Data["Series"][$SerieID]["Data"][$ID];
+                if ( $Value > 0 ) { $PointMax = $PointMax + $Value; } else { $PointMin = $PointMin + $Value; }
+                }
+            }
+            $AxisMax = max($AxisMax,$PointMax);
+            $AxisMin = min($AxisMin,$PointMin);
             }
-           $AxisMax = max($AxisMax,$PointMax);
-           $AxisMin = min($AxisMin,$PointMin);
-          }
-         $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
-         $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
+            $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
+            $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
         }
-       $MaxDivs = floor($Height/$MinDivHeight);
+        $MaxDivs = floor($Height/$MinDivHeight);
 
-       if ( $Mode == SCALE_MODE_ADDALL_START0 ) { $Data["Axis"][$AxisID]["Min"] = 0; }
+        if ( $Mode == SCALE_MODE_ADDALL_START0 ) { $Data["Axis"][$AxisID]["Min"] = 0; }
 
-       $Scale   = $this->computeScale($Data["Axis"][$AxisID]["Min"],$Data["Axis"][$AxisID]["Max"],$MaxDivs,$Factors,$AxisID);
+        $Scale   = $this->computeScale($Data["Axis"][$AxisID]["Min"],$Data["Axis"][$AxisID]["Max"],$MaxDivs,$Factors,$AxisID);
 
-       $Data["Axis"][$AxisID]["Margin"]    = $AxisParameter["Identity"] == AXIS_X ? $XMargin : $YMargin;
-       $Data["Axis"][$AxisID]["ScaleMin"]  = $Scale["XMin"];
-       $Data["Axis"][$AxisID]["ScaleMax"]  = $Scale["XMax"];
-       $Data["Axis"][$AxisID]["Rows"]      = $Scale["Rows"];
-       $Data["Axis"][$AxisID]["RowHeight"] = $Scale["RowHeight"];
+        $Data["Axis"][$AxisID]["Margin"]    = $AxisParameter["Identity"] == AXIS_X ? $XMargin : $YMargin;
+        $Data["Axis"][$AxisID]["ScaleMin"]  = $Scale["XMin"];
+        $Data["Axis"][$AxisID]["ScaleMax"]  = $Scale["XMax"];
+        $Data["Axis"][$AxisID]["Rows"]      = $Scale["Rows"];
+        $Data["Axis"][$AxisID]["RowHeight"] = $Scale["RowHeight"];
 
-       if ( isset($Scale["Format"]) ) { $Data["Axis"][$AxisID]["Format"] = $Scale["Format"]; }
+        if ( isset($Scale["Format"]) ) { $Data["Axis"][$AxisID]["Format"] = $Scale["Format"]; }
 
-       if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
-       if ( !isset($Data["Axis"][$AxisID]["Format"]) )  { $Data["Axis"][$AxisID]["Format"] = NULL; }
-       if ( !isset($Data["Axis"][$AxisID]["Unit"]) )    { $Data["Axis"][$AxisID]["Unit"] = NULL; }
-      }
+        if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
+        if ( !isset($Data["Axis"][$AxisID]["Format"]) )  { $Data["Axis"][$AxisID]["Format"] = NULL; }
+        if ( !isset($Data["Axis"][$AxisID]["Unit"]) )    { $Data["Axis"][$AxisID]["Unit"] = NULL; }
+        }
 
-     /* Still no X axis */
-     if ( $GotXAxis == FALSE )
-      {
-       if ( $Abscissa != NULL )
+        /* Still no X axis */
+        if ( $GotXAxis == FALSE )
+        {
+        if ( $Abscissa != NULL )
         {
-         $Points = count($Data["Series"][$Abscissa]["Data"]);
-         if ( $AutoAxisLabels )
-          $AxisName = isset($Data["Series"][$Abscissa]["Description"]) ? $Data["Series"][$Abscissa]["Description"] : NULL;
-         else
-          $AxisName = NULL;
+            $Points = count($Data["Series"][$Abscissa]["Data"]);
+            if ( $AutoAxisLabels )
+            $AxisName = isset($Data["Series"][$Abscissa]["Description"]) ? $Data["Series"][$Abscissa]["Description"] : NULL;
+            else
+            $AxisName = NULL;
         }
-       else
+        else
         {
-         $Points = 0;
-         $AxisName = isset($Data["XAxisName"]) ? $Data["XAxisName"] : NULL;
-         foreach($Data["Series"] as $SerieID => $SerieParameter)
-          { if ( $SerieParameter["isDrawable"] ) { $Points = max($Points,count($SerieParameter["Data"])); } }
+            $Points = 0;
+            $AxisName = isset($Data["XAxisName"]) ? $Data["XAxisName"] : NULL;
+            foreach($Data["Series"] as $SerieID => $SerieParameter)
+            { if ( $SerieParameter["isDrawable"] ) { $Points = max($Points,count($SerieParameter["Data"])); } }
         }
 
-       $AxisID = count($Data["Axis"]);
-       $Data["Axis"][$AxisID]["Identity"] = AXIS_X;
-       if ( $Pos == SCALE_POS_LEFTRIGHT ) { $Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_BOTTOM; } else { $Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_LEFT; }
-       if ( isset($Data["AbscissaName"]) ) { $Data["Axis"][$AxisID]["Name"] = $Data["AbscissaName"]; }
-       if ( $XMargin == AUTO )
+        $AxisID = count($Data["Axis"]);
+        $Data["Axis"][$AxisID]["Identity"] = AXIS_X;
+        if ( $Pos == SCALE_POS_LEFTRIGHT ) { $Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_BOTTOM; } else { $Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_LEFT; }
+        if ( isset($Data["AbscissaName"]) ) { $Data["Axis"][$AxisID]["Name"] = $Data["AbscissaName"]; }
+        if ( $XMargin == AUTO )
         {
-         if ( $Pos == SCALE_POS_LEFTRIGHT )
-          { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
-         else
-          { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
-
-         if ( $Points == 1 )
-          $Data["Axis"][$AxisID]["Margin"] = $Height / 2;
-         else
-          $Data["Axis"][$AxisID]["Margin"] = ($Height/$Points) / 2;
+            if ( $Pos == SCALE_POS_LEFTRIGHT )
+            { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
+            else
+            { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
+
+            if ( $Points == 1 )
+            $Data["Axis"][$AxisID]["Margin"] = $Height / 2;
+            else
+            $Data["Axis"][$AxisID]["Margin"] = ($Height/$Points) / 2;
         }
-       else
+        else
         { $Data["Axis"][$AxisID]["Margin"] = $XMargin; }
-       $Data["Axis"][$AxisID]["Rows"] = $Points-1;
-       if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
-       if ( !isset($Data["Axis"][$AxisID]["Format"]) )  { $Data["Axis"][$AxisID]["Format"] = NULL; }
-       if ( !isset($Data["Axis"][$AxisID]["Unit"]) )    { $Data["Axis"][$AxisID]["Unit"] = NULL; }
-      }
-
-     /* Do we need to reverse the abscissa position? */
-     if ( $Pos != SCALE_POS_LEFTRIGHT )
-      {
-       if ( $Data["AbsicssaPosition"] == AXIS_POSITION_BOTTOM )
+        $Data["Axis"][$AxisID]["Rows"] = $Points-1;
+        if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
+        if ( !isset($Data["Axis"][$AxisID]["Format"]) )  { $Data["Axis"][$AxisID]["Format"] = NULL; }
+        if ( !isset($Data["Axis"][$AxisID]["Unit"]) )    { $Data["Axis"][$AxisID]["Unit"] = NULL; }
+        }
+
+        /* Do we need to reverse the abscissa position? */
+        if ( $Pos != SCALE_POS_LEFTRIGHT )
+        {
+        if ( $Data["AbsicssaPosition"] == AXIS_POSITION_BOTTOM )
         { $Data["AbsicssaPosition"] = AXIS_POSITION_LEFT; }
-       else
+        else
         { $Data["AbsicssaPosition"] = AXIS_POSITION_RIGHT; }
-      }
-     $Data["Axis"][$AxisID]["Position"] = $Data["AbsicssaPosition"];
+        }
+        $Data["Axis"][$AxisID]["Position"] = $Data["AbsicssaPosition"];
 
-     $this->DataSet->saveOrientation($Pos);
-     $this->DataSet->saveAxisConfig($Data["Axis"]);
-     $this->DataSet->saveYMargin($YMargin);
+        $this->DataSet->saveOrientation($Pos);
+        $this->DataSet->saveAxisConfig($Data["Axis"]);
+        $this->DataSet->saveYMargin($YMargin);
 
-     $FontColorRo = $this->FontColorR; $FontColorGo = $this->FontColorG; $FontColorBo = $this->FontColorB;
+        $FontColorRo = $this->FontColorR; $FontColorGo = $this->FontColorG; $FontColorBo = $this->FontColorB;
 
-     $AxisPos["L"] = $this->GraphAreaX1; $AxisPos["R"] = $this->GraphAreaX2; $AxisPos["T"] = $this->GraphAreaY1; $AxisPos["B"] = $this->GraphAreaY2;
-     foreach($Data["Axis"] as $AxisID => $Parameters)
-      {
-       if ( isset($Parameters["Color"]) )
+        $AxisPos["L"] = $this->GraphAreaX1; $AxisPos["R"] = $this->GraphAreaX2; $AxisPos["T"] = $this->GraphAreaY1; $AxisPos["B"] = $this->GraphAreaY2;
+        foreach($Data["Axis"] as $AxisID => $Parameters)
+        {
+        if ( isset($Parameters["Color"]) )
         {
-         $AxisR = $Parameters["Color"]["R"]; $AxisG = $Parameters["Color"]["G"]; $AxisB = $Parameters["Color"]["B"];
-         $TickR = $Parameters["Color"]["R"]; $TickG = $Parameters["Color"]["G"]; $TickB = $Parameters["Color"]["B"];
-         $this->setFontProperties(array("R"=>$Parameters["Color"]["R"],"G"=>$Parameters["Color"]["G"],"B"=>$Parameters["Color"]["B"]));
+            $AxisR = $Parameters["Color"]["R"]; $AxisG = $Parameters["Color"]["G"]; $AxisB = $Parameters["Color"]["B"];
+            $TickR = $Parameters["Color"]["R"]; $TickG = $Parameters["Color"]["G"]; $TickB = $Parameters["Color"]["B"];
+            $this->setFontProperties(array("R"=>$Parameters["Color"]["R"],"G"=>$Parameters["Color"]["G"],"B"=>$Parameters["Color"]["B"]));
         }
-       else
+        else
         {
-         $AxisR = $AxisRo; $AxisG = $AxisGo; $AxisB = $AxisBo;
-         $TickR = $TickRo; $TickG = $TickGo; $TickB = $TickBo;
-         $this->setFontProperties(array("R"=>$FontColorRo,"G"=>$FontColorGo,"B"=>$FontColorBo));
+            $AxisR = $AxisRo; $AxisG = $AxisGo; $AxisB = $AxisBo;
+            $TickR = $TickRo; $TickG = $TickGo; $TickB = $TickBo;
+            $this->setFontProperties(array("R"=>$FontColorRo,"G"=>$FontColorGo,"B"=>$FontColorBo));
         }
 
-       $LastValue = "w00t"; $ID = 1;
-       if ( $Parameters["Identity"] == AXIS_X )
+        $LastValue = "w00t"; $ID = 1;
+        if ( $Parameters["Identity"] == AXIS_X )
         {
-         if ( $Pos == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
+            if ( $Pos == SCALE_POS_LEFTRIGHT )
             {
-             if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 2; }
-             if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $YLabelOffset = 5; }
-             if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 5; }
-             if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
+            if ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
+            {
+                if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 2; }
+                if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $YLabelOffset = 5; }
+                if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 5; }
+                if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
 
-             if ( !$RemoveXAxis )
-              {
-               if ( $Floating )
+                if ( !$RemoveXAxis )
+                {
+                if ( $Floating )
                 { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                else
                 { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-               if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
-              }
+                if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                }
 
-             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+                $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
 
-             if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / ($Parameters["Rows"]); }
+                if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / ($Parameters["Rows"]); }
              
-             $MaxBottom = $AxisPos["B"];
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
-               $YPos  = $AxisPos["B"];
+                $MaxBottom = $AxisPos["B"];
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+                $YPos  = $AxisPos["B"];
 
-               if ( $Abscissa != NULL )
+                if ( $Abscissa != NULL )
                 { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
+                else
                 {
-                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
-                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
-                 else
-                  $Value = $i;
+                    if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
+                    $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                    else
+                    $Value = $i;
                 }
 
-               $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
+                $ID++; $Skipped = TRUE;
+                if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
                 {
-                 $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
-                 $TxtBottom = $YPos+$OuterTickWidth+2+($Bounds[0]["Y"]-$Bounds[2]["Y"]);
-                 $MaxBottom = max($MaxBottom,$TxtBottom);
-                 $LastValue = $Value;
-                 $Skipped   = FALSE;
+                    $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
+                    $TxtBottom = $YPos+$OuterTickWidth+2+($Bounds[0]["Y"]-$Bounds[2]["Y"]);
+                    $MaxBottom = max($MaxBottom,$TxtBottom);
+                    $LastValue = $Value;
+                    $Skipped   = FALSE;
                 }
 
-               if ( $RemoveXAxis ) { $Skipped   = FALSE; }
+                if ( $RemoveXAxis ) { $Skipped   = FALSE; }
 
-               if ( $Skipped )
+                if ( $Skipped )
                 {
-                 if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
-                 if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$SkippedInnerTickWidth,$XPos,$YPos+$SkippedOuterTickWidth,$SkippedTickColor); }
+                    if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
+                    if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$SkippedInnerTickWidth,$XPos,$YPos+$SkippedOuterTickWidth,$SkippedTickColor); }
                 }
-               else
+                else
                 {
-                 if ( $DrawXLines && ($XPos != $this->GraphAreaX1 && $XPos != $this->GraphAreaX2) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
-                 if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$InnerTickWidth,$XPos,$YPos+$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                    if ( $DrawXLines && ($XPos != $this->GraphAreaX1 && $XPos != $this->GraphAreaX2) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                    if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$InnerTickWidth,$XPos,$YPos+$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                }
                 }
-              }
 
-             if ( isset($Parameters["Name"]) && !$RemoveXAxis)
-              {
-               $YPos   = $MaxBottom+2;
-               $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
-               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
-               $MaxBottom = $Bounds[0]["Y"];
+                if ( isset($Parameters["Name"]) && !$RemoveXAxis)
+                {
+                $YPos   = $MaxBottom+2;
+                $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
+                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
+                $MaxBottom = $Bounds[0]["Y"];
 
-               $this->DataSet->Data["GraphArea"]["Y2"] = $MaxBottom + $this->FontSize;
-              }
+                $this->DataSet->Data["GraphArea"]["Y2"] = $MaxBottom + $this->FontSize;
+                }
 
-             $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
+                $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
             }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_TOP )
+            elseif ( $Parameters["Position"] == AXIS_POSITION_TOP )
             {
-             if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 2; }
-             if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
-             if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 5; }
-             if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $YLabelOffset = 5; }
+                if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 2; }
+                if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
+                if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 5; }
+                if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $YLabelOffset = 5; }
 
-             if ( !$RemoveXAxis )
-              {
-               if ( $Floating )
+                if ( !$RemoveXAxis )
+                {
+                if ( $Floating )
                 { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                else
                 { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-               if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
-              }
+                if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                }
 
-             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+                $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
 
-             if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / $Parameters["Rows"]; }
+                if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / $Parameters["Rows"]; }
              
-             $MinTop = $AxisPos["T"];
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
-               $YPos  = $AxisPos["T"];
+                $MinTop = $AxisPos["T"];
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+                $YPos  = $AxisPos["T"];
 
-               if ( $Abscissa != NULL )
+                if ( $Abscissa != NULL )
                 { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
+                else
                 {
-                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
-                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
-                 else
-                  $Value = $i;
+                    if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
+                    $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                    else
+                    $Value = $i;
                 }
 
-               $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
+                $ID++; $Skipped = TRUE;
+                if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
                 {
-                 $Bounds = $this->drawText($XPos,$YPos-$OuterTickWidth-$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
-                 $TxtBox = $YPos-$OuterTickWidth-2-($Bounds[0]["Y"]-$Bounds[2]["Y"]);
-                 $MinTop = min($MinTop,$TxtBox);
-                 $LastValue = $Value;
-                 $Skipped   = FALSE;
+                    $Bounds = $this->drawText($XPos,$YPos-$OuterTickWidth-$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
+                    $TxtBox = $YPos-$OuterTickWidth-2-($Bounds[0]["Y"]-$Bounds[2]["Y"]);
+                    $MinTop = min($MinTop,$TxtBox);
+                    $LastValue = $Value;
+                    $Skipped   = FALSE;
                 }
 
-               if ( $RemoveXAxis ) { $Skipped   = FALSE; }
+                if ( $RemoveXAxis ) { $Skipped   = FALSE; }
 
-               if ( $Skipped )
+                if ( $Skipped )
                 {
-                 if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
-                 if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$SkippedInnerTickWidth,$XPos,$YPos-$SkippedOuterTickWidth,$SkippedTickColor); }
+                    if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
+                    if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$SkippedInnerTickWidth,$XPos,$YPos-$SkippedOuterTickWidth,$SkippedTickColor); }
                 }
-               else
+                else
                 {
-                 if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
-                 if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$InnerTickWidth,$XPos,$YPos-$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                    if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                    if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$InnerTickWidth,$XPos,$YPos-$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
                 }
 
-              }
+                }
 
-             if ( isset($Parameters["Name"]) && !$RemoveXAxis )
-              {
-               $YPos   = $MinTop-2;
-               $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
-               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-               $MinTop = $Bounds[2]["Y"];
+                if ( isset($Parameters["Name"]) && !$RemoveXAxis )
+                {
+                $YPos   = $MinTop-2;
+                $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
+                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+                $MinTop = $Bounds[2]["Y"];
 
-               $this->DataSet->Data["GraphArea"]["Y1"] = $MinTop;
-              }
+                $this->DataSet->Data["GraphArea"]["Y1"] = $MinTop;
+                }
 
-             $AxisPos["T"] = $MinTop - $ScaleSpacing;
+                $AxisPos["T"] = $MinTop - $ScaleSpacing;
+            }
             }
-          }
-         elseif ( $Pos == SCALE_POS_TOPBOTTOM )
-          {
-           if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
+            elseif ( $Pos == SCALE_POS_TOPBOTTOM )
             {
-             if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -2; }
-             if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -6; }
-             if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = -2; }
-             if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = -5; }
+            if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
+            {
+                if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -2; }
+                if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -6; }
+                if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = -2; }
+                if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = -5; }
 
-             if ( !$RemoveXAxis )
-              {
-               if ( $Floating )
+                if ( !$RemoveXAxis )
+                {
+                if ( $Floating )
                 { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                else
                 { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-               if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
-              }
+                if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                }
 
-             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+                $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
 
-             if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
+                if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
 
-             $MinLeft = $AxisPos["L"];
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
-               $XPos  = $AxisPos["L"];
+                $MinLeft = $AxisPos["L"];
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
+                $XPos  = $AxisPos["L"];
 
-               if ( $Abscissa != NULL )
+                if ( $Abscissa != NULL )
                 { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
+                else
                 {
-                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
-                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
-                 else
-                  $Value = $i;
+                    if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
+                    $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                    else
+                    $Value = $i;
                 }
 
-               $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
+                $ID++; $Skipped = TRUE;
+                if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
                 {
-                 $Bounds  = $this->drawText($XPos-$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
-                 $TxtBox  = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
-                 $MinLeft = min($MinLeft,$TxtBox);
-                 $LastValue = $Value;
-                 $Skipped   = FALSE;
+                    $Bounds  = $this->drawText($XPos-$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
+                    $TxtBox  = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
+                    $MinLeft = min($MinLeft,$TxtBox);
+                    $LastValue = $Value;
+                    $Skipped   = FALSE;
                 }
 
-               if ( $RemoveXAxis ) { $Skipped   = FALSE; }
+                if ( $RemoveXAxis ) { $Skipped   = FALSE; }
 
-               if ( $Skipped )
+                if ( $Skipped )
                 {
-                 if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
-                 if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$SkippedOuterTickWidth,$YPos,$XPos+$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
+                    if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
+                    if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$SkippedOuterTickWidth,$YPos,$XPos+$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
                 }
-               else
+                else
                 {
-                 if ( $DrawXLines && ($YPos != $this->GraphAreaY1 && $YPos != $this->GraphAreaY2) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
-                 if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                    if ( $DrawXLines && ($YPos != $this->GraphAreaY1 && $YPos != $this->GraphAreaY2) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                    if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
                 }
 
-              }
-             if ( isset($Parameters["Name"]) && !$RemoveXAxis )
-              {
-               $XPos   = $MinLeft-2;
-               $YPos   = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
-               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
-               $MinLeft = $Bounds[0]["X"];
+                }
+                if ( isset($Parameters["Name"]) && !$RemoveXAxis )
+                {
+                $XPos   = $MinLeft-2;
+                $YPos   = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
+                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
+                $MinLeft = $Bounds[0]["X"];
 
-               $this->DataSet->Data["GraphArea"]["X1"] = $MinLeft;
-              }
+                $this->DataSet->Data["GraphArea"]["X1"] = $MinLeft;
+                }
 
-             $AxisPos["L"] = $MinLeft - $ScaleSpacing;
+                $AxisPos["L"] = $MinLeft - $ScaleSpacing;
             }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
+            elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
             {
-             if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 2; }
-             if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 6; }
-             if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = 5; }
-             if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = 7; }
+                if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 2; }
+                if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 6; }
+                if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = 5; }
+                if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = 7; }
 
-             if ( !$RemoveXAxis )
-              {
-               if ( $Floating )
+                if ( !$RemoveXAxis )
+                {
+                if ( $Floating )
                 { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                else
                 { $FloatingOffset = 0; $this->drawLine($AxisPos["R"],$this->GraphAreaY1,$AxisPos["R"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-               if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
-              }
+                if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                }
 
-             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+                $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
 
-             if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
+                if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
              
-             $MaxRight = $AxisPos["R"];
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
-               $XPos  = $AxisPos["R"];
+                $MaxRight = $AxisPos["R"];
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
+                $XPos  = $AxisPos["R"];
 
-               if ( $Abscissa != NULL )
+                if ( $Abscissa != NULL )
                 { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
+                else
                 {
-                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
-                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
-                 else
-                  $Value = $i;
+                    if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
+                    $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                    else
+                    $Value = $i;
                 }
 
-               $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
+                $ID++; $Skipped = TRUE;
+                if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
                 {
-                 $Bounds   = $this->drawText($XPos+$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
-                 $TxtBox   = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
-                 $MaxRight = max($MaxRight,$TxtBox);
-                 $LastValue = $Value;
-                 $Skipped   = FALSE;
+                    $Bounds   = $this->drawText($XPos+$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
+                    $TxtBox   = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
+                    $MaxRight = max($MaxRight,$TxtBox);
+                    $LastValue = $Value;
+                    $Skipped   = FALSE;
                 }
 
-               if ( $RemoveXAxis ) { $Skipped   = FALSE; }
+                if ( $RemoveXAxis ) { $Skipped   = FALSE; }
 
-               if ( $Skipped )
+                if ( $Skipped )
                 {
-                 if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
-                 if ( ($SkippedInnerTickWidth != 0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$SkippedOuterTickWidth,$YPos,$XPos-$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
+                    if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
+                    if ( ($SkippedInnerTickWidth != 0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$SkippedOuterTickWidth,$YPos,$XPos-$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
                 }
-               else
+                else
                 {
-                 if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
-                 if ( ($InnerTickWidth != 0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$OuterTickWidth,$YPos,$XPos-$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                    if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                    if ( ($InnerTickWidth != 0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$OuterTickWidth,$YPos,$XPos-$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
                 }
 
-              }
+                }
 
-             if ( isset($Parameters["Name"]) && !$RemoveXAxis)
-              {
-               $XPos   = $MaxRight+4;
-               $YPos   = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
-               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
-               $MaxRight = $Bounds[1]["X"];
+                if ( isset($Parameters["Name"]) && !$RemoveXAxis)
+                {
+                $XPos   = $MaxRight+4;
+                $YPos   = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
+                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
+                $MaxRight = $Bounds[1]["X"];
 
-               $this->DataSet->Data["GraphArea"]["X2"] = $MaxRight + $this->FontSize;
-              }
+                $this->DataSet->Data["GraphArea"]["X2"] = $MaxRight + $this->FontSize;
+                }
 
-             $AxisPos["R"] = $MaxRight + $ScaleSpacing;
+                $AxisPos["R"] = $MaxRight + $ScaleSpacing;
+            }
             }
-          }
         }
 
 
 
-       if ( $Parameters["Identity"] == AXIS_Y )
+        if ( $Parameters["Identity"] == AXIS_Y )
         {
-         if ( $Pos == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
+            if ( $Pos == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
             {
 
-             if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
-              { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                if ( $Floating )
+                { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                else
+                { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-             if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
 
-             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
-             $Step   = $Height / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MinLeft = $AxisPos["L"];
-             $LastY  = NULL;
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $YPos  = $this->GraphAreaY2 - $Parameters["Margin"] - $Step*$i;
-               $XPos  = $AxisPos["L"];
-               $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
+                $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+                $Step   = $Height / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MinLeft = $AxisPos["L"];
+                $LastY  = NULL;
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $YPos  = $this->GraphAreaY2 - $Parameters["Margin"] - $Step*$i;
+                $XPos  = $AxisPos["L"];
+                $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
 
-               if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
-               if ( $LastY != NULL && $CycleBackground && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($this->GraphAreaX1+$FloatingOffset,$LastY,$this->GraphAreaX2-$FloatingOffset,$YPos,$BGColor); }
+                if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
+                if ( $LastY != NULL && $CycleBackground && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($this->GraphAreaX1+$FloatingOffset,$LastY,$this->GraphAreaX2-$FloatingOffset,$YPos,$BGColor); }
 
-               if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
+                if ( $DrawSubTicks && $i != $Parameters["Rows"] )
                 $this->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
 
-               $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
-               $Bounds  = $this->drawText($XPos-$OuterTickWidth-2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
-               $TxtLeft = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
-               $MinLeft = min($MinLeft,$TxtLeft);
+                $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
+                $Bounds  = $this->drawText($XPos-$OuterTickWidth-2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
+                $TxtLeft = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
+                $MinLeft = min($MinLeft,$TxtLeft);
 
-               $LastY = $YPos;
-              }
+                $LastY = $YPos;
+                }
 
-             if ( isset($Parameters["Name"]) )
-              {
-               $XPos    = $MinLeft-2;
-               $YPos    = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
-               $Bounds  = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
-               $MinLeft = $Bounds[2]["X"];
+                if ( isset($Parameters["Name"]) )
+                {
+                $XPos    = $MinLeft-2;
+                $YPos    = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
+                $Bounds  = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
+                $MinLeft = $Bounds[2]["X"];
 
-               $this->DataSet->Data["GraphArea"]["X1"] = $MinLeft;
-              }
+                $this->DataSet->Data["GraphArea"]["X1"] = $MinLeft;
+                }
 
-             $AxisPos["L"] = $MinLeft - $ScaleSpacing;
+                $AxisPos["L"] = $MinLeft - $ScaleSpacing;
             }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
+            elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
             {
-             if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
-              { $FloatingOffset = 0; $this->drawLine($AxisPos["R"],$this->GraphAreaY1,$AxisPos["R"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                if ( $Floating )
+                { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                else
+                { $FloatingOffset = 0; $this->drawLine($AxisPos["R"],$this->GraphAreaY1,$AxisPos["R"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-             if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
 
-             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
-             $Step   = $Height / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MaxLeft = $AxisPos["R"];
-             $LastY  = NULL;
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $YPos  = $this->GraphAreaY2 - $Parameters["Margin"] - $Step*$i;
-               $XPos  = $AxisPos["R"];
-               $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
+                $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+                $Step   = $Height / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MaxLeft = $AxisPos["R"];
+                $LastY  = NULL;
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $YPos  = $this->GraphAreaY2 - $Parameters["Margin"] - $Step*$i;
+                $XPos  = $AxisPos["R"];
+                $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
 
-               if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
-               if ( $LastY != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($this->GraphAreaX1+$FloatingOffset,$LastY,$this->GraphAreaX2-$FloatingOffset,$YPos,$BGColor); }
+                if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
+                if ( $LastY != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($this->GraphAreaX1+$FloatingOffset,$LastY,$this->GraphAreaX2-$FloatingOffset,$YPos,$BGColor); }
 
-               if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
+                if ( $DrawSubTicks && $i != $Parameters["Rows"] )
                 $this->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
 
-               $this->drawLine($XPos-$InnerTickWidth,$YPos,$XPos+$OuterTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
-               $Bounds  = $this->drawText($XPos+$OuterTickWidth+2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
-               $TxtLeft = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
-               $MaxLeft = max($MaxLeft,$TxtLeft);
+                $this->drawLine($XPos-$InnerTickWidth,$YPos,$XPos+$OuterTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
+                $Bounds  = $this->drawText($XPos+$OuterTickWidth+2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
+                $TxtLeft = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
+                $MaxLeft = max($MaxLeft,$TxtLeft);
 
-               $LastY = $YPos;
-              }
+                $LastY = $YPos;
+                }
 
-             if ( isset($Parameters["Name"]) )
-              {
-               $XPos    = $MaxLeft+6;
-               $YPos    = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
-               $Bounds  = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
-               $MaxLeft = $Bounds[2]["X"];
+                if ( isset($Parameters["Name"]) )
+                {
+                $XPos    = $MaxLeft+6;
+                $YPos    = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
+                $Bounds  = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
+                $MaxLeft = $Bounds[2]["X"];
 
-               $this->DataSet->Data["GraphArea"]["X2"] = $MaxLeft + $this->FontSize;
-              }
-             $AxisPos["R"] = $MaxLeft + $ScaleSpacing;
+                $this->DataSet->Data["GraphArea"]["X2"] = $MaxLeft + $this->FontSize;
+                }
+                $AxisPos["R"] = $MaxLeft + $ScaleSpacing;
+            }
             }
-          }
-         elseif ( $Pos == SCALE_POS_TOPBOTTOM )
-          {
-           if ( $Parameters["Position"] == AXIS_POSITION_TOP )
+            elseif ( $Pos == SCALE_POS_TOPBOTTOM )
             {
-             if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
-              { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+            if ( $Parameters["Position"] == AXIS_POSITION_TOP )
+            {
+                if ( $Floating )
+                { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                else
+                { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-             if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
 
-             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
-             $Step   = $Width / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MinTop = $AxisPos["T"];
-             $LastX  = NULL;
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
-               $YPos  = $AxisPos["T"];
-               $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
+                $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+                $Step   = $Width / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MinTop = $AxisPos["T"];
+                $LastX  = NULL;
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+                $YPos  = $AxisPos["T"];
+                $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
 
-               if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
-               if ( $LastX != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($LastX,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$BGColor); }
+                if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
+                if ( $LastX != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($LastX,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$BGColor); }
 
-               if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
+                if ( $DrawSubTicks && $i != $Parameters["Rows"] )
                 $this->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
 
-               $this->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
-               $Bounds    = $this->drawText($XPos,$YPos-$OuterTickWidth-2,$Value,array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-               $TxtHeight = $YPos-$OuterTickWidth-2-($Bounds[1]["Y"]-$Bounds[2]["Y"]);
-               $MinTop    = min($MinTop,$TxtHeight);
+                $this->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
+                $Bounds    = $this->drawText($XPos,$YPos-$OuterTickWidth-2,$Value,array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+                $TxtHeight = $YPos-$OuterTickWidth-2-($Bounds[1]["Y"]-$Bounds[2]["Y"]);
+                $MinTop    = min($MinTop,$TxtHeight);
 
-               $LastX = $XPos;
-              }
+                $LastX = $XPos;
+                }
 
-             if ( isset($Parameters["Name"]) )
-              {
-               $YPos   = $MinTop-2;
-               $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
-               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-               $MinTop = $Bounds[2]["Y"];
+                if ( isset($Parameters["Name"]) )
+                {
+                $YPos   = $MinTop-2;
+                $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
+                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+                $MinTop = $Bounds[2]["Y"];
 
-               $this->DataSet->Data["GraphArea"]["Y1"] = $MinTop;
-              }
+                $this->DataSet->Data["GraphArea"]["Y1"] = $MinTop;
+                }
 
-             $AxisPos["T"] = $MinTop - $ScaleSpacing;
+                $AxisPos["T"] = $MinTop - $ScaleSpacing;
             }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
+            elseif ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
             {
-             if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
-              { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                if ( $Floating )
+                { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                else
+                { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-             if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
 
-             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
-             $Step   = $Width / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MaxBottom = $AxisPos["B"];
-             $LastX  = NULL;
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
-               $YPos  = $AxisPos["B"];
-               $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
+                $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+                $Step   = $Width / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MaxBottom = $AxisPos["B"];
+                $LastX  = NULL;
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+                $YPos  = $AxisPos["B"];
+                $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
 
-               if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
-               if ( $LastX != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($LastX,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$BGColor); }
+                if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
+                if ( $LastX != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($LastX,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$BGColor); }
 
-               if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
+                if ( $DrawSubTicks && $i != $Parameters["Rows"] )
                 $this->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
 
-               $this->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
-               $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+2,$Value,array("Align"=>TEXT_ALIGN_TOPMIDDLE));
-               $TxtHeight = $YPos+$OuterTickWidth+2+($Bounds[1]["Y"]-$Bounds[2]["Y"]);
-               $MaxBottom = max($MaxBottom,$TxtHeight);
+                $this->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
+                $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+2,$Value,array("Align"=>TEXT_ALIGN_TOPMIDDLE));
+                $TxtHeight = $YPos+$OuterTickWidth+2+($Bounds[1]["Y"]-$Bounds[2]["Y"]);
+                $MaxBottom = max($MaxBottom,$TxtHeight);
 
-               $LastX = $XPos;
-              }
+                $LastX = $XPos;
+                }
 
-             if ( isset($Parameters["Name"]) )
-              {
-               $YPos   = $MaxBottom+2;
-               $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
-               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
-               $MaxBottom = $Bounds[0]["Y"];
+                if ( isset($Parameters["Name"]) )
+                {
+                $YPos   = $MaxBottom+2;
+                $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
+                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
+                $MaxBottom = $Bounds[0]["Y"];
 
-               $this->DataSet->Data["GraphArea"]["Y2"] = $MaxBottom + $this->FontSize;
-              }
+                $this->DataSet->Data["GraphArea"]["Y2"] = $MaxBottom + $this->FontSize;
+                }
 
-             $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
+                $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
+            }
             }
-          }
         }
-      }
+        }
     }
 
-   function isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip)
+    function isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip)
     {
-     if ( $LabelingMethod == LABELING_DIFFERENT && $Value != $LastValue ) { return(TRUE); }
-     if ( $LabelingMethod == LABELING_DIFFERENT && $Value == $LastValue ) { return(FALSE); }
-     if ( $LabelingMethod == LABELING_ALL && $LabelSkip == 0 ) { return(TRUE); }
-     if ( $LabelingMethod == LABELING_ALL && ($ID+$LabelSkip) % ($LabelSkip+1) != 1 ) { return(FALSE); }
+        if ( $LabelingMethod == LABELING_DIFFERENT && $Value != $LastValue ) { return(TRUE); }
+        if ( $LabelingMethod == LABELING_DIFFERENT && $Value == $LastValue ) { return(FALSE); }
+        if ( $LabelingMethod == LABELING_ALL && $LabelSkip == 0 ) { return(TRUE); }
+        if ( $LabelingMethod == LABELING_ALL && ($ID+$LabelSkip) % ($LabelSkip+1) != 1 ) { return(FALSE); }
 
-     return(TRUE);
+        return(TRUE);
     }
 
-   /* Compute the scale, check for the best visual factors */
-   function computeScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID=0)
+    /* Compute the scale, check for the best visual factors */
+    function computeScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID=0)
     {
-     /* Compute each factors */
-     $Results = "";
-     foreach ($Factors as $Key => $Factor)
-      $Results[$Factor] = $this->processScale($XMin,$XMax,$MaxDivs,array($Factor),$AxisID);
-
-     /* Remove scales that are creating to much decimals */
-     $GoodScaleFactors = "";
-     foreach ($Results as $Key => $Result)
-      {
-       $Decimals = preg_split("/\./",$Result["RowHeight"]);
-       if ( (!isset($Decimals[1])) || (strlen($Decimals[1]) < 6) ) { $GoodScaleFactors[] = $Key; }
-      }
-
-     /* Found no correct scale, shame,... returns the 1st one as default */
-     if ( $GoodScaleFactors == "" ) { return($Results[$Factors[0]]); }
-
-     /* Find the factor that cause the maximum number of Rows */
-     $MaxRows = 0; $BestFactor = 0;
-     foreach($GoodScaleFactors as $Key => $Factor)
-      { if ( $Results[$Factor]["Rows"] > $MaxRows ) { $MaxRows = $Results[$Factor]["Rows"]; $BestFactor = $Factor; } }
-
-     /* Return the best visual scale */
-     return($Results[$BestFactor]);
+        /* Compute each factors */
+        $Results = "";
+        foreach ($Factors as $Key => $Factor)
+        $Results[$Factor] = $this->processScale($XMin,$XMax,$MaxDivs,array($Factor),$AxisID);
+
+        /* Remove scales that are creating to much decimals */
+        $GoodScaleFactors = "";
+        foreach ($Results as $Key => $Result)
+        {
+        $Decimals = preg_split("/\./",$Result["RowHeight"]);
+        if ( (!isset($Decimals[1])) || (strlen($Decimals[1]) < 6) ) { $GoodScaleFactors[] = $Key; }
+        }
+
+        /* Found no correct scale, shame,... returns the 1st one as default */
+        if ( $GoodScaleFactors == "" ) { return($Results[$Factors[0]]); }
+
+        /* Find the factor that cause the maximum number of Rows */
+        $MaxRows = 0; $BestFactor = 0;
+        foreach($GoodScaleFactors as $Key => $Factor)
+        { if ( $Results[$Factor]["Rows"] > $MaxRows ) { $MaxRows = $Results[$Factor]["Rows"]; $BestFactor = $Factor; } }
+
+        /* Return the best visual scale */
+        return($Results[$BestFactor]);
     }
 
-   /* Compute the best matching scale based on size & factors */
-   function processScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID)
+    /* Compute the best matching scale based on size & factors */
+    function processScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID)
     {
-     $ScaleHeight = abs(ceil($XMax)-floor($XMin));
+        $ScaleHeight = abs(ceil($XMax)-floor($XMin));
 
-     if ( isset($this->DataSet->Data["Axis"][$AxisID]["Format"]) )
-      $Format = $this->DataSet->Data["Axis"][$AxisID]["Format"];
-     else
-      $Format = NULL;
+        if ( isset($this->DataSet->Data["Axis"][$AxisID]["Format"]) )
+        $Format = $this->DataSet->Data["Axis"][$AxisID]["Format"];
+        else
+        $Format = NULL;
 
-     if ( isset($this->DataSet->Data["Axis"][$AxisID]["Display"]) )
-      $Mode = $this->DataSet->Data["Axis"][$AxisID]["Display"];
-     else
-      $Mode = AXIS_FORMAT_DEFAULT;
+        if ( isset($this->DataSet->Data["Axis"][$AxisID]["Display"]) )
+        $Mode = $this->DataSet->Data["Axis"][$AxisID]["Display"];
+        else
+        $Mode = AXIS_FORMAT_DEFAULT;
 
-     $Scale = "";
-     if ( $XMin != $XMax )
-      {
-       $Found = FALSE; $Rescaled = FALSE; $Scaled10Factor = .0001; $Result = 0;
-       while(!$Found)
+        $Scale = "";
+        if ( $XMin != $XMax )
         {
-         foreach($Factors as $Key => $Factor)
-          {
-           if ( !$Found )
+        $Found = FALSE; $Rescaled = FALSE; $Scaled10Factor = .0001; $Result = 0;
+        while(!$Found)
+        {
+            foreach($Factors as $Key => $Factor)
+            {
+            if ( !$Found )
             {
-             if ( !($this->modulo($XMin,$Factor*$Scaled10Factor) == 0) || ($XMin != floor($XMin))) { $XMinRescaled = floor($XMin/($Factor*$Scaled10Factor))*$Factor*$Scaled10Factor; } else { $XMinRescaled = $XMin; }
-             if ( !($this->modulo($XMax,$Factor*$Scaled10Factor) == 0) || ($XMax != floor($XMax))) { $XMaxRescaled = floor($XMax/($Factor*$Scaled10Factor))*$Factor*$Scaled10Factor+($Factor*$Scaled10Factor); } else { $XMaxRescaled = $XMax; }
-             $ScaleHeightRescaled = abs($XMaxRescaled-$XMinRescaled);
+                if ( !($this->modulo($XMin,$Factor*$Scaled10Factor) == 0) || ($XMin != floor($XMin))) { $XMinRescaled = floor($XMin/($Factor*$Scaled10Factor))*$Factor*$Scaled10Factor; } else { $XMinRescaled = $XMin; }
+                if ( !($this->modulo($XMax,$Factor*$Scaled10Factor) == 0) || ($XMax != floor($XMax))) { $XMaxRescaled = floor($XMax/($Factor*$Scaled10Factor))*$Factor*$Scaled10Factor+($Factor*$Scaled10Factor); } else { $XMaxRescaled = $XMax; }
+                $ScaleHeightRescaled = abs($XMaxRescaled-$XMinRescaled);
 
-             if ( !$Found && floor($ScaleHeightRescaled/($Factor*$Scaled10Factor)) <= $MaxDivs ) { $Found = TRUE; $Rescaled = TRUE; $Result = $Factor * $Scaled10Factor; }
+                if ( !$Found && floor($ScaleHeightRescaled/($Factor*$Scaled10Factor)) <= $MaxDivs ) { $Found = TRUE; $Rescaled = TRUE; $Result = $Factor * $Scaled10Factor; }
             }
-          }
-         $Scaled10Factor = $Scaled10Factor * 10;
+            }
+            $Scaled10Factor = $Scaled10Factor * 10;
         }
 
-       /* ReCall Min / Max / Height */
-       if ( $Rescaled ) { $XMin = $XMinRescaled; $XMax = $XMaxRescaled; $ScaleHeight = $ScaleHeightRescaled; }
+        /* ReCall Min / Max / Height */
+        if ( $Rescaled ) { $XMin = $XMinRescaled; $XMax = $XMaxRescaled; $ScaleHeight = $ScaleHeightRescaled; }
 
-       /* Compute rows size */
-       $Rows      = floor($ScaleHeight / $Result); if ( $Rows == 0 ) { $Rows = 1; }
-       $RowHeight = $ScaleHeight / $Rows;
+        /* Compute rows size */
+        $Rows      = floor($ScaleHeight / $Result); if ( $Rows == 0 ) { $Rows = 1; }
+        $RowHeight = $ScaleHeight / $Rows;
 
-       /* Return the results */
-       $Scale["Rows"] = $Rows; $Scale["RowHeight"] = $RowHeight; $Scale["XMin"] = $XMin;  $Scale["XMax"] = $XMax;
+        /* Return the results */
+        $Scale["Rows"] = $Rows; $Scale["RowHeight"] = $RowHeight; $Scale["XMin"] = $XMin;  $Scale["XMax"] = $XMax;
 
-       /* Compute the needed decimals for the metric view to avoid repetition of the same X Axis labels */
-       if ( $Mode == AXIS_FORMAT_METRIC && $Format == NULL )
+        /* Compute the needed decimals for the metric view to avoid repetition of the same X Axis labels */
+        if ( $Mode == AXIS_FORMAT_METRIC && $Format == NULL )
         {
-         $Done = FALSE; $GoodDecimals = 0;
-         for($Decimals=0;$Decimals<=10;$Decimals++)
-          {
-           if ( !$Done )
+            $Done = FALSE; $GoodDecimals = 0;
+            for($Decimals=0;$Decimals<=10;$Decimals++)
+            {
+            if ( !$Done )
             {
-             $LastLabel = "zob"; $ScaleOK = TRUE;
-             for($i=0;$i<=$Rows;$i++)
-              {
-               $Value = $XMin + $i*$RowHeight;
-               $Label = $this->scaleFormat($Value,AXIS_FORMAT_METRIC,$Decimals);
+                $LastLabel = "zob"; $ScaleOK = TRUE;
+                for($i=0;$i<=$Rows;$i++)
+                {
+                $Value = $XMin + $i*$RowHeight;
+                $Label = $this->scaleFormat($Value,AXIS_FORMAT_METRIC,$Decimals);
 
-               if ( $LastLabel == $Label ) { $ScaleOK = FALSE; }
-               $LastLabel = $Label;
-              }
-             if ( $ScaleOK ) { $Done = TRUE; $GoodDecimals = $Decimals; }
+                if ( $LastLabel == $Label ) { $ScaleOK = FALSE; }
+                $LastLabel = $Label;
+                }
+                if ( $ScaleOK ) { $Done = TRUE; $GoodDecimals = $Decimals; }
+            }
             }
-          }
 
-         $Scale["Format"] = $GoodDecimals;
+            $Scale["Format"] = $GoodDecimals;
+        }
         }
-      }
-     else
-      {
-       /* If all values are the same we keep a +1/-1 scale */
-       $Rows = 2; $XMin = $XMax-1; $XMax = $XMax+1; $RowHeight = 1;
+        else
+        {
+        /* If all values are the same we keep a +1/-1 scale */
+        $Rows = 2; $XMin = $XMax-1; $XMax = $XMax+1; $RowHeight = 1;
 
-       /* Return the results */
-       $Scale["Rows"] = $Rows; $Scale["RowHeight"] = $RowHeight; $Scale["XMin"] = $XMin;  $Scale["XMax"] = $XMax;
-      }
+        /* Return the results */
+        $Scale["Rows"] = $Rows; $Scale["RowHeight"] = $RowHeight; $Scale["XMin"] = $XMin;  $Scale["XMax"] = $XMax;
+        }
 
-     return($Scale);
+        return($Scale);
     }
 
-   function modulo($Value1,$Value2)
+    function modulo($Value1,$Value2)
     {
-     if (floor($Value2) == 0) { return(0); }
-     if (floor($Value2) != 0) { return($Value1 % $Value2); }
+        if (floor($Value2) == 0) { return(0); }
+        if (floor($Value2) != 0) { return($Value1 % $Value2); }
 
-     $MinValue = min($Value1,$Value2); $Factor = 10;
-     while ( floor($MinValue*$Factor) == 0 )
-      { $Factor = $Factor * 10; }
+        $MinValue = min($Value1,$Value2); $Factor = 10;
+        while ( floor($MinValue*$Factor) == 0 )
+        { $Factor = $Factor * 10; }
 
-     return(($Value1*$Factor) % ($Value2*$Factor));
+        return(($Value1*$Factor) % ($Value2*$Factor));
     }
 
-   /* Draw an X threshold */
-   function drawXThreshold($Value,$Format="")
+    /* Draw an X threshold */
+    function drawXThreshold($Value,$Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : 255;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 50;
-     $Weight		= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
-     $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : 6;
-     $Wide		= isset($Format["Wide"]) ? $Format["Wide"] : FALSE;
-     $WideFactor	= isset($Format["WideFactor"]) ? $Format["WideFactor"] : 5;
-     $WriteCaption	= isset($Format["WriteCaption"]) ? $Format["WriteCaption"] : FALSE;
-     $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : NULL;
-     $CaptionAlign	= isset($Format["CaptionAlign"]) ? $Format["CaptionAlign"] : CAPTION_LEFT_TOP;
-     $CaptionOffset     = isset($Format["CaptionOffset"]) ? $Format["CaptionOffset"] : 5;
-     $CaptionR		= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
-     $CaptionG		= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
-     $CaptionB		= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
-     $CaptionAlpha	= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
-     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
-     $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
-     $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 3;
-     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
-     $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
-     $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
-     $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
-     $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
-     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 30;
-     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
-     $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
-     $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
-     $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
-     $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
-     $ValueIsLabel	= isset($Format["ValueIsLabel"]) ? $Format["ValueIsLabel"] : FALSE;
-
-     $Data           = $this->DataSet->getData();
-     $AbscissaMargin = $this->getAbscissaMargin($Data);
-     $XScale         = $this->scaleGetXSettings();
-
-     if ( is_array($Value) ) { foreach ($Value as $Key => $ID) { $this->drawXThreshold($ID,$Format); } return(0); }
-
-     if ( $ValueIsLabel )
-      {
-       $Format["ValueIsLabel"] = FALSE;
-       foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $SerieValue)
+        $R			= isset($Format["R"]) ? $Format["R"] : 255;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 50;
+        $Weight		= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+        $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : 6;
+        $Wide		= isset($Format["Wide"]) ? $Format["Wide"] : FALSE;
+        $WideFactor	= isset($Format["WideFactor"]) ? $Format["WideFactor"] : 5;
+        $WriteCaption	= isset($Format["WriteCaption"]) ? $Format["WriteCaption"] : FALSE;
+        $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : NULL;
+        $CaptionAlign	= isset($Format["CaptionAlign"]) ? $Format["CaptionAlign"] : CAPTION_LEFT_TOP;
+        $CaptionOffset     = isset($Format["CaptionOffset"]) ? $Format["CaptionOffset"] : 5;
+        $CaptionR		= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
+        $CaptionG		= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
+        $CaptionB		= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
+        $CaptionAlpha	= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
+        $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
+        $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
+        $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 3;
+        $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
+        $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
+        $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
+        $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
+        $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
+        $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 30;
+        $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+        $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
+        $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
+        $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
+        $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
+        $ValueIsLabel	= isset($Format["ValueIsLabel"]) ? $Format["ValueIsLabel"] : FALSE;
+
+        $Data           = $this->DataSet->getData();
+        $AbscissaMargin = $this->getAbscissaMargin($Data);
+        $XScale         = $this->scaleGetXSettings();
+
+        if ( is_array($Value) ) { foreach ($Value as $Key => $ID) { $this->drawXThreshold($ID,$Format); } return(0); }
+
+        if ( $ValueIsLabel )
+        {
+        $Format["ValueIsLabel"] = FALSE;
+        foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $SerieValue)
         { if ( $SerieValue == $Value ) { $this->drawXThreshold($Key,$Format); } }
 
-       return(0);
-      }
+        return(0);
+        }
 
-     $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
-                              "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
-                              "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha,
-                              "R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha);
+        $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
+                                "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
+                                "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha,
+                                "R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha);
 
-     if ( $Caption == NULL )
-      {
-       if ( isset($Data["Abscissa"]) )
+        if ( $Caption == NULL )
         {
-         if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$Value]) )
-          $Caption = $Data["Series"][$Data["Abscissa"]]["Data"][$Value];
-         else
-          $Caption = $Value;
+        if ( isset($Data["Abscissa"]) )
+        {
+            if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$Value]) )
+            $Caption = $Data["Series"][$Data["Abscissa"]]["Data"][$Value];
+            else
+            $Caption = $Value;
         }
-       else
+        else
         $Caption = $Value;
-      }
+        }
 
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
-       $XStep = (($this->GraphAreaX2 - $this->GraphAreaX1) - $XScale[0] *2 ) / $XScale[1];
-       $XPos  = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value;
-       $YPos1 = $this->GraphAreaY1 + $Data["YMargin"];
-       $YPos2 = $this->GraphAreaY2 - $Data["YMargin"];
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+        $XStep = (($this->GraphAreaX2 - $this->GraphAreaX1) - $XScale[0] *2 ) / $XScale[1];
+        $XPos  = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value;
+        $YPos1 = $this->GraphAreaY1 + $Data["YMargin"];
+        $YPos2 = $this->GraphAreaY2 - $Data["YMargin"];
 
-       if ( $XPos >= $this->GraphAreaX1 + $AbscissaMargin && $XPos <= $this->GraphAreaX2 - $AbscissaMargin )
+        if ( $XPos >= $this->GraphAreaX1 + $AbscissaMargin && $XPos <= $this->GraphAreaX2 - $AbscissaMargin )
         {
-         $this->drawLine($XPos,$YPos1,$XPos,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+            $this->drawLine($XPos,$YPos1,$XPos,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-         if ( $Wide )
-          {
-           $this->drawLine($XPos-1,$YPos1,$XPos-1,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-           $this->drawLine($XPos+1,$YPos1,$XPos+1,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-          }
+            if ( $Wide )
+            {
+            $this->drawLine($XPos-1,$YPos1,$XPos-1,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            $this->drawLine($XPos+1,$YPos1,$XPos+1,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            }
 
-         if ( $WriteCaption )
-          {
-           if ( $CaptionAlign == CAPTION_LEFT_TOP )
+            if ( $WriteCaption )
+            {
+            if ( $CaptionAlign == CAPTION_LEFT_TOP )
             { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-           else 
+            else 
             { $Y = $YPos2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
            
-           $this->drawText($XPos,$Y,$Caption,$CaptionSettings);
-          }
+            $this->drawText($XPos,$Y,$Caption,$CaptionSettings);
+            }
 
-         return(array("X"=>$XPos));
+            return(array("X"=>$XPos));
+        }
         }
-      }
-     elseif( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-      {
-       $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
-       $XPos  = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value;
-       $YPos1 = $this->GraphAreaX1 + $Data["YMargin"];
-       $YPos2 = $this->GraphAreaX2 - $Data["YMargin"];
+        elseif( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+        {
+        $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
+        $XPos  = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value;
+        $YPos1 = $this->GraphAreaX1 + $Data["YMargin"];
+        $YPos2 = $this->GraphAreaX2 - $Data["YMargin"];
 
-       if ( $XPos >= $this->GraphAreaY1 + $AbscissaMargin && $XPos <= $this->GraphAreaY2 - $AbscissaMargin )
+        if ( $XPos >= $this->GraphAreaY1 + $AbscissaMargin && $XPos <= $this->GraphAreaY2 - $AbscissaMargin )
         {
-         $this->drawLine($YPos1,$XPos,$YPos2,$XPos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+            $this->drawLine($YPos1,$XPos,$YPos2,$XPos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-         if ( $Wide )
-          {
-           $this->drawLine($YPos1,$XPos-1,$YPos2,$XPos-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-           $this->drawLine($YPos1,$XPos+1,$YPos2,$XPos+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-          }
+            if ( $Wide )
+            {
+            $this->drawLine($YPos1,$XPos-1,$YPos2,$XPos-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            $this->drawLine($YPos1,$XPos+1,$YPos2,$XPos+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            }
 
-         if ( $WriteCaption )
-          {
-           if ( $CaptionAlign == CAPTION_LEFT_TOP )
+            if ( $WriteCaption )
+            {
+            if ( $CaptionAlign == CAPTION_LEFT_TOP )
             { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-           else 
+            else 
             { $Y = $YPos2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
            
-           $this->drawText($Y,$XPos,$Caption,$CaptionSettings);
-          }
+            $this->drawText($Y,$XPos,$Caption,$CaptionSettings);
+            }
 
-         return(array("X"=>$XPos));
+            return(array("X"=>$XPos));
+        }
         }
-      }
     }
 
-   /* Draw an X threshold area */
-   function drawXThresholdArea($Value1,$Value2,$Format="")
+    /* Draw an X threshold area */
+    function drawXThresholdArea($Value1,$Value2,$Format="")
     {
-     $R		= isset($Format["R"]) ? $Format["R"] : 255;
-     $G		= isset($Format["G"]) ? $Format["G"] : 0;
-     $B		= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 20;
-     $Border    = isset($Format["Border"]) ? $Format["Border"] : TRUE;
-     $BorderR   = isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
-     $BorderG   = isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
-     $BorderB   = isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
-     $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha + 20;
-     $BorderTicks = isset($Format["BorderTicks"]) ? $Format["BorderTicks"] : 2;
-     $AreaName 	= isset($Format["AreaName"]) ? $Format["AreaName"] : NULL;
-     $NameAngle	= isset($Format["NameAngle"]) ? $Format["NameAngle"] : ZONE_NAME_ANGLE_AUTO;
-     $NameR	= isset($Format["NameR"]) ? $Format["NameR"] : 255;
-     $NameG	= isset($Format["NameG"]) ? $Format["NameG"] : 255;
-     $NameB	= isset($Format["NameB"]) ? $Format["NameB"] : 255;
-     $NameAlpha	= isset($Format["NameAlpha"]) ? $Format["NameAlpha"] : 100;
-     $DisableShadowOnArea = isset($Format["DisableShadowOnArea"]) ? $Format["DisableShadowOnArea"] : TRUE;
-
-     $RestoreShadow = $this->Shadow;
-     if ( $DisableShadowOnArea && $this->Shadow ) { $this->Shadow = FALSE; }
-
-     if ($BorderAlpha >100) { $BorderAlpha = 100;}
-
-     $Data           = $this->DataSet->getData();
-     $XScale         = $this->scaleGetXSettings();
-     $AbscissaMargin = $this->getAbscissaMargin($Data);
-
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
-       $XStep = (($this->GraphAreaX2 - $this->GraphAreaX1) - $XScale[0] *2 ) / $XScale[1];
-       $XPos1 = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value1;
-       $XPos2 = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value2;
-       $YPos1 = $this->GraphAreaY1 + $Data["YMargin"];
-       $YPos2 = $this->GraphAreaY2 - $Data["YMargin"];
-
-       if ( $XPos1 < $this->GraphAreaX1 + $XScale[0] ) { $XPos1 = $this->GraphAreaX1 + $XScale[0]; }
-       if ( $XPos1 > $this->GraphAreaX2 - $XScale[0] ) { $XPos1 = $this->GraphAreaX2 - $XScale[0]; }
-       if ( $XPos2 < $this->GraphAreaX1 + $XScale[0] ) { $XPos2 = $this->GraphAreaX1 + $XScale[0]; }
-       if ( $XPos2 > $this->GraphAreaX2 - $XScale[0] ) { $XPos2 = $this->GraphAreaX2 - $XScale[0]; }
-
-       $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-
-       if ( $Border )
-        {
-         $this->drawLine($XPos1,$YPos1,$XPos1,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-         $this->drawLine($XPos2,$YPos1,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-        }
-
-       if ( $AreaName != NULL )
-        {
-         $XPos = ($XPos2-$XPos1)/2 + $XPos1;
-         $YPos = ($YPos2-$YPos1)/2 + $YPos1;
-
-         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
-          {
-           $TxtPos   = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$AreaName);
-           $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
-           if ( abs($XPos2 - $XPos1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
-          }
-         $this->Shadow = $RestoreShadow;
-         $this->drawText($XPos,$YPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>$NameAngle,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
-         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
-        }
-
-       $this->Shadow = $RestoreShadow;
-       return(array("X1"=>$XPos1,"X2"=>$XPos2));
-      }
-     elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-      {
-       $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
-       $XPos1 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value1;
-       $XPos2 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value2;
-       $YPos1 = $this->GraphAreaX1 + $Data["YMargin"];
-       $YPos2 = $this->GraphAreaX2 - $Data["YMargin"];
-
-       if ( $XPos1 < $this->GraphAreaY1 + $XScale[0] ) { $XPos1 = $this->GraphAreaY1 + $XScale[0]; }
-       if ( $XPos1 > $this->GraphAreaY2 - $XScale[0] ) { $XPos1 = $this->GraphAreaY2 - $XScale[0]; }
-       if ( $XPos2 < $this->GraphAreaY1 + $XScale[0] ) { $XPos2 = $this->GraphAreaY1 + $XScale[0]; }
-       if ( $XPos2 > $this->GraphAreaY2 - $XScale[0] ) { $XPos2 = $this->GraphAreaY2 - $XScale[0]; }
-
-       $this->drawFilledRectangle($YPos1,$XPos1,$YPos2,$XPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-
-       if ( $Border )
-        {
-         $this->drawLine($YPos1,$XPos1,$YPos2,$XPos1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-         $this->drawLine($YPos1,$XPos2,$YPos2,$XPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-        }
-
-       if ( $AreaName != NULL )
-        {
-         $XPos = ($XPos2-$XPos1)/2 + $XPos1;
-         $YPos = ($YPos2-$YPos1)/2 + $YPos1;
-
-         $this->Shadow = $RestoreShadow;
-         $this->drawText($YPos,$XPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>0,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
-         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
-        }
-
-       $this->Shadow = $RestoreShadow;
-       return(array("X1"=>$XPos1,"X2"=>$XPos2));
-      }
+        $R		= isset($Format["R"]) ? $Format["R"] : 255;
+        $G		= isset($Format["G"]) ? $Format["G"] : 0;
+        $B		= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 20;
+        $Border    = isset($Format["Border"]) ? $Format["Border"] : TRUE;
+        $BorderR   = isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+        $BorderG   = isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+        $BorderB   = isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+        $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha + 20;
+        $BorderTicks = isset($Format["BorderTicks"]) ? $Format["BorderTicks"] : 2;
+        $AreaName 	= isset($Format["AreaName"]) ? $Format["AreaName"] : NULL;
+        $NameAngle	= isset($Format["NameAngle"]) ? $Format["NameAngle"] : ZONE_NAME_ANGLE_AUTO;
+        $NameR	= isset($Format["NameR"]) ? $Format["NameR"] : 255;
+        $NameG	= isset($Format["NameG"]) ? $Format["NameG"] : 255;
+        $NameB	= isset($Format["NameB"]) ? $Format["NameB"] : 255;
+        $NameAlpha	= isset($Format["NameAlpha"]) ? $Format["NameAlpha"] : 100;
+        $DisableShadowOnArea = isset($Format["DisableShadowOnArea"]) ? $Format["DisableShadowOnArea"] : TRUE;
+
+        $RestoreShadow = $this->Shadow;
+        if ( $DisableShadowOnArea && $this->Shadow ) { $this->Shadow = FALSE; }
+
+        if ($BorderAlpha >100) { $BorderAlpha = 100;}
+
+        $Data           = $this->DataSet->getData();
+        $XScale         = $this->scaleGetXSettings();
+        $AbscissaMargin = $this->getAbscissaMargin($Data);
+
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+        $XStep = (($this->GraphAreaX2 - $this->GraphAreaX1) - $XScale[0] *2 ) / $XScale[1];
+        $XPos1 = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value1;
+        $XPos2 = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value2;
+        $YPos1 = $this->GraphAreaY1 + $Data["YMargin"];
+        $YPos2 = $this->GraphAreaY2 - $Data["YMargin"];
+
+        if ( $XPos1 < $this->GraphAreaX1 + $XScale[0] ) { $XPos1 = $this->GraphAreaX1 + $XScale[0]; }
+        if ( $XPos1 > $this->GraphAreaX2 - $XScale[0] ) { $XPos1 = $this->GraphAreaX2 - $XScale[0]; }
+        if ( $XPos2 < $this->GraphAreaX1 + $XScale[0] ) { $XPos2 = $this->GraphAreaX1 + $XScale[0]; }
+        if ( $XPos2 > $this->GraphAreaX2 - $XScale[0] ) { $XPos2 = $this->GraphAreaX2 - $XScale[0]; }
+
+        $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+        if ( $Border )
+        {
+            $this->drawLine($XPos1,$YPos1,$XPos1,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+            $this->drawLine($XPos2,$YPos1,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+        }
+
+        if ( $AreaName != NULL )
+        {
+            $XPos = ($XPos2-$XPos1)/2 + $XPos1;
+            $YPos = ($YPos2-$YPos1)/2 + $YPos1;
+
+            if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
+            {
+            $TxtPos   = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$AreaName);
+            $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
+            if ( abs($XPos2 - $XPos1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
+            }
+            $this->Shadow = $RestoreShadow;
+            $this->drawText($XPos,$YPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>$NameAngle,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+            if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+        }
+
+        $this->Shadow = $RestoreShadow;
+        return(array("X1"=>$XPos1,"X2"=>$XPos2));
+        }
+        elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+        {
+        $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
+        $XPos1 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value1;
+        $XPos2 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value2;
+        $YPos1 = $this->GraphAreaX1 + $Data["YMargin"];
+        $YPos2 = $this->GraphAreaX2 - $Data["YMargin"];
+
+        if ( $XPos1 < $this->GraphAreaY1 + $XScale[0] ) { $XPos1 = $this->GraphAreaY1 + $XScale[0]; }
+        if ( $XPos1 > $this->GraphAreaY2 - $XScale[0] ) { $XPos1 = $this->GraphAreaY2 - $XScale[0]; }
+        if ( $XPos2 < $this->GraphAreaY1 + $XScale[0] ) { $XPos2 = $this->GraphAreaY1 + $XScale[0]; }
+        if ( $XPos2 > $this->GraphAreaY2 - $XScale[0] ) { $XPos2 = $this->GraphAreaY2 - $XScale[0]; }
+
+        $this->drawFilledRectangle($YPos1,$XPos1,$YPos2,$XPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+        if ( $Border )
+        {
+            $this->drawLine($YPos1,$XPos1,$YPos2,$XPos1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+            $this->drawLine($YPos1,$XPos2,$YPos2,$XPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+        }
+
+        if ( $AreaName != NULL )
+        {
+            $XPos = ($XPos2-$XPos1)/2 + $XPos1;
+            $YPos = ($YPos2-$YPos1)/2 + $YPos1;
+
+            $this->Shadow = $RestoreShadow;
+            $this->drawText($YPos,$XPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>0,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+            if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+        }
+
+        $this->Shadow = $RestoreShadow;
+        return(array("X1"=>$XPos1,"X2"=>$XPos2));
+        }
     }
 
-   /* Draw an Y threshold with the computed scale */
-   function drawThreshold($Value,$Format="")
+    /* Draw an Y threshold with the computed scale */
+    function drawThreshold($Value,$Format="")
     {
-     $AxisID		= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
-     $R			= isset($Format["R"]) ? $Format["R"] : 255;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 50;
-     $Weight		= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
-     $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : 6;
-     $Wide		= isset($Format["Wide"]) ? $Format["Wide"] : FALSE;
-     $WideFactor	= isset($Format["WideFactor"]) ? $Format["WideFactor"] : 5;
-     $WriteCaption	= isset($Format["WriteCaption"]) ? $Format["WriteCaption"] : FALSE;
-     $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : NULL;
-     $CaptionAlign	= isset($Format["CaptionAlign"]) ? $Format["CaptionAlign"] : CAPTION_LEFT_TOP;
-     $CaptionOffset     = isset($Format["CaptionOffset"]) ? $Format["CaptionOffset"] : 10;
-     $CaptionR		= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
-     $CaptionG		= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
-     $CaptionB		= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
-     $CaptionAlpha	= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
-     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
-     $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
-     $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 5;
-     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
-     $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
-     $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
-     $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
-     $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
-     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 20;
-     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
-     $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
-     $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
-     $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
-     $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
-     $NoMargin		= isset($Format["NoMargin"]) ? $Format["NoMargin"] : FALSE;
-
-     if ( is_array($Value) ) { foreach ($Value as $Key => $ID) { $this->drawThreshold($ID,$Format); } return(0); }
-
-     $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
-                              "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
-                              "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha,
-                              "R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha);
-
-     $Data           = $this->DataSet->getData();
-     $AbscissaMargin = $this->getAbscissaMargin($Data);
-
-     if ( $NoMargin ) { $AbscissaMargin = 0; }
-     if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
-     if ( $Caption == NULL ) { $Caption = $Value; }
-
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
-       $YPos = $this->scaleComputeY($Value,array("AxisID"=>$AxisID));
-       if ( $YPos >= $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] && $YPos <= $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] )
-        {
-         $X1 = $this->GraphAreaX1 + $AbscissaMargin;
-         $X2 = $this->GraphAreaX2 - $AbscissaMargin;
-
-         $this->drawLine($X1,$YPos,$X2,$YPos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
-
-         if ( $Wide )
-          {
-           $this->drawLine($X1,$YPos-1,$X2,$YPos-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-           $this->drawLine($X1,$YPos+1,$X2,$YPos+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-          }
-
-         if ( $WriteCaption )
-          {
-           if ( $CaptionAlign == CAPTION_LEFT_TOP )
+        $AxisID		= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
+        $R			= isset($Format["R"]) ? $Format["R"] : 255;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 50;
+        $Weight		= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+        $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : 6;
+        $Wide		= isset($Format["Wide"]) ? $Format["Wide"] : FALSE;
+        $WideFactor	= isset($Format["WideFactor"]) ? $Format["WideFactor"] : 5;
+        $WriteCaption	= isset($Format["WriteCaption"]) ? $Format["WriteCaption"] : FALSE;
+        $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : NULL;
+        $CaptionAlign	= isset($Format["CaptionAlign"]) ? $Format["CaptionAlign"] : CAPTION_LEFT_TOP;
+        $CaptionOffset     = isset($Format["CaptionOffset"]) ? $Format["CaptionOffset"] : 10;
+        $CaptionR		= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
+        $CaptionG		= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
+        $CaptionB		= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
+        $CaptionAlpha	= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
+        $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
+        $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
+        $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 5;
+        $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
+        $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
+        $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
+        $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
+        $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
+        $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 20;
+        $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+        $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
+        $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
+        $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
+        $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
+        $NoMargin		= isset($Format["NoMargin"]) ? $Format["NoMargin"] : FALSE;
+
+        if ( is_array($Value) ) { foreach ($Value as $Key => $ID) { $this->drawThreshold($ID,$Format); } return(0); }
+
+        $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
+                                "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
+                                "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha,
+                                "R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha);
+
+        $Data           = $this->DataSet->getData();
+        $AbscissaMargin = $this->getAbscissaMargin($Data);
+
+        if ( $NoMargin ) { $AbscissaMargin = 0; }
+        if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
+        if ( $Caption == NULL ) { $Caption = $Value; }
+
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+        $YPos = $this->scaleComputeY($Value,array("AxisID"=>$AxisID));
+        if ( $YPos >= $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] && $YPos <= $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] )
+        {
+            $X1 = $this->GraphAreaX1 + $AbscissaMargin;
+            $X2 = $this->GraphAreaX2 - $AbscissaMargin;
+
+            $this->drawLine($X1,$YPos,$X2,$YPos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+
+            if ( $Wide )
+            {
+            $this->drawLine($X1,$YPos-1,$X2,$YPos-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            $this->drawLine($X1,$YPos+1,$X2,$YPos+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            }
+
+            if ( $WriteCaption )
+            {
+            if ( $CaptionAlign == CAPTION_LEFT_TOP )
             { $X = $X1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-           else 
+            else 
             { $X = $X2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
            
-           $this->drawText($X,$YPos,$Caption,$CaptionSettings);
-          }
+            $this->drawText($X,$YPos,$Caption,$CaptionSettings);
+            }
         }
 
-       return(array("Y"=>$YPos));
-      }
+        return(array("Y"=>$YPos));
+        }
 
-     if ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-      {
-       $XPos = $this->scaleComputeY($Value,array("AxisID"=>$AxisID));
-       if ( $XPos >= $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] && $XPos <= $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] )
+        if ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
         {
-         $Y1 = $this->GraphAreaY1 + $AbscissaMargin;
-         $Y2 = $this->GraphAreaY2 - $AbscissaMargin;
+        $XPos = $this->scaleComputeY($Value,array("AxisID"=>$AxisID));
+        if ( $XPos >= $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] && $XPos <= $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] )
+        {
+            $Y1 = $this->GraphAreaY1 + $AbscissaMargin;
+            $Y2 = $this->GraphAreaY2 - $AbscissaMargin;
 
-         $this->drawLine($XPos,$Y1,$XPos,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+            $this->drawLine($XPos,$Y1,$XPos,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-         if ( $Wide )
-          {
-           $this->drawLine($XPos-1,$Y1,$XPos-1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-           $this->drawLine($XPos+1,$Y1,$XPos+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-          }
+            if ( $Wide )
+            {
+            $this->drawLine($XPos-1,$Y1,$XPos-1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            $this->drawLine($XPos+1,$Y1,$XPos+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            }
 
-         if ( $WriteCaption )
-          {
-           if ( $CaptionAlign == CAPTION_LEFT_TOP )
+            if ( $WriteCaption )
+            {
+            if ( $CaptionAlign == CAPTION_LEFT_TOP )
             { $Y = $Y1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-           else 
+            else 
             { $Y = $Y2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
 
-           $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE;
-           $this->drawText($XPos,$Y,$Caption,$CaptionSettings);
-          }
+            $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE;
+            $this->drawText($XPos,$Y,$Caption,$CaptionSettings);
+            }
         }
 
-       return(array("Y"=>$XPos));
-      }
+        return(array("Y"=>$XPos));
+        }
     }
 
-   /* Draw a threshold with the computed scale */
-   function drawThresholdArea($Value1,$Value2,$Format="")
+    /* Draw a threshold with the computed scale */
+    function drawThresholdArea($Value1,$Value2,$Format="")
     {
-     $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
-     $R		= isset($Format["R"]) ? $Format["R"] : 255;
-     $G		= isset($Format["G"]) ? $Format["G"] : 0;
-     $B		= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 20;
-     $Border    = isset($Format["Border"]) ? $Format["Border"] : TRUE;
-     $BorderR   = isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
-     $BorderG   = isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
-     $BorderB   = isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
-     $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha + 20;
-     $BorderTicks = isset($Format["BorderTicks"]) ? $Format["BorderTicks"] : 2;
-     $AreaName 	= isset($Format["AreaName"]) ? $Format["AreaName"] : NULL;
-     $NameAngle	= isset($Format["NameAngle"]) ? $Format["NameAngle"] : ZONE_NAME_ANGLE_AUTO;
-     $NameR	= isset($Format["NameR"]) ? $Format["NameR"] : 255;
-     $NameG	= isset($Format["NameG"]) ? $Format["NameG"] : 255;
-     $NameB	= isset($Format["NameB"]) ? $Format["NameB"] : 255;
-     $NameAlpha	= isset($Format["NameAlpha"]) ? $Format["NameAlpha"] : 100;
-     $DisableShadowOnArea = isset($Format["DisableShadowOnArea"]) ? $Format["DisableShadowOnArea"] : TRUE;
-     $NoMargin	= isset($Format["NoMargin"]) ? $Format["NoMargin"] : FALSE;
-
-     if ($Value1 > $Value2) { list($Value1, $Value2) = array($Value2, $Value1); }
-
-     $RestoreShadow = $this->Shadow;
-     if ( $DisableShadowOnArea && $this->Shadow ) { $this->Shadow = FALSE; }
-
-     if ($BorderAlpha >100) { $BorderAlpha = 100;}
-
-     $Data           = $this->DataSet->getData();
-     $AbscissaMargin = $this->getAbscissaMargin($Data);
-
-     if ( $NoMargin ) { $AbscissaMargin = 0; }
-     if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
-
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
-       $XPos1 = $this->GraphAreaX1 + $AbscissaMargin;
-       $XPos2 = $this->GraphAreaX2 - $AbscissaMargin;
-       $YPos1 = $this->scaleComputeY($Value1,array("AxisID"=>$AxisID));
-       $YPos2 = $this->scaleComputeY($Value2,array("AxisID"=>$AxisID));
-
-       if ( $YPos1 < $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] ) { $YPos1 = $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $YPos1 > $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] ) { $YPos1 = $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $YPos2 < $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] ) { $YPos2 = $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $YPos2 > $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] ) { $YPos2 = $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"]; }
-
-       $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-       if ( $Border )
-        {
-         $this->drawLine($XPos1,$YPos1,$XPos2,$YPos1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-         $this->drawLine($XPos1,$YPos2,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-        }
-
-       if ( $AreaName != NULL )
-        {
-         $XPos = ($XPos2-$XPos1)/2 + $XPos1;
-         $YPos = ($YPos2-$YPos1)/2 + $YPos1;
-         $this->Shadow = $RestoreShadow;
-         $this->drawText($XPos,$YPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>0,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
-         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
-        }
-
-       $this->Shadow = $RestoreShadow;
-       return(array("Y1"=>$YPos1,"Y2"=>$YPos2));
-      }
-     elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-      {
-       $YPos1 = $this->GraphAreaY1 + $AbscissaMargin;
-       $YPos2 = $this->GraphAreaY2 - $AbscissaMargin;
-       $XPos1 = $this->scaleComputeY($Value1,array("AxisID"=>$AxisID));
-       $XPos2 = $this->scaleComputeY($Value2,array("AxisID"=>$AxisID));
-
-       if ( $XPos1 < $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] ) { $XPos1 = $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $XPos1 > $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] ) { $XPos1 = $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $XPos2 < $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] ) { $XPos2 = $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $XPos2 > $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] ) { $XPos2 = $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"]; }
-
-       $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-       if ( $Border )
-        {
-         $this->drawLine($XPos1,$YPos1,$XPos1,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-         $this->drawLine($XPos2,$YPos1,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-        }
-
-       if ( $AreaName != NULL )
-        {
-         $XPos = ($YPos2-$YPos1)/2 + $YPos1;
-         $YPos = ($XPos2-$XPos1)/2 + $XPos1;
-
-         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
-          {
-           $TxtPos   = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$AreaName);
-           $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
-           if ( abs($XPos2 - $XPos1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
-          }
-         $this->Shadow = $RestoreShadow;
-         $this->drawText($YPos,$XPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>$NameAngle,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
-         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
-        }
-
-       $this->Shadow = $RestoreShadow;
-       return(array("Y1"=>$XPos1,"Y2"=>$XPos2));
-      }
+        $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
+        $R		= isset($Format["R"]) ? $Format["R"] : 255;
+        $G		= isset($Format["G"]) ? $Format["G"] : 0;
+        $B		= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 20;
+        $Border    = isset($Format["Border"]) ? $Format["Border"] : TRUE;
+        $BorderR   = isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+        $BorderG   = isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+        $BorderB   = isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+        $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha + 20;
+        $BorderTicks = isset($Format["BorderTicks"]) ? $Format["BorderTicks"] : 2;
+        $AreaName 	= isset($Format["AreaName"]) ? $Format["AreaName"] : NULL;
+        $NameAngle	= isset($Format["NameAngle"]) ? $Format["NameAngle"] : ZONE_NAME_ANGLE_AUTO;
+        $NameR	= isset($Format["NameR"]) ? $Format["NameR"] : 255;
+        $NameG	= isset($Format["NameG"]) ? $Format["NameG"] : 255;
+        $NameB	= isset($Format["NameB"]) ? $Format["NameB"] : 255;
+        $NameAlpha	= isset($Format["NameAlpha"]) ? $Format["NameAlpha"] : 100;
+        $DisableShadowOnArea = isset($Format["DisableShadowOnArea"]) ? $Format["DisableShadowOnArea"] : TRUE;
+        $NoMargin	= isset($Format["NoMargin"]) ? $Format["NoMargin"] : FALSE;
+
+        if ($Value1 > $Value2) { list($Value1, $Value2) = array($Value2, $Value1); }
+
+        $RestoreShadow = $this->Shadow;
+        if ( $DisableShadowOnArea && $this->Shadow ) { $this->Shadow = FALSE; }
+
+        if ($BorderAlpha >100) { $BorderAlpha = 100;}
+
+        $Data           = $this->DataSet->getData();
+        $AbscissaMargin = $this->getAbscissaMargin($Data);
+
+        if ( $NoMargin ) { $AbscissaMargin = 0; }
+        if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
+
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+        $XPos1 = $this->GraphAreaX1 + $AbscissaMargin;
+        $XPos2 = $this->GraphAreaX2 - $AbscissaMargin;
+        $YPos1 = $this->scaleComputeY($Value1,array("AxisID"=>$AxisID));
+        $YPos2 = $this->scaleComputeY($Value2,array("AxisID"=>$AxisID));
+
+        if ( $YPos1 < $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] ) { $YPos1 = $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"]; }
+        if ( $YPos1 > $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] ) { $YPos1 = $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"]; }
+        if ( $YPos2 < $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] ) { $YPos2 = $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"]; }
+        if ( $YPos2 > $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] ) { $YPos2 = $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"]; }
+
+        $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        if ( $Border )
+        {
+            $this->drawLine($XPos1,$YPos1,$XPos2,$YPos1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+            $this->drawLine($XPos1,$YPos2,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+        }
+
+        if ( $AreaName != NULL )
+        {
+            $XPos = ($XPos2-$XPos1)/2 + $XPos1;
+            $YPos = ($YPos2-$YPos1)/2 + $YPos1;
+            $this->Shadow = $RestoreShadow;
+            $this->drawText($XPos,$YPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>0,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+            if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+        }
+
+        $this->Shadow = $RestoreShadow;
+        return(array("Y1"=>$YPos1,"Y2"=>$YPos2));
+        }
+        elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+        {
+        $YPos1 = $this->GraphAreaY1 + $AbscissaMargin;
+        $YPos2 = $this->GraphAreaY2 - $AbscissaMargin;
+        $XPos1 = $this->scaleComputeY($Value1,array("AxisID"=>$AxisID));
+        $XPos2 = $this->scaleComputeY($Value2,array("AxisID"=>$AxisID));
+
+        if ( $XPos1 < $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] ) { $XPos1 = $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"]; }
+        if ( $XPos1 > $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] ) { $XPos1 = $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"]; }
+        if ( $XPos2 < $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] ) { $XPos2 = $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"]; }
+        if ( $XPos2 > $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] ) { $XPos2 = $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"]; }
+
+        $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        if ( $Border )
+        {
+            $this->drawLine($XPos1,$YPos1,$XPos1,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+            $this->drawLine($XPos2,$YPos1,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+        }
+
+        if ( $AreaName != NULL )
+        {
+            $XPos = ($YPos2-$YPos1)/2 + $YPos1;
+            $YPos = ($XPos2-$XPos1)/2 + $XPos1;
+
+            if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
+            {
+            $TxtPos   = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$AreaName);
+            $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
+            if ( abs($XPos2 - $XPos1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
+            }
+            $this->Shadow = $RestoreShadow;
+            $this->drawText($YPos,$XPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>$NameAngle,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+            if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+        }
+
+        $this->Shadow = $RestoreShadow;
+        return(array("Y1"=>$XPos1,"Y2"=>$XPos2));
+        }
     }
 
-   function scaleGetXSettings()
+    function scaleGetXSettings()
     {
-     $Data = $this->DataSet->getData();
-     foreach($Data["Axis"] as $AxisID => $Settings)
-      {
-       if ( $Settings["Identity"] == AXIS_X )
+        $Data = $this->DataSet->getData();
+        foreach($Data["Axis"] as $AxisID => $Settings)
+        {
+        if ( $Settings["Identity"] == AXIS_X )
         {
-         $Rows = $Settings["Rows"];
+            $Rows = $Settings["Rows"];
 
-         return(array($Settings["Margin"],$Rows));
+            return(array($Settings["Margin"],$Rows));
+        }
         }
-      }
     }
 
-   function scaleComputeY($Values,$Option="",$ReturnOnly0Height=FALSE)
+    function scaleComputeY($Values,$Option="",$ReturnOnly0Height=FALSE)
     {
-     $AxisID	= isset($Option["AxisID"]) ? $Option["AxisID"] : 0;
-     $SerieName	= isset($Option["SerieName"]) ? $Option["SerieName"] : NULL;
+        $AxisID	= isset($Option["AxisID"]) ? $Option["AxisID"] : 0;
+        $SerieName	= isset($Option["SerieName"]) ? $Option["SerieName"] : NULL;
 
-     $Data = $this->DataSet->getData();
-     if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
+        $Data = $this->DataSet->getData();
+        if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
 
-     if ( $SerieName != NULL ) { $AxisID = $Data["Series"][$SerieName]["Axis"]; }
-     if ( !is_array($Values) ) { $tmp = $Values; $Values = ""; $Values[0] = $tmp; }
+        if ( $SerieName != NULL ) { $AxisID = $Data["Series"][$SerieName]["Axis"]; }
+        if ( !is_array($Values) ) { $tmp = $Values; $Values = ""; $Values[0] = $tmp; }
 
-     $Result = "";
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
-       $Height      = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Data["Axis"][$AxisID]["Margin"]*2;
-       $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
-       $Step        = $Height / $ScaleHeight;
+        $Result = "";
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+        $Height      = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Data["Axis"][$AxisID]["Margin"]*2;
+        $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
+        $Step        = $Height / $ScaleHeight;
 
-       if ( $ReturnOnly0Height )
+        if ( $ReturnOnly0Height )
         { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } }
-       else
+        else
         { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $this->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"])); } } }
-      }
-     else
-      {
-       $Width      = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Data["Axis"][$AxisID]["Margin"]*2;
-       $ScaleWidth = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
-       $Step       = $Width / $ScaleWidth;
-
-       if ( $ReturnOnly0Height )
+        }
+        else
+        {
+        $Width      = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Data["Axis"][$AxisID]["Margin"]*2;
+        $ScaleWidth = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
+        $Step       = $Width / $ScaleWidth;
+
+        if ( $ReturnOnly0Height )
         { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } }
-       else
+        else
         { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $this->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"])); } } }
-      }
+        }
 
-     if ( count($Result) == 1 )
-      return($Result[0]);
-     else
-      return($Result);
+        if ( count($Result) == 1 )
+        return($Result[0]);
+        else
+        return($Result);
     }
 
-   /* Format the axis values */
-   function scaleFormat($Value,$Mode=NULL,$Format=NULL,$Unit=NULL)
+    /* Format the axis values */
+    function scaleFormat($Value,$Mode=NULL,$Format=NULL,$Unit=NULL)
     {
-     if ( $Value == VOID ) { return(""); }
+        if ( $Value == VOID ) { return(""); }
 
-     if ( $Mode == AXIS_FORMAT_CUSTOM )
-      { if ( function_exists($Format) ) { return(call_user_func($Format,$Value)); } }
+        if ( $Mode == AXIS_FORMAT_CUSTOM )
+        { if ( function_exists($Format) ) { return(call_user_func($Format,$Value)); } }
 
-     if ( $Mode == AXIS_FORMAT_DATE )
-      { if ( $Format == NULL ) { $Pattern = "d/m/Y"; } else { $Pattern = $Format; } return(date($Pattern,$Value)); }
+        if ( $Mode == AXIS_FORMAT_DATE )
+        { if ( $Format == NULL ) { $Pattern = "d/m/Y"; } else { $Pattern = $Format; } return(date($Pattern,$Value)); }
 
-     if ( $Mode == AXIS_FORMAT_TIME )
-      { if ( $Format == NULL ) { $Pattern = "H:i:s"; } else { $Pattern = $Format; } return(date($Pattern,$Value)); }
+        if ( $Mode == AXIS_FORMAT_TIME )
+        { if ( $Format == NULL ) { $Pattern = "H:i:s"; } else { $Pattern = $Format; } return(date($Pattern,$Value)); }
 
-     if ( $Mode == AXIS_FORMAT_CURRENCY )
-      { return($Format.number_format($Value,2)); }
+        if ( $Mode == AXIS_FORMAT_CURRENCY )
+        { return($Format.number_format($Value,2)); }
 
-     if ( $Mode == AXIS_FORMAT_METRIC )
-      {
-       if (abs($Value) > 1000000000)
+        if ( $Mode == AXIS_FORMAT_METRIC )
+        {
+        if (abs($Value) > 1000000000)
         return(round($Value/1000000000,$Format)."g".$Unit);
-       if (abs($Value) > 1000000)
+        if (abs($Value) > 1000000)
         return(round($Value/1000000,$Format)."m".$Unit);
-       elseif (abs($Value) >= 1000)
+        elseif (abs($Value) >= 1000)
         return(round($Value/1000,$Format)."k".$Unit);
        
-      }
-     return($Value.$Unit);
+        }
+        return($Value.$Unit);
     }
 
-   /* Write Max value on a chart */
-   function writeBounds($Type=BOUND_BOTH,$Format=NULL)
+    /* Write Max value on a chart */
+    function writeBounds($Type=BOUND_BOTH,$Format=NULL)
     {
-     $MaxLabelTxt	= isset($Format["MaxLabelTxt"]) ? $Format["MaxLabelTxt"] : "max=";
-     $MinLabelTxt	= isset($Format["MinLabelTxt"]) ? $Format["MinLabelTxt"] : "min=";
-     $Decimals		= isset($Format["Decimals"]) ? $Format["Decimals"] : 1;
-     $ExcludedSeries	= isset($Format["ExcludedSeries"]) ? $Format["ExcludedSeries"] : "";
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 4;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $MaxDisplayR	= isset($Format["MaxDisplayR"]) ? $Format["MaxDisplayR"] : 0;
-     $MaxDisplayG	= isset($Format["MaxDisplayG"]) ? $Format["MaxDisplayG"] : 0;
-     $MaxDisplayB	= isset($Format["MaxDisplayB"]) ? $Format["MaxDisplayB"] : 0;
-     $MinDisplayR	= isset($Format["MinDisplayR"]) ? $Format["MinDisplayR"] : 255;
-     $MinDisplayG	= isset($Format["MinDisplayG"]) ? $Format["MinDisplayG"] : 255;
-     $MinDisplayB	= isset($Format["MinDisplayB"]) ? $Format["MinDisplayB"] : 255;
-     $MinLabelPos	= isset($Format["MinLabelPos"]) ? $Format["MinLabelPos"] : BOUND_LABEL_POS_AUTO;
-     $MaxLabelPos	= isset($Format["MaxLabelPos"]) ? $Format["MaxLabelPos"] : BOUND_LABEL_POS_AUTO;
-     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
-     $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
-     $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 5;
-     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
-     $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
-     $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
-     $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
-     $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
-     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 20;
-     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
-     $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
-     $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
-     $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
-     $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
-
-     $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
-                              "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
-                              "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha);
-
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     $Data = $this->DataSet->getData();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && !isset($ExcludedSeries[$SerieName]))
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
-
-         $MinValue = $this->DataSet->getMin($SerieName);
-         $MaxValue = $this->DataSet->getMax($SerieName);
-
-         $MinPos = VOID; $MaxPos = VOID;
-         foreach($Serie["Data"] as $Key => $Value)
-          { 
-           if ( $Value == $MinValue && $MinPos == VOID ) { $MinPos = $Key; }
-           if ( $Value == $MaxValue ) { $MaxPos = $Key; }
-          }
-
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
-
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           $XStep       = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs;
-           $X           = $this->GraphAreaX1 + $XMargin;
-           $SerieOffset = isset($Serie["XOffset"]) ? $Serie["XOffset"] : 0;
-
-           if ( $Type == BOUND_MAX || $Type == BOUND_BOTH )
-            {
-             if ( $MaxLabelPos == BOUND_LABEL_POS_TOP    || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue >= 0) ) { $YPos  = $PosArray[$MaxPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_BOTTOMMIDDLE; }
-             if ( $MaxLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue < 0) ) { $YPos  = $PosArray[$MaxPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_TOPMIDDLE; }
-
-             $XPos  = $X + $MaxPos*$XStep + $SerieOffset;
-             $Label = $MaxLabelTxt.$this->scaleFormat(round($MaxValue,$Decimals),$Mode,$Format,$Unit);
-
-             $TxtPos  = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$Label);
-             $XOffset = 0; $YOffset = 0;
-             if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = (($this->GraphAreaX1 - $TxtPos[0]["X"])/2); }
-             if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -(($TxtPos[1]["X"] - $this->GraphAreaX2)/2); }
-             if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $TxtPos[2]["Y"]; }
-             if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -($TxtPos[0]["Y"] - $this->GraphAreaY2); }
-
-             $CaptionSettings["R"] = $MaxDisplayR; $CaptionSettings["G"] = $MaxDisplayG;
-             $CaptionSettings["B"] = $MaxDisplayB; $CaptionSettings["Align"] = $Align;
-
-             $this->drawText($XPos+$XOffset,$YPos+$YOffset,$Label,$CaptionSettings);
-            }
-
-           if ( $Type == BOUND_MIN || $Type == BOUND_BOTH )
-            {
-             if ( $MinLabelPos == BOUND_LABEL_POS_TOP    || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue >= 0) ) { $YPos  = $PosArray[$MinPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_BOTTOMMIDDLE; }
-             if ( $MinLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue < 0) ) { $YPos  = $PosArray[$MinPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_TOPMIDDLE; }
-
-             $XPos  = $X + $MinPos*$XStep + $SerieOffset;
-             $Label = $MinLabelTxt.$this->scaleFormat(round($MinValue,$Decimals),$Mode,$Format,$Unit);
-
-             $TxtPos  = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$Label);
-             $XOffset = 0; $YOffset = 0;
-             if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = (($this->GraphAreaX1 - $TxtPos[0]["X"])/2); }
-             if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -(($TxtPos[1]["X"] - $this->GraphAreaX2)/2); }
-             if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $TxtPos[2]["Y"]; }
-             if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -($TxtPos[0]["Y"] - $this->GraphAreaY2); }
-
-             $CaptionSettings["R"] = $MinDisplayR; $CaptionSettings["G"] = $MinDisplayG;
-             $CaptionSettings["B"] = $MinDisplayB; $CaptionSettings["Align"] = $Align;
+        $MaxLabelTxt	= isset($Format["MaxLabelTxt"]) ? $Format["MaxLabelTxt"] : "max=";
+        $MinLabelTxt	= isset($Format["MinLabelTxt"]) ? $Format["MinLabelTxt"] : "min=";
+        $Decimals		= isset($Format["Decimals"]) ? $Format["Decimals"] : 1;
+        $ExcludedSeries	= isset($Format["ExcludedSeries"]) ? $Format["ExcludedSeries"] : "";
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 4;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $MaxDisplayR	= isset($Format["MaxDisplayR"]) ? $Format["MaxDisplayR"] : 0;
+        $MaxDisplayG	= isset($Format["MaxDisplayG"]) ? $Format["MaxDisplayG"] : 0;
+        $MaxDisplayB	= isset($Format["MaxDisplayB"]) ? $Format["MaxDisplayB"] : 0;
+        $MinDisplayR	= isset($Format["MinDisplayR"]) ? $Format["MinDisplayR"] : 255;
+        $MinDisplayG	= isset($Format["MinDisplayG"]) ? $Format["MinDisplayG"] : 255;
+        $MinDisplayB	= isset($Format["MinDisplayB"]) ? $Format["MinDisplayB"] : 255;
+        $MinLabelPos	= isset($Format["MinLabelPos"]) ? $Format["MinLabelPos"] : BOUND_LABEL_POS_AUTO;
+        $MaxLabelPos	= isset($Format["MaxLabelPos"]) ? $Format["MaxLabelPos"] : BOUND_LABEL_POS_AUTO;
+        $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
+        $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
+        $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 5;
+        $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
+        $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
+        $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
+        $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
+        $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
+        $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 20;
+        $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+        $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
+        $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
+        $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
+        $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
+
+        $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
+                                "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
+                                "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha);
+
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        $Data = $this->DataSet->getData();
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && !isset($ExcludedSeries[$SerieName]))
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
-             $this->drawText($XPos+$XOffset,$YPos-$DisplayOffset+$YOffset,$Label,$CaptionSettings);
+            $MinValue = $this->DataSet->getMin($SerieName);
+            $MaxValue = $this->DataSet->getMax($SerieName);
+
+            $MinPos = VOID; $MaxPos = VOID;
+            foreach($Serie["Data"] as $Key => $Value)
+            { 
+            if ( $Value == $MinValue && $MinPos == VOID ) { $MinPos = $Key; }
+            if ( $Value == $MaxValue ) { $MaxPos = $Key; }
             }
-          }
-         else
-          {
-           $XStep       = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs;
-           $X           = $this->GraphAreaY1 + $XMargin;
-           $SerieOffset = isset($Serie["XOffset"]) ? $Serie["XOffset"] : 0;
 
-           if ( $Type == BOUND_MAX || $Type == BOUND_BOTH )
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            $XStep       = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs;
+            $X           = $this->GraphAreaX1 + $XMargin;
+            $SerieOffset = isset($Serie["XOffset"]) ? $Serie["XOffset"] : 0;
+
+            if ( $Type == BOUND_MAX || $Type == BOUND_BOTH )
             {
-             if ( $MaxLabelPos == BOUND_LABEL_POS_TOP    || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue >= 0) ) { $YPos  = $PosArray[$MaxPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLELEFT; }
-             if ( $MaxLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue < 0) ) { $YPos  = $PosArray[$MaxPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLERIGHT; }
+                if ( $MaxLabelPos == BOUND_LABEL_POS_TOP    || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue >= 0) ) { $YPos  = $PosArray[$MaxPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_BOTTOMMIDDLE; }
+                if ( $MaxLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue < 0) ) { $YPos  = $PosArray[$MaxPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_TOPMIDDLE; }
 
-             $XPos  = $X + $MaxPos*$XStep + $SerieOffset;
-             $Label = $MaxLabelTxt.$this->scaleFormat($MaxValue,$Mode,$Format,$Unit);
+                $XPos  = $X + $MaxPos*$XStep + $SerieOffset;
+                $Label = $MaxLabelTxt.$this->scaleFormat(round($MaxValue,$Decimals),$Mode,$Format,$Unit);
 
-             $TxtPos  = $this->getTextBox($YPos,$XPos,$this->FontName,$this->FontSize,0,$Label);
-             $XOffset = 0; $YOffset = 0;
-             if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $TxtPos[0]["X"]; }
-             if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -($TxtPos[1]["X"] - $this->GraphAreaX2); }
-             if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = ($this->GraphAreaY1 - $TxtPos[2]["Y"])/2; }
-             if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -(($TxtPos[0]["Y"] - $this->GraphAreaY2)/2);}
+                $TxtPos  = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$Label);
+                $XOffset = 0; $YOffset = 0;
+                if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = (($this->GraphAreaX1 - $TxtPos[0]["X"])/2); }
+                if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -(($TxtPos[1]["X"] - $this->GraphAreaX2)/2); }
+                if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $TxtPos[2]["Y"]; }
+                if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -($TxtPos[0]["Y"] - $this->GraphAreaY2); }
 
-             $CaptionSettings["R"] = $MaxDisplayR; $CaptionSettings["G"] = $MaxDisplayG;
-             $CaptionSettings["B"] = $MaxDisplayB; $CaptionSettings["Align"] = $Align;
+                $CaptionSettings["R"] = $MaxDisplayR; $CaptionSettings["G"] = $MaxDisplayG;
+                $CaptionSettings["B"] = $MaxDisplayB; $CaptionSettings["Align"] = $Align;
 
-             $this->drawText($YPos+$XOffset,$XPos+$YOffset,$Label,$CaptionSettings);
+                $this->drawText($XPos+$XOffset,$YPos+$YOffset,$Label,$CaptionSettings);
             }
 
-           if ( $Type == BOUND_MIN || $Type == BOUND_BOTH )
+            if ( $Type == BOUND_MIN || $Type == BOUND_BOTH )
             {
-             if ( $MinLabelPos == BOUND_LABEL_POS_TOP    || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue >= 0) ) { $YPos  = $PosArray[$MinPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLELEFT; }
-             if ( $MinLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue < 0) ) { $YPos  = $PosArray[$MinPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLERIGHT; }
+                if ( $MinLabelPos == BOUND_LABEL_POS_TOP    || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue >= 0) ) { $YPos  = $PosArray[$MinPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_BOTTOMMIDDLE; }
+                if ( $MinLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue < 0) ) { $YPos  = $PosArray[$MinPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_TOPMIDDLE; }
 
-             $XPos  = $X + $MinPos*$XStep + $SerieOffset;
-             $Label = $MinLabelTxt.$this->scaleFormat($MinValue,$Mode,$Format,$Unit);
+                $XPos  = $X + $MinPos*$XStep + $SerieOffset;
+                $Label = $MinLabelTxt.$this->scaleFormat(round($MinValue,$Decimals),$Mode,$Format,$Unit);
 
-             $TxtPos  = $this->getTextBox($YPos,$XPos,$this->FontName,$this->FontSize,0,$Label);
-             $XOffset = 0; $YOffset = 0;
-             if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $TxtPos[0]["X"]; }
-             if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -($TxtPos[1]["X"] - $this->GraphAreaX2); }
-             if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = ($this->GraphAreaY1 - $TxtPos[2]["Y"])/2; }
-             if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -(($TxtPos[0]["Y"] - $this->GraphAreaY2)/2);}
+                $TxtPos  = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$Label);
+                $XOffset = 0; $YOffset = 0;
+                if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = (($this->GraphAreaX1 - $TxtPos[0]["X"])/2); }
+                if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -(($TxtPos[1]["X"] - $this->GraphAreaX2)/2); }
+                if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $TxtPos[2]["Y"]; }
+                if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -($TxtPos[0]["Y"] - $this->GraphAreaY2); }
 
-             $CaptionSettings["R"] = $MinDisplayR; $CaptionSettings["G"] = $MinDisplayG;
-             $CaptionSettings["B"] = $MinDisplayB; $CaptionSettings["Align"] = $Align;
+                $CaptionSettings["R"] = $MinDisplayR; $CaptionSettings["G"] = $MinDisplayG;
+                $CaptionSettings["B"] = $MinDisplayB; $CaptionSettings["Align"] = $Align;
 
-             $this->drawText($YPos+$XOffset,$XPos+$YOffset,$Label,$CaptionSettings);
+                $this->drawText($XPos+$XOffset,$YPos-$DisplayOffset+$YOffset,$Label,$CaptionSettings);
             }
-          }
-        }
-      }
-    }
-
-   /* Draw a plot chart */
-   function drawPlotChart($Format=NULL)
-    {
-     $PlotSize		= isset($Format["PlotSize"]) ? $Format["PlotSize"] : NULL;
-     $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : FALSE;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 50;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 50;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 50;
-     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 30;
-     $BorderSize	= isset($Format["BorderSize"]) ? $Format["BorderSize"] : 2;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 4;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         if ( isset($Serie["Weight"]) ) { $SerieWeight = $Serie["Weight"] + 2; } else { $SerieWeight = 2; }
-         if ( $PlotSize != NULL ) { $SerieWeight = $PlotSize; }
-
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
-         if ( isset($Serie["Picture"]) )
-          { $Picture = $Serie["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->getPicInfo($Picture); }
-         else { $Picture = NULL; $PicOffset = 0; }
-
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
-
-         $AxisID	= $Serie["Axis"];
-         $Shape		= $Serie["Shape"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
-
-         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
-
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           if ( $Picture != NULL ) { $PicOffset = $PicHeight / 2; $SerieWeight = 0; }
-           $X = $this->GraphAreaX1 + $XMargin;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $DisplayValues ) 
-              $this->drawText($X,$Y-$DisplayOffset-$SerieWeight-$BorderSize-$PicOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-
-             if ( $Y != VOID )
-              {
-               if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-
-               if ( $Picture != NULL )
-                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
-               else
-                { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
-              }
-             $X = $X + $XStep;
             }
-          }
-         else
-          {
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           if ( $Picture != NULL ) { $PicOffset = $PicWidth / 2; $SerieWeight = 0; }
-           $Y = $this->GraphAreaY1 + $XMargin;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $X)
+            else
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X+$DisplayOffset+$SerieWeight+$BorderSize+$PicOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-
-             if ( $X != VOID )
-              {
-               if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-
-               if ( $Picture != NULL )
-                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
-               else
-                { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
-              }
-             $Y = $Y + $YStep;
-            }
-          }
-        }
-      }
-    }
-
-   /* Draw a spline chart */
-   function drawSplineChart($Format=NULL)
-    {
-     $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : TRUE;
-     $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
-     $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL; // 234
-     $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL; // 55
-     $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL; // 26
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
-
-         if ( $BreakR == NULL )
-          $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks);
-         else
-          $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
-
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
-
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
-
-         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
-
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X     = $this->GraphAreaX1 + $XMargin; $WayPoints = "";
-           $Force = $XStep / 5;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $DisplayValues ) 
-              $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-	
-             if ( $RecordImageMap && $Y != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+            $XStep       = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs;
+            $X           = $this->GraphAreaY1 + $XMargin;
+            $SerieOffset = isset($Serie["XOffset"]) ? $Serie["XOffset"] : 0;
 
-             if ( $Y == VOID && $LastY != NULL )
-              { $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight)); $WayPoints = ""; }
+            if ( $Type == BOUND_MAX || $Type == BOUND_BOTH )
+            {
+                if ( $MaxLabelPos == BOUND_LABEL_POS_TOP    || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue >= 0) ) { $YPos  = $PosArray[$MaxPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLELEFT; }
+                if ( $MaxLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue < 0) ) { $YPos  = $PosArray[$MaxPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLERIGHT; }
 
-             if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
-              { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); }
+                $XPos  = $X + $MaxPos*$XStep + $SerieOffset;
+                $Label = $MaxLabelTxt.$this->scaleFormat($MaxValue,$Mode,$Format,$Unit);
 
-             if ( $Y != VOID )
-              $WayPoints[] = array($X,$Y);
+                $TxtPos  = $this->getTextBox($YPos,$XPos,$this->FontName,$this->FontSize,0,$Label);
+                $XOffset = 0; $YOffset = 0;
+                if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $TxtPos[0]["X"]; }
+                if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -($TxtPos[1]["X"] - $this->GraphAreaX2); }
+                if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = ($this->GraphAreaY1 - $TxtPos[2]["Y"])/2; }
+                if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -(($TxtPos[0]["Y"] - $this->GraphAreaY2)/2);}
 
-             if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $Y == VOID ) { $Y = NULL; }
+                $CaptionSettings["R"] = $MaxDisplayR; $CaptionSettings["G"] = $MaxDisplayG;
+                $CaptionSettings["B"] = $MaxDisplayB; $CaptionSettings["Align"] = $Align;
 
-             $LastX = $X; $LastY = $Y;
-             $X = $X + $XStep;
+                $this->drawText($YPos+$XOffset,$XPos+$YOffset,$Label,$CaptionSettings);
             }
-           $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
-          }
-         else
-          {
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
-           $Force = $YStep / 5;
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
-           foreach($PosArray as $Key => $X)
+            if ( $Type == BOUND_MIN || $Type == BOUND_BOTH )
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-
-             if ( $RecordImageMap && $X != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                if ( $MinLabelPos == BOUND_LABEL_POS_TOP    || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue >= 0) ) { $YPos  = $PosArray[$MinPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLELEFT; }
+                if ( $MinLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue < 0) ) { $YPos  = $PosArray[$MinPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLERIGHT; }
 
-             if ( $X == VOID && $LastX != NULL )
-              { $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight)); $WayPoints = ""; }
+                $XPos  = $X + $MinPos*$XStep + $SerieOffset;
+                $Label = $MinLabelTxt.$this->scaleFormat($MinValue,$Mode,$Format,$Unit);
 
-             if ( $X != VOID && $LastX == NULL && $LastGoodX != NULL && !$BreakVoid )
-              { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); }
+                $TxtPos  = $this->getTextBox($YPos,$XPos,$this->FontName,$this->FontSize,0,$Label);
+                $XOffset = 0; $YOffset = 0;
+                if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $TxtPos[0]["X"]; }
+                if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -($TxtPos[1]["X"] - $this->GraphAreaX2); }
+                if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = ($this->GraphAreaY1 - $TxtPos[2]["Y"])/2; }
+                if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -(($TxtPos[0]["Y"] - $this->GraphAreaY2)/2);}
 
-             if ( $X != VOID )
-              $WayPoints[] = array($X,$Y);
+                $CaptionSettings["R"] = $MinDisplayR; $CaptionSettings["G"] = $MinDisplayG;
+                $CaptionSettings["B"] = $MinDisplayB; $CaptionSettings["Align"] = $Align;
 
-             if ( $X != VOID ) { $LastGoodX = $X; $LastGoodY = $Y; }
-             if ( $X == VOID ) { $X = NULL; }
-
-             $LastX = $X; $LastY = $Y;
-             $Y = $Y + $YStep;
+                $this->drawText($YPos+$XOffset,$XPos+$YOffset,$Label,$CaptionSettings);
+            }
             }
-           $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
-          }
         }
-      }
+        }
     }
 
-   /* Draw a filled spline chart */
-   function drawFilledSplineChart($Format=NULL)
+    /* Draw a plot chart */
+    function drawPlotChart($Format=NULL)
     {
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
-     $Threshold		= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        $PlotSize		= isset($Format["PlotSize"]) ? $Format["PlotSize"] : NULL;
+        $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : FALSE;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 50;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 50;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 50;
+        $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 30;
+        $BorderSize	= isset($Format["BorderSize"]) ? $Format["BorderSize"] : 2;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 4;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
         {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+            if ( isset($Serie["Weight"]) ) { $SerieWeight = $Serie["Weight"] + 2; } else { $SerieWeight = 2; }
+            if ( $PlotSize != NULL ) { $SerieWeight = $PlotSize; }
 
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+            if ( isset($Serie["Picture"]) )
+            { $Picture = $Serie["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->getPicInfo($Picture); }
+            else { $Picture = NULL; $PicOffset = 0; }
 
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-         if ( $AroundZero ) { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
-         if ( $Threshold != NULL )
-          {
-           foreach($Threshold as $Key => $Params)
-            {
-             $Threshold[$Key]["MinX"] = $this->scaleComputeY($Params["Min"],array("AxisID"=>$Serie["Axis"]));
-             $Threshold[$Key]["MaxX"] = $this->scaleComputeY($Params["Max"],array("AxisID"=>$Serie["Axis"]));
-            }
-          }
+            $AxisID	= $Serie["Axis"];
+            $Shape		= $Serie["Shape"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+            if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X     = $this->GraphAreaX1 + $XMargin; $WayPoints = "";
-           $Force = $XStep / 5;
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
 
-           if ( !$AroundZero ) { $YZero = $this->GraphAreaY2-1; }
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
-           if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-           $LastX = ""; $LastY = "";
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Y)
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            if ( $Picture != NULL ) { $PicOffset = $PicHeight / 2; $SerieWeight = 0; }
+            $X = $this->GraphAreaX1 + $XMargin;
 
-             if ( $Y == VOID )
-              {
-               $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $DisplayValues ) 
+                $this->drawText($X,$Y-$DisplayOffset-$SerieWeight-$BorderSize-$PicOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 
-               if ( $Area != "" )
+                if ( $Y != VOID )
                 {
-                 foreach ($Area as $key => $Points)
-                  {
-                   $Corners = ""; $Corners[] = $Area[$key][0]["X"]; $Corners[] = $YZero;
-                   foreach($Points as $subKey => $Point)
-                    {
-                     if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
-                     $Corners[] = $Point["Y"]+1;
-                    }
-                   $Corners[] = $Points[$subKey]["X"]-1; $Corners[] = $YZero;
+                if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-                   $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
-                  }
-                 $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+                if ( $Picture != NULL )
+                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
+                else
+                { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
                 }
-
-               $WayPoints = "";
-              }
-             else
-              $WayPoints[] = array($X,$Y-.5); /* -.5 for AA visual fix */
-
-             $X = $X + $XStep;
+                $X = $X + $XStep;
             }
-           $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
-
-           if ( $Area != "" )
-            {
-             foreach ($Area as $key => $Points)
-              {
-               $Corners = ""; $Corners[] = $Area[$key][0]["X"]; $Corners[] = $YZero;
-               foreach($Points as $subKey => $Point)
-                {
-                 if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
-                 $Corners[] = $Point["Y"]+1;
-                }
-               $Corners[] = $Points[$subKey]["X"]-1; $Corners[] = $YZero;
-
-               $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
-              }
-             $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
             }
-          }
-         else
-          {
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
-           $Force = $YStep / 5;
-
-           if ( !$AroundZero ) { $YZero = $this->GraphAreaX1+1; }
-           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
-           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $X)
+            else
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            if ( $Picture != NULL ) { $PicOffset = $PicWidth / 2; $SerieWeight = 0; }
+            $Y = $this->GraphAreaY1 + $XMargin;
 
-             if ( $X == VOID )
-              {
-               $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $X)
+            {
+                if ( $DisplayValues ) 
+                $this->drawText($X+$DisplayOffset+$SerieWeight+$BorderSize+$PicOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 
-               if ( $Area != "" )
+                if ( $X != VOID )
                 {
-                 foreach ($Area as $key => $Points)
-                  {
-                   $Corners = ""; $Corners[] = $YZero; $Corners[] = $Area[$key][0]["Y"];
-                   foreach($Points as $subKey => $Point)
-                    {
-                     if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
-                     $Corners[] = $Point["Y"];
-                    }
-                   $Corners[] = $YZero; $Corners[] = $Points[$subKey]["Y"]-1;
+                if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-                   $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
-                  }
-                 $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-                }
+                if ( $Picture != NULL )
+                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
+                else
+                { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
+                }
+                $Y = $Y + $YStep;
+            }
+            }
+        }
+        }
+    }
 
-               $WayPoints = "";
-              }
-             else
-              $WayPoints[] = array($X,$Y);
+    /* Draw a spline chart */
+    function drawSplineChart($Format=NULL)
+    {
+        $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : TRUE;
+        $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
+        $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL; // 234
+        $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL; // 55
+        $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL; // 26
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+        $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
-             $Y = $Y + $YStep;
-            }
-           $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
+            if ( $BreakR == NULL )
+            $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks);
+            else
+            $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+            if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
 
-           if ( $Area != "" )
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
             {
-             foreach ($Area as $key => $Points)
-              {
-               $Corners = ""; $Corners[] = $YZero; $Corners[] = $Area[$key][0]["Y"];
-               foreach($Points as $subKey => $Point)
-                {
-                 if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
-                 $Corners[] = $Point["Y"];
-                }
-               $Corners[] = $YZero; $Corners[] = $Points[$subKey]["Y"]-1;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X     = $this->GraphAreaX1 + $XMargin; $WayPoints = "";
+            $Force = $XStep / 5;
 
-               $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
-              }
-             $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $DisplayValues ) 
+                $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+	
+                if ( $RecordImageMap && $Y != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                if ( $Y == VOID && $LastY != NULL )
+                { $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight)); $WayPoints = ""; }
+
+                if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
+                { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); }
+
+                if ( $Y != VOID )
+                $WayPoints[] = array($X,$Y);
+
+                if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $Y == VOID ) { $Y = NULL; }
+
+                $LastX = $X; $LastY = $Y;
+                $X = $X + $XStep;
             }
+            $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+            }
+            else
+            {
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
+            $Force = $YStep / 5;
 
-          }
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
+            foreach($PosArray as $Key => $X)
+            {
+                if ( $DisplayValues ) 
+                $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+
+                if ( $RecordImageMap && $X != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                if ( $X == VOID && $LastX != NULL )
+                { $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight)); $WayPoints = ""; }
+
+                if ( $X != VOID && $LastX == NULL && $LastGoodX != NULL && !$BreakVoid )
+                { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); }
+
+                if ( $X != VOID )
+                $WayPoints[] = array($X,$Y);
+
+                if ( $X != VOID ) { $LastGoodX = $X; $LastGoodY = $Y; }
+                if ( $X == VOID ) { $X = NULL; }
+
+                $LastX = $X; $LastY = $Y;
+                $Y = $Y + $YStep;
+            }
+            $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+            }
+        }
         }
-      }
     }
 
-   /* Draw a line chart */
-   function drawLineChart($Format=NULL)
+    /* Draw a filled spline chart */
+    function drawFilledSplineChart($Format=NULL)
     {
-     $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : TRUE;
-     $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
-     $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL;
-     $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL;
-     $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL;
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
-     $ForceColor	= isset($Format["ForceColor"]) ? $Format["ForceColor"] : FALSE;
-     $ForceR		= isset($Format["ForceR"]) ? $Format["ForceR"] : 0;
-     $ForceG		= isset($Format["ForceG"]) ? $Format["ForceG"] : 0;
-     $ForceB		= isset($Format["ForceB"]) ? $Format["ForceB"] : 0;
-     $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : 100;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+        $Threshold		= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+        foreach($Data["Series"] as $SerieName => $Serie)
         {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
-         if ( $ForceColor )
-          { $R = $ForceR; $G = $ForceG; $B = $ForceB; $Alpha = $ForceAlpha; }
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-         if ( $BreakR == NULL )
-          $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
-         else
-          $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+            if ( $AroundZero ) { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
 
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+            if ( $Threshold != NULL )
+            {
+            foreach($Threshold as $Key => $Params)
+            {
+                $Threshold[$Key]["MinX"] = $this->scaleComputeY($Params["Min"],array("AxisID"=>$Serie["Axis"]));
+                $Threshold[$Key]["MaxX"] = $this->scaleComputeY($Params["Max"],array("AxisID"=>$Serie["Axis"]));
+            }
+            }
 
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X     = $this->GraphAreaX1 + $XMargin; $WayPoints = "";
+            $Force = $XStep / 5;
 
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+            if ( !$AroundZero ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
 
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+            $LastX = ""; $LastY = "";
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $DisplayValues ) 
+                $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+                if ( $Y == VOID )
+                {
+                $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-              {
-               if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
-               $this->drawText($X,$Y-$Offset-$Weight,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
-              }
+                if ( $Area != "" )
+                {
+                    foreach ($Area as $key => $Points)
+                    {
+                    $Corners = ""; $Corners[] = $Area[$key][0]["X"]; $Corners[] = $YZero;
+                    foreach($Points as $subKey => $Point)
+                    {
+                        if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
+                        $Corners[] = $Point["Y"]+1;
+                    }
+                    $Corners[] = $Points[$subKey]["X"]-1; $Corners[] = $YZero;
 
-             if ( $RecordImageMap && $Y != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                    $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
+                    }
+                    $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+                }
 
-             if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
-              $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+                $WayPoints = "";
+                }
+                else
+                $WayPoints[] = array($X,$Y-.5); /* -.5 for AA visual fix */
 
-             if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
-              { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); $LastGoodY = NULL; }
+                $X = $X + $XStep;
+            }
+            $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
 
-             if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $Y == VOID ) { $Y = NULL; }
+            if ( $Area != "" )
+            {
+                foreach ($Area as $key => $Points)
+                {
+                $Corners = ""; $Corners[] = $Area[$key][0]["X"]; $Corners[] = $YZero;
+                foreach($Points as $subKey => $Point)
+                {
+                    if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
+                    $Corners[] = $Point["Y"]+1;
+                }
+                $Corners[] = $Points[$subKey]["X"]-1; $Corners[] = $YZero;
 
-             $LastX = $X; $LastY = $Y;
-             $X = $X + $XStep;
+                $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
+                }
+                $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            }
             }
-          }
-         else
-          {
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+            else
+            {
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
+            $Force = $YStep / 5;
+
+            if ( !$AroundZero ) { $YZero = $this->GraphAreaX1+1; }
+            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL;
-           foreach($PosArray as $Key => $X)
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $X)
             {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-              { $this->drawText($X+$DisplayOffset+$Weight,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
+                if ( $DisplayValues ) 
+                $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+
+                if ( $X == VOID )
+                {
+                $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
+
+                if ( $Area != "" )
+                {
+                    foreach ($Area as $key => $Points)
+                    {
+                    $Corners = ""; $Corners[] = $YZero; $Corners[] = $Area[$key][0]["Y"];
+                    foreach($Points as $subKey => $Point)
+                    {
+                        if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
+                        $Corners[] = $Point["Y"];
+                    }
+                    $Corners[] = $YZero; $Corners[] = $Points[$subKey]["Y"]-1;
+
+                    $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
+                    }
+                    $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+                }
 
-             if ( $RecordImageMap && $X != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                $WayPoints = "";
+                }
+                else
+                $WayPoints[] = array($X,$Y);
 
-             if ( $X != VOID && $LastX != NULL && $LastY != NULL )
-              $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+                $Y = $Y + $YStep;
+            }
+            $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
 
-             if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid )
-              { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); $LastGoodY = NULL; }
+            if ( $Area != "" )
+            {
+                foreach ($Area as $key => $Points)
+                {
+                $Corners = ""; $Corners[] = $YZero; $Corners[] = $Area[$key][0]["Y"];
+                foreach($Points as $subKey => $Point)
+                {
+                    if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
+                    $Corners[] = $Point["Y"];
+                }
+                $Corners[] = $YZero; $Corners[] = $Points[$subKey]["Y"]-1;
 
-             if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $X == VOID ) { $X = NULL; }
+                $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
+                }
+                $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            }
 
-             $LastX = $X; $LastY = $Y;
-             $Y = $Y + $YStep;
             }
-          }
         }
-      }
+        }
     }
 
-   /* Draw a line chart */
-   function drawZoneChart($SerieA,$SerieB,$Format=NULL)
+    /* Draw a line chart */
+    function drawLineChart($Format=NULL)
     {
-     $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
-     $LineR	= isset($Format["LineR"]) ? $Format["LineR"] : 150;
-     $LineG	= isset($Format["LineG"]) ? $Format["LineG"] : 150;
-     $LineB	= isset($Format["LineB"]) ? $Format["LineB"] : 150;
-     $LineAlpha	= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 50;
-     $LineTicks	= isset($Format["LineTicks"]) ? $Format["LineTicks"] : 1;
-     $AreaR	= isset($Format["AreaR"]) ? $Format["AreaR"] : 150;
-     $AreaG	= isset($Format["AreaG"]) ? $Format["AreaG"] : 150;
-     $AreaB	= isset($Format["AreaB"]) ? $Format["AreaB"] : 150;
-     $AreaAlpha	= isset($Format["AreaAlpha"]) ? $Format["AreaAlpha"] : 5;
+        $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : TRUE;
+        $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
+        $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL;
+        $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL;
+        $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL;
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+        $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
+        $ForceColor	= isset($Format["ForceColor"]) ? $Format["ForceColor"] : FALSE;
+        $ForceR		= isset($Format["ForceR"]) ? $Format["ForceR"] : 0;
+        $ForceG		= isset($Format["ForceG"]) ? $Format["ForceG"] : 0;
+        $ForceB		= isset($Format["ForceB"]) ? $Format["ForceB"] : 0;
+        $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : 100;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+
+            if ( $ForceColor )
+            { $R = $ForceR; $G = $ForceG; $B = $ForceB; $Alpha = $ForceAlpha; }
+
+            if ( $BreakR == NULL )
+            $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+            else
+            $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-     $Data	 = $this->DataSet->getData();
-     if ( !isset($Data["Series"][$SerieA]["Data"]) || !isset($Data["Series"][$SerieB]["Data"]) ) { return(0); }
-     $SerieAData = $Data["Series"][$SerieA]["Data"];
-     $SerieBData = $Data["Series"][$SerieB]["Data"];
+            if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
 
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
 
-     $Mode	= $Data["Axis"][$AxisID]["Display"];
-     $Format	= $Data["Axis"][$AxisID]["Format"];
-     $Unit	= $Data["Axis"][$AxisID]["Unit"];
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-     $PosArrayA = $this->scaleComputeY($SerieAData,array("AxisID"=>$AxisID));
-     $PosArrayB = $this->scaleComputeY($SerieBData,array("AxisID"=>$AxisID));
-     if ( count($PosArrayA) != count($PosArrayB) ) { return(0); }
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL;
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+                {
+                if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+                $this->drawText($X,$Y-$Offset-$Weight,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+                }
+
+                if ( $RecordImageMap && $Y != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
+                $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+
+                if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
+                { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); $LastGoodY = NULL; }
+
+                if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $Y == VOID ) { $Y = NULL; }
+
+                $LastX = $X; $LastY = $Y;
+                $X = $X + $XStep;
+            }
+            }
+            else
+            {
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL;
+            foreach($PosArray as $Key => $X)
+            {
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+                { $this->drawText($X+$DisplayOffset+$Weight,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
+
+                if ( $RecordImageMap && $X != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                if ( $X != VOID && $LastX != NULL && $LastY != NULL )
+                $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+
+                if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid )
+                { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); $LastGoodY = NULL; }
+
+                if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $X == VOID ) { $X = NULL; }
+
+                $LastX = $X; $LastY = $Y;
+                $Y = $Y + $YStep;
+            }
+            }
+        }
+        }
+    }
 
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
-       if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-       $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+    /* Draw a line chart */
+    function drawZoneChart($SerieA,$SerieB,$Format=NULL)
+    {
+        $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
+        $LineR	= isset($Format["LineR"]) ? $Format["LineR"] : 150;
+        $LineG	= isset($Format["LineG"]) ? $Format["LineG"] : 150;
+        $LineB	= isset($Format["LineB"]) ? $Format["LineB"] : 150;
+        $LineAlpha	= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 50;
+        $LineTicks	= isset($Format["LineTicks"]) ? $Format["LineTicks"] : 1;
+        $AreaR	= isset($Format["AreaR"]) ? $Format["AreaR"] : 150;
+        $AreaG	= isset($Format["AreaG"]) ? $Format["AreaG"] : 150;
+        $AreaB	= isset($Format["AreaB"]) ? $Format["AreaB"] : 150;
+        $AreaAlpha	= isset($Format["AreaAlpha"]) ? $Format["AreaAlpha"] : 5;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data	 = $this->DataSet->getData();
+        if ( !isset($Data["Series"][$SerieA]["Data"]) || !isset($Data["Series"][$SerieB]["Data"]) ) { return(0); }
+        $SerieAData = $Data["Series"][$SerieA]["Data"];
+        $SerieBData = $Data["Series"][$SerieB]["Data"];
+
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        $Mode	= $Data["Axis"][$AxisID]["Display"];
+        $Format	= $Data["Axis"][$AxisID]["Format"];
+        $Unit	= $Data["Axis"][$AxisID]["Unit"];
+
+        $PosArrayA = $this->scaleComputeY($SerieAData,array("AxisID"=>$AxisID));
+        $PosArrayB = $this->scaleComputeY($SerieBData,array("AxisID"=>$AxisID));
+        if ( count($PosArrayA) != count($PosArrayB) ) { return(0); }
+
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+        if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+        $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
-       $LastX = NULL; $LastY1 = NULL; $LastY2 = NULL;
-       $BoundsA = ""; $BoundsB = "";
-       foreach($PosArrayA as $Key => $Y1)
+        $LastX = NULL; $LastY1 = NULL; $LastY2 = NULL;
+        $BoundsA = ""; $BoundsB = "";
+        foreach($PosArrayA as $Key => $Y1)
         {
-         $Y2 = $PosArrayB[$Key];
+            $Y2 = $PosArrayB[$Key];
 
-         $BoundsA[] = $X; $BoundsA[] = $Y1;
-         $BoundsB[] = $X; $BoundsB[] = $Y2;
+            $BoundsA[] = $X; $BoundsA[] = $Y1;
+            $BoundsB[] = $X; $BoundsB[] = $Y2;
 
-         $LastX = $X;
-         $LastY1 = $Y1; $LastY2 = $Y2;
+            $LastX = $X;
+            $LastY1 = $Y1; $LastY2 = $Y2;
 
-         $X = $X + $XStep;
+            $X = $X + $XStep;
         }
-       $Bounds = array_merge($BoundsA,$this->reversePlots($BoundsB));
-       $this->drawPolygonChart($Bounds,array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"Alpha"=>$AreaAlpha));
+        $Bounds = array_merge($BoundsA,$this->reversePlots($BoundsB));
+        $this->drawPolygonChart($Bounds,array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"Alpha"=>$AreaAlpha));
 
-       for($i=0;$i<=count($BoundsA)-4;$i=$i+2)
+        for($i=0;$i<=count($BoundsA)-4;$i=$i+2)
         {
-         $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
-         $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+            $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+            $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
         }
-      }
-     else
-      {
-       if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-       $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+        }
+        else
+        {
+        if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+        $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
-       $LastY = NULL; $LastX1 = NULL; $LastX2 = NULL;
-       $BoundsA = ""; $BoundsB = "";
-       foreach($PosArrayA as $Key => $X1)
+        $LastY = NULL; $LastX1 = NULL; $LastX2 = NULL;
+        $BoundsA = ""; $BoundsB = "";
+        foreach($PosArrayA as $Key => $X1)
         {
-         $X2 = $PosArrayB[$Key];
+            $X2 = $PosArrayB[$Key];
 
-         $BoundsA[] = $X1; $BoundsA[] = $Y;
-         $BoundsB[] = $X2; $BoundsB[] = $Y;
+            $BoundsA[] = $X1; $BoundsA[] = $Y;
+            $BoundsB[] = $X2; $BoundsB[] = $Y;
 
-         $LastY = $Y;
-         $LastX1 = $X1; $LastX2 = $X2;
+            $LastY = $Y;
+            $LastX1 = $X1; $LastX2 = $X2;
 
-         $Y = $Y + $YStep;
+            $Y = $Y + $YStep;
         }
-       $Bounds = array_merge($BoundsA,$this->reversePlots($BoundsB));
-       $this->drawPolygonChart($Bounds,array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"Alpha"=>$AreaAlpha));
+        $Bounds = array_merge($BoundsA,$this->reversePlots($BoundsB));
+        $this->drawPolygonChart($Bounds,array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"Alpha"=>$AreaAlpha));
 
-       for($i=0;$i<=count($BoundsA)-4;$i=$i+2)
+        for($i=0;$i<=count($BoundsA)-4;$i=$i+2)
         {
-         $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
-         $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+            $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+            $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+        }
         }
-      }
     }
 
-   /* Draw a step chart */
-   function drawStepChart($Format=NULL)
+    /* Draw a step chart */
+    function drawStepChart($Format=NULL)
     {
-     $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : FALSE;
-     $ReCenter		= isset($Format["ReCenter"]) ? $Format["ReCenter"] : TRUE;
-     $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
-     $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL;
-     $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL;
-     $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL;
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] :FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
-
-         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
-
-         if ( $BreakR == NULL )
-          $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
-         else
-          $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
-
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
-
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
-         $Color		= array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
-
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-              {
-               if ( $Y <= $LastY ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
-               $this->drawText($X,$Y-$Offset-$Weight,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
-              }
-
-             if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
-              {
-               $this->drawLine($LastX,$LastY,$X,$LastY,$Color);
-               $this->drawLine($X,$LastY,$X,$Y,$Color);
-               if ( $ReCenter && $X+$XStep < $this->GraphAreaX2 - $XMargin )
+        $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : FALSE;
+        $ReCenter		= isset($Format["ReCenter"]) ? $Format["ReCenter"] : TRUE;
+        $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
+        $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL;
+        $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL;
+        $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL;
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] :FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+        $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+
+            if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
+
+            if ( $BreakR == NULL )
+            $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+            else
+            $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
+            $Color		= array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
+
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+                {
+                if ( $Y <= $LastY ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+                $this->drawText($X,$Y-$Offset-$Weight,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+                }
+
+                if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
+                {
+                $this->drawLine($LastX,$LastY,$X,$LastY,$Color);
+                $this->drawLine($X,$LastY,$X,$Y,$Color);
+                if ( $ReCenter && $X+$XStep < $this->GraphAreaX2 - $XMargin )
                 {
-                 $this->drawLine($X,$Y,$X+$XStep,$Y,$Color);
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                    $this->drawLine($X,$Y,$X+$XStep,$Y,$Color);
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
                 }
-               else
+                else
                 { if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); } }
-              }
+                }
 
-             if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
-              { 
-               if ( $ReCenter )
+                if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
+                { 
+                if ( $ReCenter )
                 {
-                 $this->drawLine($LastGoodX+$XStep,$LastGoodY,$X,$LastGoodY,$BreakSettings);
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX+$XStep-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                    $this->drawLine($LastGoodX+$XStep,$LastGoodY,$X,$LastGoodY,$BreakSettings);
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX+$XStep-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
                 }
-               else
+                else
                 {
-                 $this->drawLine($LastGoodX,$LastGoodY,$X,$LastGoodY,$BreakSettings);
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                    $this->drawLine($LastGoodX,$LastGoodY,$X,$LastGoodY,$BreakSettings);
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
                 }
 
-               $this->drawLine($X,$LastGoodY,$X,$Y,$BreakSettings);
-               $LastGoodY = NULL;
-              }
-             elseif( !$BreakVoid && $LastGoodY == NULL && $Y != VOID )
-              {
-              $this->drawLine($this->GraphAreaX1 + $XMargin,$Y,$X,$Y,$BreakSettings);
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($this->GraphAreaX1+$XMargin-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-              }
-
-             if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $Y == VOID ) { $Y = NULL; }
-
-             if ( !$Init && $ReCenter ) { $X = $X - $XStep/2; $Init = TRUE; }
-             $LastX = $X; $LastY = $Y;
-             if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
-             $X = $X + $XStep;
-            }
-           if ( $ReCenter )
-            {
-             $this->drawLine($LastX,$LastY,$this->GraphAreaX2 - $XMargin,$LastY,$Color);
-             if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($this->GraphAreaX2-$XMargin+$ImageMapPlotSize).",".floor($LastY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-            }
-          }
-         else
-          {
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
-           foreach($PosArray as $Key => $X)
-            {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-              {
-               if ( $X >= $LastX ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
-               $this->drawText($X+$Offset+$Weight,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
-              }
-
-             if ( $X != VOID && $LastX != NULL && $LastY != NULL )
-              {
-               $this->drawLine($LastX,$LastY,$LastX,$Y,$Color);
-               $this->drawLine($LastX,$Y,$X,$Y,$Color);
-
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($LastX+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-              }
-
-             if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid )
-              {
-               $this->drawLine($LastGoodX,$LastGoodY,$LastGoodX,$LastGoodY+$YStep,$Color);
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($LastGoodX+$ImageMapPlotSize).",".floor($LastGoodY+$YStep+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-
-               $this->drawLine($LastGoodX,$LastGoodY+$YStep,$LastGoodX,$Y,$BreakSettings);
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY+$YStep-$ImageMapPlotSize).",".floor($LastGoodX+$ImageMapPlotSize).",".floor($YStep+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-
-               $this->drawLine($LastGoodX,$Y,$X,$Y,$BreakSettings);
-               $LastGoodY = NULL;
-              }
-             elseif ( $X != VOID && $LastGoodY == NULL && !$BreakVoid )
-              {
-               $this->drawLine($X,$this->GraphAreaY1 + $XMargin,$X,$Y,$BreakSettings);
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($this->GraphAreaY1+$XMargin-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-              }
-
-             if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $X == VOID ) { $X = NULL; }
-
-             if ( !$Init && $ReCenter ) { $Y = $Y - $YStep/2; $Init = TRUE; }
-             $LastX = $X; $LastY = $Y;
-             if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
-             $Y = $Y + $YStep;
-            }
-           if ( $ReCenter )
-            {
-             $this->drawLine($LastX,$LastY,$LastX,$this->GraphAreaY2 - $XMargin,$Color);
-             if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($LastX+$ImageMapPlotSize).",".floor($this->GraphAreaY2-$XMargin+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-            }
-          }
-        }
-      }
-    }
+                $this->drawLine($X,$LastGoodY,$X,$Y,$BreakSettings);
+                $LastGoodY = NULL;
+                }
+                elseif( !$BreakVoid && $LastGoodY == NULL && $Y != VOID )
+                {
+                $this->drawLine($this->GraphAreaX1 + $XMargin,$Y,$X,$Y,$BreakSettings);
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($this->GraphAreaX1+$XMargin-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
 
-   /* Draw a step chart */
-   function drawFilledStepChart($Format=NULL)
-    {
-     $ReCenter		= isset($Format["ReCenter"]) ? $Format["ReCenter"] : TRUE;
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] :FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : NULL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+                if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $Y == VOID ) { $Y = NULL; }
+
+                if ( !$Init && $ReCenter ) { $X = $X - $XStep/2; $Init = TRUE; }
+                $LastX = $X; $LastY = $Y;
+                if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
+                $X = $X + $XStep;
+            }
+            if ( $ReCenter )
+            {
+                $this->drawLine($LastX,$LastY,$this->GraphAreaX2 - $XMargin,$LastY,$Color);
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($this->GraphAreaX2-$XMargin+$ImageMapPlotSize).",".floor($LastY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+            }
+            }
+            else
+            {
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
+            foreach($PosArray as $Key => $X)
+            {
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+                {
+                if ( $X >= $LastX ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
+                $this->drawText($X+$Offset+$Weight,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+                }
+
+                if ( $X != VOID && $LastX != NULL && $LastY != NULL )
+                {
+                $this->drawLine($LastX,$LastY,$LastX,$Y,$Color);
+                $this->drawLine($LastX,$Y,$X,$Y,$Color);
 
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($LastX+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
+
+                if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid )
+                {
+                $this->drawLine($LastGoodX,$LastGoodY,$LastGoodX,$LastGoodY+$YStep,$Color);
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($LastGoodX+$ImageMapPlotSize).",".floor($LastGoodY+$YStep+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+                $this->drawLine($LastGoodX,$LastGoodY+$YStep,$LastGoodX,$Y,$BreakSettings);
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY+$YStep-$ImageMapPlotSize).",".floor($LastGoodX+$ImageMapPlotSize).",".floor($YStep+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                $this->drawLine($LastGoodX,$Y,$X,$Y,$BreakSettings);
+                $LastGoodY = NULL;
+                }
+                elseif ( $X != VOID && $LastGoodY == NULL && !$BreakVoid )
+                {
+                $this->drawLine($X,$this->GraphAreaY1 + $XMargin,$X,$Y,$BreakSettings);
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($this->GraphAreaY1+$XMargin-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
+
+                if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $X == VOID ) { $X = NULL; }
+
+                if ( !$Init && $ReCenter ) { $Y = $Y - $YStep/2; $Init = TRUE; }
+                $LastX = $X; $LastY = $Y;
+                if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
+                $Y = $Y + $YStep;
+            }
+            if ( $ReCenter )
+            {
+                $this->drawLine($LastX,$LastY,$LastX,$this->GraphAreaY2 - $XMargin,$Color);
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($LastX+$ImageMapPlotSize).",".floor($this->GraphAreaY2-$XMargin+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+            }
+            }
+        }
+        }
+    }
+
+    /* Draw a step chart */
+    function drawFilledStepChart($Format=NULL)
+    {
+        $ReCenter		= isset($Format["ReCenter"]) ? $Format["ReCenter"] : TRUE;
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] :FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : NULL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
         {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-         $Color		= array("R"=>$R,"G"=>$G,"B"=>$B);
-         if ( $ForceTransparency != NULL ) { $Color["Alpha"] = $ForceTransparency; } else { $Color["Alpha"] = $Alpha; }
+            $Color		= array("R"=>$R,"G"=>$G,"B"=>$B);
+            if ( $ForceTransparency != NULL ) { $Color["Alpha"] = $ForceTransparency; } else { $Color["Alpha"] = $Alpha; }
 
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-         $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+            $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
 
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
-           if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
 
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
-           if ( !$AroundZero ) { $YZero = $this->GraphAreaY2-1; }
+            if ( !$AroundZero ) { $YZero = $this->GraphAreaY2-1; }
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL; $Points = ""; $Init = FALSE;
-           foreach($PosArray as $Key => $Y)
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL; $Points = ""; $Init = FALSE;
+            foreach($PosArray as $Key => $Y)
             {
-             if ( $Y == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
-              {
-               $Points[] = $LastX; $Points[] = $LastY;
-               $Points[] = $X; $Points[] = $LastY;
-               $Points[] = $X; $Points[] = $YZero;
-               $this->drawPolygon($Points,$Color);
-               $Points = "";
-              }
+                if ( $Y == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
+                {
+                $Points[] = $LastX; $Points[] = $LastY;
+                $Points[] = $X; $Points[] = $LastY;
+                $Points[] = $X; $Points[] = $YZero;
+                $this->drawPolygon($Points,$Color);
+                $Points = "";
+                }
 
-             if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
-              {
-               if ( $Points == "") { $Points[] = $LastX; $Points[] = $YZero; }
-               $Points[] = $LastX; $Points[] = $LastY;
-               $Points[] = $X; $Points[] = $LastY;
-               $Points[] = $X; $Points[] = $Y;
-              }
+                if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
+                {
+                if ( $Points == "") { $Points[] = $LastX; $Points[] = $YZero; }
+                $Points[] = $LastX; $Points[] = $LastY;
+                $Points[] = $X; $Points[] = $LastY;
+                $Points[] = $X; $Points[] = $Y;
+                }
 
-             if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $Y == VOID ) { $Y = NULL; }
+                if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $Y == VOID ) { $Y = NULL; }
 
-             if ( !$Init && $ReCenter ) { $X = $X - $XStep/2; $Init = TRUE; }
-             $LastX = $X; $LastY = $Y;
-             if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
-             $X = $X + $XStep;
+                if ( !$Init && $ReCenter ) { $X = $X - $XStep/2; $Init = TRUE; }
+                $LastX = $X; $LastY = $Y;
+                if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
+                $X = $X + $XStep;
             }
 
-           if ( $ReCenter )
+            if ( $ReCenter )
             {
-             $Points[] = $LastX+$XStep/2; $Points[] = $LastY;
-             $Points[] = $LastX+$XStep/2; $Points[] = $YZero;
+                $Points[] = $LastX+$XStep/2; $Points[] = $LastY;
+                $Points[] = $LastX+$XStep/2; $Points[] = $YZero;
             }
-           else
+            else
             { $Points[] = $LastX; $Points[] = $YZero; }
 
-           $this->drawPolygon($Points,$Color);
-          }
-         else
-          {
-           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+            $this->drawPolygon($Points,$Color);
+            }
+            else
+            {
+            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL; $Points = "";
-           foreach($PosArray as $Key => $X)
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL; $Points = "";
+            foreach($PosArray as $Key => $X)
             {
-             if ( $X == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
-              {
-               $Points[] = $LastX; $Points[] = $LastY;
-               $Points[] = $LastX; $Points[] = $Y;
-               $Points[] = $YZero; $Points[] = $Y;
-               $this->drawPolygon($Points,$Color);
-               $Points = "";
-              }
+                if ( $X == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
+                {
+                $Points[] = $LastX; $Points[] = $LastY;
+                $Points[] = $LastX; $Points[] = $Y;
+                $Points[] = $YZero; $Points[] = $Y;
+                $this->drawPolygon($Points,$Color);
+                $Points = "";
+                }
 
-             if ( $X != VOID && $LastX != NULL && $LastY != NULL )
-              {
-               if ( $Points == "") { $Points[] = $YZero; $Points[] = $LastY; }
-               $Points[] = $LastX; $Points[] = $LastY;
-               $Points[] = $LastX; $Points[] = $Y;
-               $Points[] = $X; $Points[] = $Y;
-              }
+                if ( $X != VOID && $LastX != NULL && $LastY != NULL )
+                {
+                if ( $Points == "") { $Points[] = $YZero; $Points[] = $LastY; }
+                $Points[] = $LastX; $Points[] = $LastY;
+                $Points[] = $LastX; $Points[] = $Y;
+                $Points[] = $X; $Points[] = $Y;
+                }
 
-             if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $X == VOID ) { $X = NULL; }
+                if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $X == VOID ) { $X = NULL; }
 
-             if ( $LastX == NULL && $ReCenter ) { $Y = $Y - $YStep/2; }
-             $LastX = $X; $LastY = $Y;
-             if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
-             $Y = $Y + $YStep;
+                if ( $LastX == NULL && $ReCenter ) { $Y = $Y - $YStep/2; }
+                $LastX = $X; $LastY = $Y;
+                if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
+                $Y = $Y + $YStep;
             }
 
-           if ( $ReCenter )
+            if ( $ReCenter )
             {
-             $Points[] = $LastX; $Points[] = $LastY+$YStep/2;
-             $Points[] = $YZero; $Points[] = $LastY+$YStep/2;
+                $Points[] = $LastX; $Points[] = $LastY+$YStep/2;
+                $Points[] = $YZero; $Points[] = $LastY+$YStep/2;
             }
-           else
+            else
             { $Points[] = $YZero; $Points[] = $LastY; }
 
-           $this->drawPolygon($Points,$Color);
-          }
+            $this->drawPolygon($Points,$Color);
+            }
+        }
         }
-      }
     }
 
-   /* Draw an area chart */
-   function drawAreaChart($Format=NULL)
+    /* Draw an area chart */
+    function drawAreaChart($Format=NULL)
     {
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : 25;
-     $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
-     $Threshold		= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data  = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : 25;
+        $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+        $Threshold		= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data  = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        foreach($Data["Series"] as $SerieName => $Serie)
         {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-         $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+            $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
 
-         if ( $Threshold != NULL )
-          {
-           foreach($Threshold as $Key => $Params)
+            if ( $Threshold != NULL )
+            {
+            foreach($Threshold as $Key => $Params)
             {
-             $Threshold[$Key]["MinX"] = $this->scaleComputeY($Params["Min"],array("AxisID"=>$Serie["Axis"]));
-             $Threshold[$Key]["MaxX"] = $this->scaleComputeY($Params["Max"],array("AxisID"=>$Serie["Axis"]));
+                $Threshold[$Key]["MinX"] = $this->scaleComputeY($Params["Min"],array("AxisID"=>$Serie["Axis"]));
+                $Threshold[$Key]["MaxX"] = $this->scaleComputeY($Params["Max"],array("AxisID"=>$Serie["Axis"]));
+            }
             }
-          }
 
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
 
-           $Areas = ""; $AreaID = 0; 
-           $Areas[$AreaID][] = $this->GraphAreaX1 + $XMargin;
-           if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
+            $Areas = ""; $AreaID = 0; 
+            $Areas[$AreaID][] = $this->GraphAreaX1 + $XMargin;
+            if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
 
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Y)
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $Y)
             {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
-              {
-               if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
-               $this->drawText($X,$Y-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
-              }
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
+                {
+                if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+                $this->drawText($X,$Y-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+                }
 
-             if ( $Y == VOID && isset($Areas[$AreaID]) )
-              {
-               if($LastX == NULL)
+                if ( $Y == VOID && isset($Areas[$AreaID]) )
+                {
+                if($LastX == NULL)
                 { $Areas[$AreaID][] = $X; }
-               else
+                else
                 { $Areas[$AreaID][] = $LastX; }
 
-               if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
-               $AreaID++;
-              }
-             elseif ($Y != VOID)
-              {
-               if ( !isset($Areas[$AreaID]) )
+                if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
+                $AreaID++;
+                }
+                elseif ($Y != VOID)
+                {
+                if ( !isset($Areas[$AreaID]) )
                 {
-                 $Areas[$AreaID][] = $X;
-                 if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
+                    $Areas[$AreaID][] = $X;
+                    if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
                 }
 
-               $Areas[$AreaID][] = $X;
-               $Areas[$AreaID][] = $Y;
-              }
+                $Areas[$AreaID][] = $X;
+                $Areas[$AreaID][] = $Y;
+                }
 
-             $LastX = $X;
-             $X = $X + $XStep;
+                $LastX = $X;
+                $X = $X + $XStep;
             }
-           $Areas[$AreaID][] = $LastX;
-           if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
+            $Areas[$AreaID][] = $LastX;
+            if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
 
-           /* Handle shadows in the areas */
-           if ( $this->Shadow )
+            /* Handle shadows in the areas */
+            if ( $this->Shadow )
             {
-             $ShadowArea = "";
-             foreach($Areas as $Key => $Points)
-              {
-               $ShadowArea[$Key] = "";
-               foreach($Points as $Key2 => $Value)
+                $ShadowArea = "";
+                foreach($Areas as $Key => $Points)
+                {
+                $ShadowArea[$Key] = "";
+                foreach($Points as $Key2 => $Value)
                 {
-                 if ( $Key2 % 2 == 0 )
-                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
-                 else
-                  { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
+                    if ( $Key2 % 2 == 0 )
+                    { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
+                    else
+                    { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
                 }
-              }              
+                }              
 
-             foreach($ShadowArea as $Key => $Points)
-              $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+                foreach($ShadowArea as $Key => $Points)
+                $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
             }
 
-           $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
-           $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
+            $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
+            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
 
-           foreach($Areas as $Key => $Points)
+            foreach($Areas as $Key => $Points)
             $this->drawPolygonChart($Points,$Color);
-          }
-         else
-          {
-           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+            }
+            else
+            {
+            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
-           $Areas = ""; $AreaID = 0; 
-           if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
-           $Areas[$AreaID][] = $this->GraphAreaY1 + $XMargin;
+            $Areas = ""; $AreaID = 0; 
+            if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
+            $Areas[$AreaID][] = $this->GraphAreaY1 + $XMargin;
 
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y     = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y     = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $X)
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $X)
             {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
-              {
-               if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
-               $this->drawText($X+$Offset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
-              }
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
+                {
+                if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+                $this->drawText($X+$Offset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+                }
 
-             if ( $X == VOID && isset($Areas[$AreaID]) )
-              {
-               if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
+                if ( $X == VOID && isset($Areas[$AreaID]) )
+                {
+                if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
 
-               if($LastY == NULL)
+                if($LastY == NULL)
                 { $Areas[$AreaID][] = $Y; }
-               else
+                else
                 { $Areas[$AreaID][] = $LastY; }
 
-               $AreaID++;
-              }
-             elseif ($X != VOID)
-              {
-               if ( !isset($Areas[$AreaID]) )
+                $AreaID++;
+                }
+                elseif ($X != VOID)
+                {
+                if ( !isset($Areas[$AreaID]) )
                 {
-                 if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
-                 $Areas[$AreaID][] = $Y;
+                    if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
+                    $Areas[$AreaID][] = $Y;
                 }
 
-               $Areas[$AreaID][] = $X;
-               $Areas[$AreaID][] = $Y;
-              }
+                $Areas[$AreaID][] = $X;
+                $Areas[$AreaID][] = $Y;
+                }
 
-             $LastX = $X; $LastY = $Y;
-             $Y = $Y + $YStep;
+                $LastX = $X; $LastY = $Y;
+                $Y = $Y + $YStep;
             }
-           if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
-           $Areas[$AreaID][] = $LastY;
+            if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
+            $Areas[$AreaID][] = $LastY;
 
-           /* Handle shadows in the areas */
-           if ( $this->Shadow )
+            /* Handle shadows in the areas */
+            if ( $this->Shadow )
             {
-             $ShadowArea = "";
-             foreach($Areas as $Key => $Points)
-              {
-               $ShadowArea[$Key] = "";
-               foreach($Points as $Key2 => $Value)
+                $ShadowArea = "";
+                foreach($Areas as $Key => $Points)
+                {
+                $ShadowArea[$Key] = "";
+                foreach($Points as $Key2 => $Value)
                 {
-                 if ( $Key2 % 2 == 0 )
-                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
-                 else
-                  { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
+                    if ( $Key2 % 2 == 0 )
+                    { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
+                    else
+                    { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
                 }
-              }              
+                }              
 
-             foreach($ShadowArea as $Key => $Points)
-              $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+                foreach($ShadowArea as $Key => $Points)
+                $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
             }
 
-           $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
-           $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
+            $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
+            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
 
-           foreach($Areas as $Key => $Points)
+            foreach($Areas as $Key => $Points)
             $this->drawPolygonChart($Points,$Color);
-          }
+            }
+        }
         }
-      }
     }
 
 
-   /* Draw a bar chart */
-   function drawBarChart($Format=NULL)
+    /* Draw a bar chart */
+    function drawBarChart($Format=NULL)
     {
-     $Floating0Serie	= isset($Format["Floating0Serie"]) ? $Format["Floating0Serie"] : NULL;
-     $Floating0Value	= isset($Format["Floating0Value"]) ? $Format["Floating0Value"] : NULL;
-     $Draw0Line		= isset($Format["Draw0Line"]) ? $Format["Draw0Line"] : FALSE;
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOrientation = isset($Format["DisplayOrientation"]) ? $Format["DisplayOrientation"] : ORIENTATION_HORIZONTAL;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayFont	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontName;
-     $DisplaySize	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontSize;
-     $DisplayPos	= isset($Format["DisplayPos"]) ? $Format["DisplayPos"] : LABEL_POS_OUTSIDE;
-     $DisplayShadow	= isset($Format["DisplayShadow"]) ? $Format["DisplayShadow"] : TRUE;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
-     $Interleave	= isset($Format["Interleave"]) ? $Format["Interleave"] : .5;
-     $Rounded		= isset($Format["Rounded"]) ? $Format["Rounded"] : FALSE;
-     $RoundRadius	= isset($Format["RoundRadius"]) ? $Format["RoundRadius"] : 4;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
-     $Gradient		= isset($Format["Gradient"]) ? $Format["Gradient"] : FALSE;
-     $GradientMode	= isset($Format["GradientMode"]) ? $Format["GradientMode"] : GRADIENT_SIMPLE;
-     $GradientAlpha	= isset($Format["GradientAlpha"]) ? $Format["GradientAlpha"] : 20;
-     $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
-     $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
-     $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
-     $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 0;
-     $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 0;
-     $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 0;
-     $TxtMargin		= isset($Format["TxtMargin"]) ? $Format["TxtMargin"] : 6;
-     $OverrideColors	= isset($Format["OverrideColors"]) ? $Format["OverrideColors"] : NULL;
-     $OverrideSurrounding = isset($Format["OverrideSurrounding"]) ? $Format["OverrideSurrounding"] : 30;
-     $InnerSurrounding	= isset($Format["InnerSurrounding"]) ? $Format["InnerSurrounding"] : NULL;
-     $InnerBorderR	= isset($Format["InnerBorderR"]) ? $Format["InnerBorderR"] : -1;
-     $InnerBorderG	= isset($Format["InnerBorderG"]) ? $Format["InnerBorderG"] : -1;
-     $InnerBorderB	= isset($Format["InnerBorderB"]) ? $Format["InnerBorderB"] : -1;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     if ( $OverrideColors != NULL )
-      {
-       $OverrideColors = $this->validatePalette($OverrideColors,$OverrideSurrounding);
-       $this->DataSet->saveExtendedData("Palette",$OverrideColors);
-      }
-
-     $RestoreShadow = $this->Shadow;
-
-     $SeriesCount  = $this->countDrawableSeries();
-     $CurrentSerie = 0;
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
-         if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-         if ( $InnerSurrounding != NULL ) { $InnerBorderR = $R+$InnerSurrounding; $InnerBorderG = $G+$InnerSurrounding; $InnerBorderB = $B+$InnerSurrounding; }
-         if ( $InnerBorderR == -1 ) { $InnerColor = NULL; } else { $InnerColor = array("R"=>$InnerBorderR,"G"=>$InnerBorderG,"B"=>$InnerBorderB); }
-         $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB);
-
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
-
-         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
-
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         if ( $Floating0Value != NULL )
-          { $YZero = $this->scaleComputeY($Floating0Value,array("AxisID"=>$Serie["Axis"])); }
-         else
-          { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
-           if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
-
-           if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin;
-
-           if ( $AroundZero ) { $Y1 = $YZero; } else { $Y1 = $this->GraphAreaY2-1; }
-           if ( $XDivs == 0 ) { $XSize = ($this->GraphAreaX2-$this->GraphAreaX1)/($SeriesCount+$Interleave); } else { $XSize   = ($XStep / ($SeriesCount+$Interleave) ); }
-
-           $XOffset = -($XSize*$SeriesCount)/2 + $CurrentSerie * $XSize;
-           if ( $X + $XOffset <= $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $X + 1 ; }
-
-           $this->DataSet->Data["Series"][$SerieName]["XOffset"] = $XOffset + $XSize / 2;
-
-           if ( $Rounded || $BorderR != -1) { $XSpace = 1; } else { $XSpace = 0; }
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-
-           $ID = 0;
-           foreach($PosArray as $Key => $Y2)
-            {
-             if ( $Floating0Serie != NULL )
-              {
-               if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
+        $Floating0Serie	= isset($Format["Floating0Serie"]) ? $Format["Floating0Serie"] : NULL;
+        $Floating0Value	= isset($Format["Floating0Value"]) ? $Format["Floating0Value"] : NULL;
+        $Draw0Line		= isset($Format["Draw0Line"]) ? $Format["Draw0Line"] : FALSE;
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOrientation = isset($Format["DisplayOrientation"]) ? $Format["DisplayOrientation"] : ORIENTATION_HORIZONTAL;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayFont	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontName;
+        $DisplaySize	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontSize;
+        $DisplayPos	= isset($Format["DisplayPos"]) ? $Format["DisplayPos"] : LABEL_POS_OUTSIDE;
+        $DisplayShadow	= isset($Format["DisplayShadow"]) ? $Format["DisplayShadow"] : TRUE;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+        $Interleave	= isset($Format["Interleave"]) ? $Format["Interleave"] : .5;
+        $Rounded		= isset($Format["Rounded"]) ? $Format["Rounded"] : FALSE;
+        $RoundRadius	= isset($Format["RoundRadius"]) ? $Format["RoundRadius"] : 4;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+        $Gradient		= isset($Format["Gradient"]) ? $Format["Gradient"] : FALSE;
+        $GradientMode	= isset($Format["GradientMode"]) ? $Format["GradientMode"] : GRADIENT_SIMPLE;
+        $GradientAlpha	= isset($Format["GradientAlpha"]) ? $Format["GradientAlpha"] : 20;
+        $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
+        $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
+        $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
+        $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 0;
+        $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 0;
+        $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 0;
+        $TxtMargin		= isset($Format["TxtMargin"]) ? $Format["TxtMargin"] : 6;
+        $OverrideColors	= isset($Format["OverrideColors"]) ? $Format["OverrideColors"] : NULL;
+        $OverrideSurrounding = isset($Format["OverrideSurrounding"]) ? $Format["OverrideSurrounding"] : 30;
+        $InnerSurrounding	= isset($Format["InnerSurrounding"]) ? $Format["InnerSurrounding"] : NULL;
+        $InnerBorderR	= isset($Format["InnerBorderR"]) ? $Format["InnerBorderR"] : -1;
+        $InnerBorderG	= isset($Format["InnerBorderG"]) ? $Format["InnerBorderG"] : -1;
+        $InnerBorderB	= isset($Format["InnerBorderB"]) ? $Format["InnerBorderB"] : -1;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        if ( $OverrideColors != NULL )
+        {
+        $OverrideColors = $this->validatePalette($OverrideColors,$OverrideSurrounding);
+        $this->DataSet->saveExtendedData("Palette",$OverrideColors);
+        }
+
+        $RestoreShadow = $this->Shadow;
+
+        $SeriesCount  = $this->countDrawableSeries();
+        $CurrentSerie = 0;
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+            if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+            if ( $InnerSurrounding != NULL ) { $InnerBorderR = $R+$InnerSurrounding; $InnerBorderG = $G+$InnerSurrounding; $InnerBorderB = $B+$InnerSurrounding; }
+            if ( $InnerBorderR == -1 ) { $InnerColor = NULL; } else { $InnerColor = array("R"=>$InnerBorderR,"G"=>$InnerBorderG,"B"=>$InnerBorderB); }
+            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB);
+
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+            if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
+
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+            if ( $Floating0Value != NULL )
+            { $YZero = $this->scaleComputeY($Floating0Value,array("AxisID"=>$Serie["Axis"])); }
+            else
+            { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
+
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+
+            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin;
+
+            if ( $AroundZero ) { $Y1 = $YZero; } else { $Y1 = $this->GraphAreaY2-1; }
+            if ( $XDivs == 0 ) { $XSize = ($this->GraphAreaX2-$this->GraphAreaX1)/($SeriesCount+$Interleave); } else { $XSize   = ($XStep / ($SeriesCount+$Interleave) ); }
+
+            $XOffset = -($XSize*$SeriesCount)/2 + $CurrentSerie * $XSize;
+            if ( $X + $XOffset <= $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $X + 1 ; }
+
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = $XOffset + $XSize / 2;
+
+            if ( $Rounded || $BorderR != -1) { $XSpace = 1; } else { $XSpace = 0; }
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+
+            $ID = 0;
+            foreach($PosArray as $Key => $Y2)
+            {
+                if ( $Floating0Serie != NULL )
+                {
+                if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
                 { $Value = $Data["Series"][$Floating0Serie]["Data"][$Key]; }
-               else
+                else
                 { $Value = 0; }
 
-               $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
-               if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
-               if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+                $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
+                if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+                if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
 
-               if ( $AroundZero ) { $Y1 = $YZero; } else { $Y1 = $this->GraphAreaY2-1; }
-              }
+                if ( $AroundZero ) { $Y1 = $YZero; } else { $Y1 = $this->GraphAreaY2-1; }
+                }
 
-             if ( $OverrideColors != NULL )
-              { if ( isset($OverrideColors[$ID]) ) { $Color = array("R"=>$OverrideColors[$ID]["R"],"G"=>$OverrideColors[$ID]["G"],"B"=>$OverrideColors[$ID]["B"],"Alpha"=>$OverrideColors[$ID]["Alpha"],"BorderR"=>$OverrideColors[$ID]["BorderR"],"BorderG"=>$OverrideColors[$ID]["BorderG"],"BorderB"=>$OverrideColors[$ID]["BorderB"]); } else { $Color = $this->getRandomColor(); } }
+                if ( $OverrideColors != NULL )
+                { if ( isset($OverrideColors[$ID]) ) { $Color = array("R"=>$OverrideColors[$ID]["R"],"G"=>$OverrideColors[$ID]["G"],"B"=>$OverrideColors[$ID]["B"],"Alpha"=>$OverrideColors[$ID]["Alpha"],"BorderR"=>$OverrideColors[$ID]["BorderR"],"BorderG"=>$OverrideColors[$ID]["BorderG"],"BorderB"=>$OverrideColors[$ID]["BorderB"]); } else { $Color = $this->getRandomColor(); } }
 
-             if ( $Y2 != VOID )
-              {
-               $BarHeight = $Y1 - $Y2;
+                if ( $Y2 != VOID )
+                {
+                $BarHeight = $Y1 - $Y2;
 
-               if ( $Serie["Data"][$Key] == 0 )
+                if ( $Serie["Data"][$Key] == 0 )
                 {
-                 $this->drawLine($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y1,$Color);
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1-1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y1+1),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                    $this->drawLine($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y1,$Color);
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1-1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y1+1),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
                 }
-               else
+                else
                 {
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-                 if ( $Rounded )
-                  $this->drawRoundedFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$RoundRadius,$Color);
-                 else
-                  {
-                   $this->drawFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$Color);
+                    if ( $Rounded )
+                    $this->drawRoundedFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$RoundRadius,$Color);
+                    else
+                    {
+                    $this->drawFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$Color);
 
-                   if ( $InnerColor != NULL ) { $this->drawRectangle($X+$XOffset+$XSpace+1,min($Y1,$Y2)+1,$X+$XOffset+$XSize-$XSpace-1,max($Y1,$Y2)-1,$InnerColor); }
+                    if ( $InnerColor != NULL ) { $this->drawRectangle($X+$XOffset+$XSpace+1,min($Y1,$Y2)+1,$X+$XOffset+$XSize-$XSpace-1,max($Y1,$Y2)-1,$InnerColor); }
 
-                   if ( $Gradient )
+                    if ( $Gradient )
                     {
-                     $this->Shadow  = FALSE;
+                        $this->Shadow  = FALSE;
 
-                     if ( $GradientMode == GRADIENT_SIMPLE )
-                      {
-                       if ( $Serie["Data"][$Key] >= 0 )
+                        if ( $GradientMode == GRADIENT_SIMPLE )
+                        {
+                        if ( $Serie["Data"][$Key] >= 0 )
                         $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                       else
+                        else
                         $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
 
-                       $this->drawGradientArea($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,DIRECTION_VERTICAL,$GradienColor);
-                      }
-                     elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
-                      {
-                       $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
-                       $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                       $XSpan = floor($XSize / 3);
-
-                       $this->drawGradientArea($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSpan-$XSpace,$Y2,DIRECTION_HORIZONTAL,$GradienColor1);
-                       $this->drawGradientArea($X+$XOffset+$XSpan+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,DIRECTION_HORIZONTAL,$GradienColor2);
-                      }
-                     $this->Shadow = $RestoreShadow;
+                        $this->drawGradientArea($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,DIRECTION_VERTICAL,$GradienColor);
+                        }
+                        elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                        {
+                        $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                        $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        $XSpan = floor($XSize / 3);
+
+                        $this->drawGradientArea($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSpan-$XSpace,$Y2,DIRECTION_HORIZONTAL,$GradienColor1);
+                        $this->drawGradientArea($X+$XOffset+$XSpan+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,DIRECTION_HORIZONTAL,$GradienColor2);
+                        }
+                        $this->Shadow = $RestoreShadow;
+                    }
                     }
-                  }
 
-                 if ( $Draw0Line )
-                  {
-                   $Line0Color = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20);
+                    if ( $Draw0Line )
+                    {
+                    $Line0Color = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20);
 
-                   if ( abs($Y1 - $Y2) > 3 ) { $Line0Width = 3; } else { $Line0Width = 1; }
-                   if ( $Y1 - $Y2 < 0 ) { $Line0Width = -$Line0Width; }
+                    if ( abs($Y1 - $Y2) > 3 ) { $Line0Width = 3; } else { $Line0Width = 1; }
+                    if ( $Y1 - $Y2 < 0 ) { $Line0Width = -$Line0Width; }
 
-                   $this->drawFilledRectangle($X+$XOffset+$XSpace,floor($Y1),$X+$XOffset+$XSize-$XSpace,floor($Y1)-$Line0Width,$Line0Color);
-                   $this->drawLine($X+$XOffset+$XSpace,floor($Y1),$X+$XOffset+$XSize-$XSpace,floor($Y1),$Line0Color);
-                  }
+                    $this->drawFilledRectangle($X+$XOffset+$XSpace,floor($Y1),$X+$XOffset+$XSize-$XSpace,floor($Y1)-$Line0Width,$Line0Color);
+                    $this->drawLine($X+$XOffset+$XSpace,floor($Y1),$X+$XOffset+$XSize-$XSpace,floor($Y1),$Line0Color);
+                    }
                 }
 
-               if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
                 {
-                 if ( $DisplayShadow ) { $this->Shadow = TRUE; }
-
-                 $Caption    = $this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit);
-                 $TxtPos     = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,90,$Caption);
-                 $TxtHeight  = $TxtPos[0]["Y"] - $TxtPos[1]["Y"] + $TxtMargin;
-
-                 if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtHeight) < abs($BarHeight) )
-                  {
-                   $CenterX = (($X+$XOffset+$XSize-$XSpace)-($X+$XOffset+$XSpace))/2 + $X+$XOffset+$XSpace;
-                   $CenterY = ($Y2-$Y1)/2 + $Y1;
-
-                   $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"Angle"=>90));
-                  }
-                 else
-                  {
-                   if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
-                   $this->drawText($X+$XOffset+$XSize/2,$Y2-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
-                  }
-
-                 $this->Shadow = $RestoreShadow;
+                    if ( $DisplayShadow ) { $this->Shadow = TRUE; }
+
+                    $Caption    = $this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit);
+                    $TxtPos     = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,90,$Caption);
+                    $TxtHeight  = $TxtPos[0]["Y"] - $TxtPos[1]["Y"] + $TxtMargin;
+
+                    if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtHeight) < abs($BarHeight) )
+                    {
+                    $CenterX = (($X+$XOffset+$XSize-$XSpace)-($X+$XOffset+$XSpace))/2 + $X+$XOffset+$XSpace;
+                    $CenterY = ($Y2-$Y1)/2 + $Y1;
+
+                    $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"Angle"=>90));
+                    }
+                    else
+                    {
+                    if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+                    $this->drawText($X+$XOffset+$XSize/2,$Y2-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
+                    }
+
+                    $this->Shadow = $RestoreShadow;
+                }
                 }
-              }
 
-             $X = $X + $XStep;
-             $ID++;
+                $X = $X + $XStep;
+                $ID++;
+            }
             }
-          }
-         else
-          {
-           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+            else
+            {
+            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
-           if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            
-           $Y = $this->GraphAreaY1 + $XMargin;
+            $Y = $this->GraphAreaY1 + $XMargin;
 
-           if ( $AroundZero ) { $X1 = $YZero; } else { $X1 = $this->GraphAreaX1+1; }
-           if ( $XDivs == 0 ) { $YSize = ($this->GraphAreaY2-$this->GraphAreaY1)/($SeriesCount+$Interleave); } else { $YSize   = ($YStep / ($SeriesCount+$Interleave) ); }
+            if ( $AroundZero ) { $X1 = $YZero; } else { $X1 = $this->GraphAreaX1+1; }
+            if ( $XDivs == 0 ) { $YSize = ($this->GraphAreaY2-$this->GraphAreaY1)/($SeriesCount+$Interleave); } else { $YSize   = ($YStep / ($SeriesCount+$Interleave) ); }
            
-           $YOffset = -($YSize*$SeriesCount)/2 + $CurrentSerie * $YSize;
-           if ( $Y + $YOffset <= $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $Y + 1 ; }
+            $YOffset = -($YSize*$SeriesCount)/2 + $CurrentSerie * $YSize;
+            if ( $Y + $YOffset <= $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $Y + 1 ; }
 
-           $this->DataSet->Data["Series"][$SerieName]["XOffset"] = $YOffset + $YSize / 2;
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = $YOffset + $YSize / 2;
 
-           if ( $Rounded || $BorderR != -1 ) { $YSpace = 1; } else { $YSpace = 0; }
+            if ( $Rounded || $BorderR != -1 ) { $YSpace = 1; } else { $YSpace = 0; }
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
 
-           $ID = 0 ;
-           foreach($PosArray as $Key => $X2)
+            $ID = 0 ;
+            foreach($PosArray as $Key => $X2)
             {
-             if ( $Floating0Serie != NULL )
-              {
-               if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
+                if ( $Floating0Serie != NULL )
+                {
+                if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
                 $Value = $Data["Series"][$Floating0Serie]["Data"][$Key];
-               else { $Value = 0; }
+                else { $Value = 0; }
+
+                $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
+                if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+                if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+                if ( $AroundZero ) { $X1 = $YZero; } else { $X1 = $this->GraphAreaX1+1; }
+                }
+
+                if ( $OverrideColors != NULL )
+                { if ( isset($OverrideColors[$ID]) ) { $Color = array("R"=>$OverrideColors[$ID]["R"],"G"=>$OverrideColors[$ID]["G"],"B"=>$OverrideColors[$ID]["B"],"Alpha"=>$OverrideColors[$ID]["Alpha"],"BorderR"=>$OverrideColors[$ID]["BorderR"],"BorderG"=>$OverrideColors[$ID]["BorderG"],"BorderB"=>$OverrideColors[$ID]["BorderB"]); } else { $Color = $this->getRandomColor(); } }
+
+                if ( $X2 != VOID )
+                {
+                $BarWidth = $X2 - $X1;
+
+                if ( $Serie["Data"][$Key] == 0 )
+                {
+                    $this->drawLine($X1,$Y+$YOffset+$YSpace,$X1,$Y+$YOffset+$YSize-$YSpace,$Color);
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1-1).",".floor($Y+$YOffset+$YSpace).",".floor($X1+1).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
+                else
+                {
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1).",".floor($Y+$YOffset+$YSpace).",".floor($X2).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                    if ( $Rounded )
+                    $this->drawRoundedFilledRectangle($X1+1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$RoundRadius,$Color);
+                    else
+                    {
+                    $this->drawFilledRectangle($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$Color);
+
+                    if ( $InnerColor != NULL ) { $this->drawRectangle(min($X1,$X2)+1,$Y+$YOffset+$YSpace+1,max($X1,$X2)-1,$Y+$YOffset+$YSize-$YSpace-1,$InnerColor); }
+
+                    if ( $Gradient )
+                    {
+                        $this->Shadow  = FALSE;
+
+                        if ( $GradientMode == GRADIENT_SIMPLE )
+                        {
+                        if ( $Serie["Data"][$Key] >= 0 )
+                        $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        else
+                        $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+
+                        $this->drawGradientArea($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,DIRECTION_HORIZONTAL,$GradienColor);
+                        }
+                        elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                        {
+                        $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                        $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        $YSpan = floor($YSize / 3);
+
+                        $this->drawGradientArea($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSpan-$YSpace,DIRECTION_VERTICAL,$GradienColor1);
+                        $this->drawGradientArea($X1,$Y+$YOffset+$YSpan,$X2,$Y+$YOffset+$YSize-$YSpace,DIRECTION_VERTICAL,$GradienColor2);
+                        }
+                        $this->Shadow = $RestoreShadow;
+                    }
+                    }
+
+                    if ( $Draw0Line )
+                    {
+                    $Line0Color = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20);
+
+                    if ( abs($X1 - $X2) > 3 ) { $Line0Width = 3; } else { $Line0Width = 1; }
+                    if ( $X2 - $X1 < 0 ) { $Line0Width = -$Line0Width; }
+
+                    $this->drawFilledRectangle(floor($X1),$Y+$YOffset+$YSpace,floor($X1)+$Line0Width,$Y+$YOffset+$YSize-$YSpace,$Line0Color);
+                    $this->drawLine(floor($X1),$Y+$YOffset+$YSpace,floor($X1),$Y+$YOffset+$YSize-$YSpace,$Line0Color);
+                    }
+                }
+
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+                {
+                    if ( $DisplayShadow ) { $this->Shadow = TRUE; }
+
+                    $Caption   = $this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit);
+                    $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
+                    $TxtWidth  = $TxtPos[1]["X"] - $TxtPos[0]["X"] + $TxtMargin;
+
+                    if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtWidth) < abs($BarWidth) )
+                    {
+                    $CenterX = ($X2-$X1)/2 + $X1;
+                    $CenterY = (($Y+$YOffset+$YSize-$YSpace)-($Y+$YOffset+$YSpace))/2 + ($Y+$YOffset+$YSpace);
+
+                    $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize));
+                    }
+                    else
+                    {
+                    if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
+                    $this->drawText($X2+$Offset,$Y+$YOffset+$YSize/2,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
+                    }
+
+                    $this->Shadow = $RestoreShadow;
+                }
+                }
+                $Y = $Y + $YStep;
+                $ID++;
+            }
+            }
+            $CurrentSerie++;
+        }
+        }
+    }
+
+    /* Draw a bar chart */
+    function drawStackedBarChart($Format=NULL)
+    {
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOrientation = isset($Format["DisplayOrientation"]) ? $Format["DisplayOrientation"] : ORIENTATION_AUTO;
+        $DisplayRound      = isset($Format["DisplayRound"]) ? $Format["DisplayRound"] : 0;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayFont	= isset($Format["DisplayFont"]) ? $Format["DisplayFont"] : $this->FontName;
+        $DisplaySize	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontSize;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $Interleave	= isset($Format["Interleave"]) ? $Format["Interleave"] : .5;
+        $Rounded		= isset($Format["Rounded"]) ? $Format["Rounded"] : FALSE;
+        $RoundRadius	= isset($Format["RoundRadius"]) ? $Format["RoundRadius"] : 4;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+        $Gradient		= isset($Format["Gradient"]) ? $Format["Gradient"] : FALSE;
+        $GradientMode	= isset($Format["GradientMode"]) ? $Format["GradientMode"] : GRADIENT_SIMPLE;
+        $GradientAlpha	= isset($Format["GradientAlpha"]) ? $Format["GradientAlpha"] : 20;
+        $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
+        $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
+        $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
+        $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 0;
+        $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 0;
+        $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 0;
+        $InnerSurrounding	= isset($Format["InnerSurrounding"]) ? $Format["InnerSurrounding"] : NULL;
+        $InnerBorderR	= isset($Format["InnerBorderR"]) ? $Format["InnerBorderR"] : -1;
+        $InnerBorderG	= isset($Format["InnerBorderG"]) ? $Format["InnerBorderG"] : -1;
+        $InnerBorderB	= isset($Format["InnerBorderB"]) ? $Format["InnerBorderB"] : -1;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+        $FontFactor	= isset($Format["FontFactor"]) ? $Format["FontFactor"] : 8;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_STACKED;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        $RestoreShadow = $this->Shadow;
+
+        $LastX = ""; $LastY = "";
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = 255; $DisplayG = 255; $DisplayB = 255; }
+            if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+            if ( $InnerSurrounding != NULL ) { $InnerBorderR = $R+$InnerSurrounding; $InnerBorderG = $G+$InnerSurrounding; $InnerBorderB = $B+$InnerSurrounding; }
+            if ( $InnerBorderR == -1 ) { $InnerColor = NULL; } else { $InnerColor = array("R"=>$InnerBorderR,"G"=>$InnerBorderG,"B"=>$InnerBorderB); }
 
-               $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
-               if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-               if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
-               if ( $AroundZero ) { $X1 = $YZero; } else { $X1 = $this->GraphAreaX1+1; }
-              }
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-             if ( $OverrideColors != NULL )
-              { if ( isset($OverrideColors[$ID]) ) { $Color = array("R"=>$OverrideColors[$ID]["R"],"G"=>$OverrideColors[$ID]["G"],"B"=>$OverrideColors[$ID]["B"],"Alpha"=>$OverrideColors[$ID]["Alpha"],"BorderR"=>$OverrideColors[$ID]["BorderR"],"BorderG"=>$OverrideColors[$ID]["BorderG"],"BorderB"=>$OverrideColors[$ID]["BorderB"]); } else { $Color = $this->getRandomColor(); } }
+            if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
 
-             if ( $X2 != VOID )
-              {
-               $BarWidth = $X2 - $X1;
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]),TRUE);
+            $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
 
-               if ( $Serie["Data"][$Key] == 0 )
-                {
-                 $this->drawLine($X1,$Y+$YOffset+$YSpace,$X1,$Y+$YOffset+$YSize-$YSpace,$Color);
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1-1).",".floor($Y+$YOffset+$YSpace).",".floor($X1+1).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-                }
-               else
-                {
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1).",".floor($Y+$YOffset+$YSpace).",".floor($X2).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-                 if ( $Rounded )
-                  $this->drawRoundedFilledRectangle($X1+1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$RoundRadius,$Color);
-                 else
-                  {
-                   $this->drawFilledRectangle($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$Color);
+            $Color = array("TransCorner"=>TRUE,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB);
 
-                   if ( $InnerColor != NULL ) { $this->drawRectangle(min($X1,$X2)+1,$Y+$YOffset+$YSpace+1,max($X1,$X2)-1,$Y+$YOffset+$YSize-$YSpace-1,$InnerColor); }
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
 
-                   if ( $Gradient )
-                    {
-                     $this->Shadow  = FALSE;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X     = $this->GraphAreaX1 + $XMargin;
 
-                     if ( $GradientMode == GRADIENT_SIMPLE )
-                      {
-                       if ( $Serie["Data"][$Key] >= 0 )
-                        $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                       else
-                        $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+            $XSize   = ($XStep / (1+$Interleave) );
+            $XOffset = -($XSize/2);
 
-                       $this->drawGradientArea($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,DIRECTION_HORIZONTAL,$GradienColor);
-                      }
-                     elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
-                      {
-                       $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
-                       $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                       $YSpan = floor($YSize / 3);
-
-                       $this->drawGradientArea($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSpan-$YSpace,DIRECTION_VERTICAL,$GradienColor1);
-                       $this->drawGradientArea($X1,$Y+$YOffset+$YSpan,$X2,$Y+$YOffset+$YSize-$YSpace,DIRECTION_VERTICAL,$GradienColor2);
-                      }
-                     $this->Shadow = $RestoreShadow;
-                    }
-                  }
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $Height)
+            {
+                if ( $Height != VOID && $Serie["Data"][$Key] != 0 )
+                {
+                if ( $Serie["Data"][$Key] > 0 ) { $Pos = "+"; } else { $Pos = "-"; }
 
-                 if ( $Draw0Line )
-                  {
-                   $Line0Color = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20);
+                if ( !isset($LastY[$Key] ) ) { $LastY[$Key] = ""; }
+                if ( !isset($LastY[$Key][$Pos] ) ) { $LastY[$Key][$Pos] = $YZero; }
 
-                   if ( abs($X1 - $X2) > 3 ) { $Line0Width = 3; } else { $Line0Width = 1; }
-                   if ( $X2 - $X1 < 0 ) { $Line0Width = -$Line0Width; }
+                $Y1 = $LastY[$Key][$Pos];
+                $Y2 = $Y1 - $Height;
 
-                   $this->drawFilledRectangle(floor($X1),$Y+$YOffset+$YSpace,floor($X1)+$Line0Width,$Y+$YOffset+$YSize-$YSpace,$Line0Color);
-                   $this->drawLine(floor($X1),$Y+$YOffset+$YSpace,floor($X1),$Y+$YOffset+$YSize-$YSpace,$Line0Color);
-                  }
-                }
+                if ( ($Rounded || $BorderR != -1) && ($Pos == "+" && $Y1 != $YZero) ) { $YSpaceUp = 1; } else { $YSpaceUp = 0; }
+                if ( ($Rounded || $BorderR != -1) && ($Pos == "-" && $Y1 != $YZero) ) { $YSpaceDown = 1; } else { $YSpaceDown = 0; }
 
-               if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-                {
-                 if ( $DisplayShadow ) { $this->Shadow = TRUE; }
-
-                 $Caption   = $this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit);
-                 $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
-                 $TxtWidth  = $TxtPos[1]["X"] - $TxtPos[0]["X"] + $TxtMargin;
-
-                 if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtWidth) < abs($BarWidth) )
-                  {
-                   $CenterX = ($X2-$X1)/2 + $X1;
-                   $CenterY = (($Y+$YOffset+$YSize-$YSpace)-($Y+$YOffset+$YSpace))/2 + ($Y+$YOffset+$YSpace);
-
-                   $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize));
-                  }
-                 else
-                  {
-                   if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
-                   $this->drawText($X2+$Offset,$Y+$YOffset+$YSize/2,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
-                  }
-
-                 $this->Shadow = $RestoreShadow;
-                }
-              }
-             $Y = $Y + $YStep;
-             $ID++;
-            }
-          }
-         $CurrentSerie++;
-        }
-      }
-    }
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset).",".floor($Y1-$YSpaceUp+$YSpaceDown).",".floor($X+$XOffset+$XSize).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-   /* Draw a bar chart */
-   function drawStackedBarChart($Format=NULL)
-    {
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOrientation = isset($Format["DisplayOrientation"]) ? $Format["DisplayOrientation"] : ORIENTATION_AUTO;
-     $DisplayRound      = isset($Format["DisplayRound"]) ? $Format["DisplayRound"] : 0;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayFont	= isset($Format["DisplayFont"]) ? $Format["DisplayFont"] : $this->FontName;
-     $DisplaySize	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontSize;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $Interleave	= isset($Format["Interleave"]) ? $Format["Interleave"] : .5;
-     $Rounded		= isset($Format["Rounded"]) ? $Format["Rounded"] : FALSE;
-     $RoundRadius	= isset($Format["RoundRadius"]) ? $Format["RoundRadius"] : 4;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
-     $Gradient		= isset($Format["Gradient"]) ? $Format["Gradient"] : FALSE;
-     $GradientMode	= isset($Format["GradientMode"]) ? $Format["GradientMode"] : GRADIENT_SIMPLE;
-     $GradientAlpha	= isset($Format["GradientAlpha"]) ? $Format["GradientAlpha"] : 20;
-     $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
-     $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
-     $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
-     $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 0;
-     $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 0;
-     $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 0;
-     $InnerSurrounding	= isset($Format["InnerSurrounding"]) ? $Format["InnerSurrounding"] : NULL;
-     $InnerBorderR	= isset($Format["InnerBorderR"]) ? $Format["InnerBorderR"] : -1;
-     $InnerBorderG	= isset($Format["InnerBorderG"]) ? $Format["InnerBorderG"] : -1;
-     $InnerBorderB	= isset($Format["InnerBorderB"]) ? $Format["InnerBorderB"] : -1;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $FontFactor	= isset($Format["FontFactor"]) ? $Format["FontFactor"] : 8;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_STACKED;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     $RestoreShadow = $this->Shadow;
-
-     $LastX = ""; $LastY = "";
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = 255; $DisplayG = 255; $DisplayB = 255; }
-         if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-         if ( $InnerSurrounding != NULL ) { $InnerBorderR = $R+$InnerSurrounding; $InnerBorderG = $G+$InnerSurrounding; $InnerBorderB = $B+$InnerSurrounding; }
-         if ( $InnerBorderR == -1 ) { $InnerColor = NULL; } else { $InnerColor = array("R"=>$InnerBorderR,"G"=>$InnerBorderG,"B"=>$InnerBorderB); }
-
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
-
-         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
-
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]),TRUE);
-         $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
-
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
-
-         $Color = array("TransCorner"=>TRUE,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB);
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
-
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X     = $this->GraphAreaX1 + $XMargin;
-
-           $XSize   = ($XStep / (1+$Interleave) );
-           $XOffset = -($XSize/2);
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Height)
-            {
-             if ( $Height != VOID && $Serie["Data"][$Key] != 0 )
-              {
-               if ( $Serie["Data"][$Key] > 0 ) { $Pos = "+"; } else { $Pos = "-"; }
-
-               if ( !isset($LastY[$Key] ) ) { $LastY[$Key] = ""; }
-               if ( !isset($LastY[$Key][$Pos] ) ) { $LastY[$Key][$Pos] = $YZero; }
-
-               $Y1 = $LastY[$Key][$Pos];
-               $Y2 = $Y1 - $Height;
-
-               if ( ($Rounded || $BorderR != -1) && ($Pos == "+" && $Y1 != $YZero) ) { $YSpaceUp = 1; } else { $YSpaceUp = 0; }
-               if ( ($Rounded || $BorderR != -1) && ($Pos == "-" && $Y1 != $YZero) ) { $YSpaceDown = 1; } else { $YSpaceDown = 0; }
-
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset).",".floor($Y1-$YSpaceUp+$YSpaceDown).",".floor($X+$XOffset+$XSize).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-
-               if ( $Rounded )
+                if ( $Rounded )
                 $this->drawRoundedFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$RoundRadius,$Color);
-               else
+                else
                 {
-                 $this->drawFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$Color);
+                    $this->drawFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$Color);
 
-                 if ( $InnerColor != NULL ) { $RestoreShadow = $this->Shadow; $this->Shadow = FALSE; $this->drawRectangle(min($X+$XOffset+1,$X+$XOffset+$XSize),min($Y1-$YSpaceUp+$YSpaceDown,$Y2)+1,max($X+$XOffset+1,$X+$XOffset+$XSize)-1,max($Y1-$YSpaceUp+$YSpaceDown,$Y2)-1,$InnerColor); $this->Shadow = $RestoreShadow;}
+                    if ( $InnerColor != NULL ) { $RestoreShadow = $this->Shadow; $this->Shadow = FALSE; $this->drawRectangle(min($X+$XOffset+1,$X+$XOffset+$XSize),min($Y1-$YSpaceUp+$YSpaceDown,$Y2)+1,max($X+$XOffset+1,$X+$XOffset+$XSize)-1,max($Y1-$YSpaceUp+$YSpaceDown,$Y2)-1,$InnerColor); $this->Shadow = $RestoreShadow;}
 
-                 if ( $Gradient )
-                  {
-                   $this->Shadow  = FALSE;
+                    if ( $Gradient )
+                    {
+                    $this->Shadow  = FALSE;
 
-                   if ( $GradientMode == GRADIENT_SIMPLE )
+                    if ( $GradientMode == GRADIENT_SIMPLE )
                     {
-                     $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                     $this->drawGradientArea($X+$XOffset,$Y1-1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2+1,DIRECTION_VERTICAL,$GradientColor);
+                        $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        $this->drawGradientArea($X+$XOffset,$Y1-1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2+1,DIRECTION_VERTICAL,$GradientColor);
                     }
-                   elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                    elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
                     {
-                     $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
-                     $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                     $XSpan = floor($XSize / 3);
+                        $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                        $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        $XSpan = floor($XSize / 3);
 
-                     $this->drawGradientArea($X+$XOffset-.5,$Y1-.5-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSpan,$Y2+.5,DIRECTION_HORIZONTAL,$GradientColor1);
-                     $this->drawGradientArea($X+$XSpan+$XOffset-.5,$Y1-.5-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2+.5,DIRECTION_HORIZONTAL,$GradientColor2);
+                        $this->drawGradientArea($X+$XOffset-.5,$Y1-.5-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSpan,$Y2+.5,DIRECTION_HORIZONTAL,$GradientColor1);
+                        $this->drawGradientArea($X+$XSpan+$XOffset-.5,$Y1-.5-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2+.5,DIRECTION_HORIZONTAL,$GradientColor2);
+                    }
+                    $this->Shadow = $RestoreShadow;
                     }
-                   $this->Shadow = $RestoreShadow;
-                  }
                 }
 
-               if ( $DisplayValues )
+                if ( $DisplayValues )
                 {
-                 $BarHeight = abs($Y2-$Y1)-2;
-                 $BarWidth  = $XSize+($XOffset/2)-$FontFactor;
+                    $BarHeight = abs($Y2-$Y1)-2;
+                    $BarWidth  = $XSize+($XOffset/2)-$FontFactor;
 
-                 $Caption   = $this->scaleFormat(round($Serie["Data"][$Key],$DisplayRound),$Mode,$Format,$Unit);
-                 $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
-                 $TxtHeight = abs($TxtPos[2]["Y"] - $TxtPos[0]["Y"]);
-                 $TxtWidth  = abs($TxtPos[1]["X"] - $TxtPos[0]["X"]);
+                    $Caption   = $this->scaleFormat(round($Serie["Data"][$Key],$DisplayRound),$Mode,$Format,$Unit);
+                    $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
+                    $TxtHeight = abs($TxtPos[2]["Y"] - $TxtPos[0]["Y"]);
+                    $TxtWidth  = abs($TxtPos[1]["X"] - $TxtPos[0]["X"]);
 
-                 $XCenter = ( ($X+$XOffset+$XSize) - ($X+$XOffset) ) / 2 + $X+$XOffset;
-                 $YCenter = ( ($Y2) - ($Y1-$YSpaceUp+$YSpaceDown) ) / 2 + $Y1-$YSpaceUp+$YSpaceDown;
+                    $XCenter = ( ($X+$XOffset+$XSize) - ($X+$XOffset) ) / 2 + $X+$XOffset;
+                    $YCenter = ( ($Y2) - ($Y1-$YSpaceUp+$YSpaceDown) ) / 2 + $Y1-$YSpaceUp+$YSpaceDown;
 
-                 $Done = FALSE;
-                 if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO )
-                  {
-                   if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  )
+                    $Done = FALSE;
+                    if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO )
                     {
-                     $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
-                     $Done = TRUE;
+                    if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  )
+                    {
+                        $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
+                        $Done = TRUE;
+                    }
                     }
-                  }
 
-                 if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
-                  {
-                   if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
+                    if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
+                    {
+                    if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
                     $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Angle"=>90,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
-                  }
+                    }
                 }
 
-               $LastY[$Key][$Pos] = $Y2;
-              }
+                $LastY[$Key][$Pos] = $Y2;
+                }
 
-             $X = $X + $XStep;
+                $X = $X + $XStep;
+            }
             }
-          }
-         else
-          {
-           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+            else
+            {
+            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y     = $this->GraphAreaY1 + $XMargin;
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y     = $this->GraphAreaY1 + $XMargin;
 
-           $YSize   = $YStep / (1+$Interleave);
-           $YOffset = -($YSize/2);
+            $YSize   = $YStep / (1+$Interleave);
+            $YOffset = -($YSize/2);
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Width)
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $Width)
             {
-             if ( $Width != VOID && $Serie["Data"][$Key] != 0 )
-              {
-               if ( $Serie["Data"][$Key] > 0 ) { $Pos = "+"; } else { $Pos = "-"; }
+                if ( $Width != VOID && $Serie["Data"][$Key] != 0 )
+                {
+                if ( $Serie["Data"][$Key] > 0 ) { $Pos = "+"; } else { $Pos = "-"; }
 
-               if ( !isset($LastX[$Key] ) ) { $LastX[$Key] = ""; }
-               if ( !isset($LastX[$Key][$Pos] ) ) { $LastX[$Key][$Pos] = $YZero; }
+                if ( !isset($LastX[$Key] ) ) { $LastX[$Key] = ""; }
+                if ( !isset($LastX[$Key][$Pos] ) ) { $LastX[$Key][$Pos] = $YZero; }
 
-               $X1 = $LastX[$Key][$Pos];
-               $X2 = $X1 + $Width;
+                $X1 = $LastX[$Key][$Pos];
+                $X2 = $X1 + $Width;
 
-               if ( ($Rounded || $BorderR != -1) && ($Pos == "+" && $X1 != $YZero) ) { $XSpaceLeft = 2; } else { $XSpaceLeft = 0; }
-               if ( ($Rounded || $BorderR != -1) && ($Pos == "-" && $X1 != $YZero) ) { $XSpaceRight = 2; } else { $XSpaceRight = 0; }
+                if ( ($Rounded || $BorderR != -1) && ($Pos == "+" && $X1 != $YZero) ) { $XSpaceLeft = 2; } else { $XSpaceLeft = 0; }
+                if ( ($Rounded || $BorderR != -1) && ($Pos == "-" && $X1 != $YZero) ) { $XSpaceRight = 2; } else { $XSpaceRight = 0; }
 
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1+$XSpaceLeft).",".floor($Y+$YOffset).",".floor($X2-$XSpaceRight).",".floor($Y+$YOffset+$YSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1+$XSpaceLeft).",".floor($Y+$YOffset).",".floor($X2-$XSpaceRight).",".floor($Y+$YOffset+$YSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-               if ( $Rounded )
+                if ( $Rounded )
                 $this->drawRoundedFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$RoundRadius,$Color);
-               else
+                else
                 {
-                 $this->drawFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$Color);
+                    $this->drawFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$Color);
 
-                 if ( $InnerColor != NULL ) { $RestoreShadow = $this->Shadow; $this->Shadow = FALSE; $this->drawRectangle(min($X1+$XSpaceLeft,$X2-$XSpaceRight)+1,min($Y+$YOffset,$Y+$YOffset+$YSize)+1,max($X1+$XSpaceLeft,$X2-$XSpaceRight)-1,max($Y+$YOffset,$Y+$YOffset+$YSize)-1,$InnerColor); $this->Shadow = $RestoreShadow;}
+                    if ( $InnerColor != NULL ) { $RestoreShadow = $this->Shadow; $this->Shadow = FALSE; $this->drawRectangle(min($X1+$XSpaceLeft,$X2-$XSpaceRight)+1,min($Y+$YOffset,$Y+$YOffset+$YSize)+1,max($X1+$XSpaceLeft,$X2-$XSpaceRight)-1,max($Y+$YOffset,$Y+$YOffset+$YSize)-1,$InnerColor); $this->Shadow = $RestoreShadow;}
 
-                 if ( $Gradient )
-                  {
-                   $this->Shadow  = FALSE;
+                    if ( $Gradient )
+                    {
+                    $this->Shadow  = FALSE;
 
-                   if ( $GradientMode == GRADIENT_SIMPLE )
+                    if ( $GradientMode == GRADIENT_SIMPLE )
                     {
-                     $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                     $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,DIRECTION_HORIZONTAL,$GradientColor);
+                        $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,DIRECTION_HORIZONTAL,$GradientColor);
                     }
-                   elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                    elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
                     {
-                     $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
-                     $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                     $YSpan = floor($YSize / 3);
+                        $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                        $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        $YSpan = floor($YSize / 3);
 
-                     $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSpan,DIRECTION_VERTICAL,$GradientColor1);
-                     $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset+$YSpan,$X2-$XSpaceRight,$Y+$YOffset+$YSize,DIRECTION_VERTICAL,$GradientColor2);
+                        $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSpan,DIRECTION_VERTICAL,$GradientColor1);
+                        $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset+$YSpan,$X2-$XSpaceRight,$Y+$YOffset+$YSize,DIRECTION_VERTICAL,$GradientColor2);
+                    }
+                    $this->Shadow = $RestoreShadow;
                     }
-                   $this->Shadow = $RestoreShadow;
-                  }
                 }
 
-               if ( $DisplayValues )
+                if ( $DisplayValues )
                 {
-                 $BarWidth = abs($X2-$X1)-$FontFactor;
-                 $BarHeight = $YSize+($YOffset/2)-$FontFactor/2;
-                 $Caption   = $this->scaleFormat(round($Serie["Data"][$Key],$DisplayRound),$Mode,$Format,$Unit);
-                 $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
-                 $TxtHeight = abs($TxtPos[2]["Y"] - $TxtPos[0]["Y"]);
-                 $TxtWidth  = abs($TxtPos[1]["X"] - $TxtPos[0]["X"]);
-
-                 $XCenter  = ( $X2 - $X1 ) / 2 + $X1;
-                 $YCenter  = ( ($Y+$YOffset+$YSize) - ($Y+$YOffset) ) / 2 + $Y+$YOffset;
-
-                 $Done = FALSE;
-                 if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO )
-                  {
-                   if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  )
+                    $BarWidth = abs($X2-$X1)-$FontFactor;
+                    $BarHeight = $YSize+($YOffset/2)-$FontFactor/2;
+                    $Caption   = $this->scaleFormat(round($Serie["Data"][$Key],$DisplayRound),$Mode,$Format,$Unit);
+                    $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
+                    $TxtHeight = abs($TxtPos[2]["Y"] - $TxtPos[0]["Y"]);
+                    $TxtWidth  = abs($TxtPos[1]["X"] - $TxtPos[0]["X"]);
+
+                    $XCenter  = ( $X2 - $X1 ) / 2 + $X1;
+                    $YCenter  = ( ($Y+$YOffset+$YSize) - ($Y+$YOffset) ) / 2 + $Y+$YOffset;
+
+                    $Done = FALSE;
+                    if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO )
                     {
-                     $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
-                     $Done = TRUE;
+                    if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  )
+                    {
+                        $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
+                        $Done = TRUE;
+                    }
                     }
-                  }
 
-                 if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
-                  {
-                   if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
+                    if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
+                    {
+                    if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
                     $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Angle"=>90,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
-                  }
+                    }
                 }
 
-               $LastX[$Key][$Pos] = $X2;
-              }
+                $LastX[$Key][$Pos] = $X2;
+                }
 
-             $Y = $Y + $YStep;
+                $Y = $Y + $YStep;
+            }
             }
-          }
         }
-      }
+        }
     }
 
-   /* Draw a stacked area chart */
-   function drawStackedAreaChart($Format=NULL)
+    /* Draw a stacked area chart */
+    function drawStackedAreaChart($Format=NULL)
     {
-     $DrawLine		= isset($Format["DrawLine"]) ? $Format["DrawLine"] : FALSE;
-     $LineSurrounding	= isset($Format["LineSurrounding"]) ? $Format["LineSurrounding"] : NULL;
-     $LineR		= isset($Format["LineR"]) ? $Format["LineR"] : VOID;
-     $LineG		= isset($Format["LineG"]) ? $Format["LineG"] : VOID;
-     $LineB		= isset($Format["LineB"]) ? $Format["LineB"] : VOID;
-     $LineAlpha		= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 100;
-     $DrawPlot		= isset($Format["DrawPlot"]) ? $Format["DrawPlot"] : FALSE;
-     $PlotRadius	= isset($Format["PlotRadius"]) ? $Format["PlotRadius"] : 2;
-     $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : 1;
-     $PlotBorderSurrounding = isset($Format["PlotBorderSurrounding"]) ? $Format["PlotBorderSurrounding"] : NULL;
-     $PlotBorderR	= isset($Format["PlotBorderR"]) ? $Format["PlotBorderR"] : 0;
-     $PlotBorderG	= isset($Format["PlotBorderG"]) ? $Format["PlotBorderG"] : 0;
-     $PlotBorderB	= isset($Format["PlotBorderB"]) ? $Format["PlotBorderB"] : 0;
-     $PlotBorderAlpha	= isset($Format["PlotBorderAlpha"]) ? $Format["PlotBorderAlpha"] : 50;
-     $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : NULL;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_STACKED;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     $RestoreShadow = $this->Shadow;
-     $this->Shadow  = FALSE;
-
-     /* Build the offset data series */
-     $OffsetData    = "";
-     $OverallOffset = "";
-     $SerieOrder    = "";
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $SerieOrder[] = $SerieName;
-
-         foreach($Serie["Data"] as $Key => $Value)
-          {
-           if ( $Value == VOID ) { $Value = 0; }
-           if ($Value >= 0) { $Sign = "+"; } else { $Sign = "-"; }
-           if ( !isset($OverallOffset[$Key]) || !isset($OverallOffset[$Key][$Sign]) ) { $OverallOffset[$Key][$Sign] = 0; }
-
-           if ( $Sign == "+" )
+        $DrawLine		= isset($Format["DrawLine"]) ? $Format["DrawLine"] : FALSE;
+        $LineSurrounding	= isset($Format["LineSurrounding"]) ? $Format["LineSurrounding"] : NULL;
+        $LineR		= isset($Format["LineR"]) ? $Format["LineR"] : VOID;
+        $LineG		= isset($Format["LineG"]) ? $Format["LineG"] : VOID;
+        $LineB		= isset($Format["LineB"]) ? $Format["LineB"] : VOID;
+        $LineAlpha		= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 100;
+        $DrawPlot		= isset($Format["DrawPlot"]) ? $Format["DrawPlot"] : FALSE;
+        $PlotRadius	= isset($Format["PlotRadius"]) ? $Format["PlotRadius"] : 2;
+        $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : 1;
+        $PlotBorderSurrounding = isset($Format["PlotBorderSurrounding"]) ? $Format["PlotBorderSurrounding"] : NULL;
+        $PlotBorderR	= isset($Format["PlotBorderR"]) ? $Format["PlotBorderR"] : 0;
+        $PlotBorderG	= isset($Format["PlotBorderG"]) ? $Format["PlotBorderG"] : 0;
+        $PlotBorderB	= isset($Format["PlotBorderB"]) ? $Format["PlotBorderB"] : 0;
+        $PlotBorderAlpha	= isset($Format["PlotBorderAlpha"]) ? $Format["PlotBorderAlpha"] : 50;
+        $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : NULL;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_STACKED;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        $RestoreShadow = $this->Shadow;
+        $this->Shadow  = FALSE;
+
+        /* Build the offset data series */
+        $OffsetData    = "";
+        $OverallOffset = "";
+        $SerieOrder    = "";
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $SerieOrder[] = $SerieName;
+
+            foreach($Serie["Data"] as $Key => $Value)
+            {
+            if ( $Value == VOID ) { $Value = 0; }
+            if ($Value >= 0) { $Sign = "+"; } else { $Sign = "-"; }
+            if ( !isset($OverallOffset[$Key]) || !isset($OverallOffset[$Key][$Sign]) ) { $OverallOffset[$Key][$Sign] = 0; }
+
+            if ( $Sign == "+" )
             { $Data["Series"][$SerieName]["Data"][$Key] = $Value + $OverallOffset[$Key][$Sign]; }
-           else
+            else
             { $Data["Series"][$SerieName]["Data"][$Key] = $Value - $OverallOffset[$Key][$Sign]; }
 
-           $OverallOffset[$Key][$Sign] = $OverallOffset[$Key][$Sign] + abs($Value);
-          }
+            $OverallOffset[$Key][$Sign] = $OverallOffset[$Key][$Sign] + abs($Value);
+            }
         } 
-      }
-     $SerieOrder = array_reverse($SerieOrder);
+        }
+        $SerieOrder = array_reverse($SerieOrder);
 
-     $LastX = ""; $LastY = "";
-     foreach($SerieOrder as $Key => $SerieName)
-      {
-       $Serie = $Data["Series"][$SerieName];
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        $LastX = ""; $LastY = "";
+        foreach($SerieOrder as $Key => $SerieName)
         {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $ForceTransparency != NULL ) { $Alpha = $ForceTransparency; }
+        $Serie = $Data["Series"][$SerieName];
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $ForceTransparency != NULL ) { $Alpha = $ForceTransparency; }
 
-         $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
 
-         if ( $LineSurrounding != NULL )
-          $LineColor = array("R"=>$R+$LineSurrounding,"G"=>$G+$LineSurrounding,"B"=>$B+$LineSurrounding,"Alpha"=>$Alpha);
-         elseif ( $LineR != VOID )
-          $LineColor = array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha);
-         else
-          $LineColor = $Color;
+            if ( $LineSurrounding != NULL )
+            $LineColor = array("R"=>$R+$LineSurrounding,"G"=>$G+$LineSurrounding,"B"=>$B+$LineSurrounding,"Alpha"=>$Alpha);
+            elseif ( $LineR != VOID )
+            $LineColor = array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha);
+            else
+            $LineColor = $Color;
 
-         if ( $PlotBorderSurrounding != NULL )
-          $PlotBorderColor = array("R"=>$R+$PlotBorderSurrounding,"G"=>$G+$PlotBorderSurrounding,"B"=>$B+$PlotBorderSurrounding,"Alpha"=>$PlotBorderAlpha);
-         else
-          $PlotBorderColor = array("R"=>$PlotBorderR,"G"=>$PlotBorderG,"B"=>$PlotBorderB,"Alpha"=>$PlotBorderAlpha);
+            if ( $PlotBorderSurrounding != NULL )
+            $PlotBorderColor = array("R"=>$R+$PlotBorderSurrounding,"G"=>$G+$PlotBorderSurrounding,"B"=>$B+$PlotBorderSurrounding,"Alpha"=>$PlotBorderAlpha);
+            else
+            $PlotBorderColor = array("R"=>$PlotBorderR,"G"=>$PlotBorderG,"B"=>$PlotBorderB,"Alpha"=>$PlotBorderAlpha);
 
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]),TRUE);
-         $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]),TRUE);
+            $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
 
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
 
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin;
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
 
-           $Plots = ""; $Plots[] = $X; $Plots[] = $YZero;
-           foreach($PosArray as $Key => $Height)
+            $Plots = ""; $Plots[] = $X; $Plots[] = $YZero;
+            foreach($PosArray as $Key => $Height)
             {
-             if ( $Height != VOID ) { $Plots[] = $X; $Plots[] = $YZero-$Height; }
-             $X = $X + $XStep;
+                if ( $Height != VOID ) { $Plots[] = $X; $Plots[] = $YZero-$Height; }
+                $X = $X + $XStep;
             }
-           $Plots[] = $X-$XStep; $Plots[] = $YZero;
+            $Plots[] = $X-$XStep; $Plots[] = $YZero;
 
-           $this->drawPolygon($Plots,$Color);
+            $this->drawPolygon($Plots,$Color);
 
-           $this->Shadow = $RestoreShadow;
-           if ( $DrawLine ) { for($i=2; $i<=count($Plots)-6; $i=$i+2) { $this->drawLine($Plots[$i],$Plots[$i+1],$Plots[$i+2],$Plots[$i+3],$LineColor); } }
-           if ( $DrawPlot )
+            $this->Shadow = $RestoreShadow;
+            if ( $DrawLine ) { for($i=2; $i<=count($Plots)-6; $i=$i+2) { $this->drawLine($Plots[$i],$Plots[$i+1],$Plots[$i+2],$Plots[$i+3],$LineColor); } }
+            if ( $DrawPlot )
             {
-             for($i=2; $i<=count($Plots)-4; $i=$i+2)
-              {
-               if ( $PlotBorder != 0 )
+                for($i=2; $i<=count($Plots)-4; $i=$i+2)
+                {
+                if ( $PlotBorder != 0 )
                 { $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius+$PlotBorder,$PlotBorderColor); }
 
-               $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius,$Color);
-              }
+                $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius,$Color);
+                }
+            }
+            $this->Shadow = FALSE;
             }
-           $this->Shadow = FALSE;
-          }
-         elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-          {
-           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+            elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+            {
+            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y = $this->GraphAreaY1 + $XMargin;
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin;
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
 
-           $Plots = ""; $Plots[] = $YZero; $Plots[] = $Y;
-           foreach($PosArray as $Key => $Height)
+            $Plots = ""; $Plots[] = $YZero; $Plots[] = $Y;
+            foreach($PosArray as $Key => $Height)
             {
-             if ( $Height != VOID ) { $Plots[] = $YZero+$Height; $Plots[] = $Y; }
-             $Y = $Y + $YStep;
+                if ( $Height != VOID ) { $Plots[] = $YZero+$Height; $Plots[] = $Y; }
+                $Y = $Y + $YStep;
             }
-           $Plots[] = $YZero; $Plots[] = $Y-$YStep;
+            $Plots[] = $YZero; $Plots[] = $Y-$YStep;
 
-           $this->drawPolygon($Plots,$Color);
+            $this->drawPolygon($Plots,$Color);
 
-           $this->Shadow = $RestoreShadow;
-           if ( $DrawLine ) { for($i=2; $i<=count($Plots)-6; $i=$i+2) { $this->drawLine($Plots[$i],$Plots[$i+1],$Plots[$i+2],$Plots[$i+3],$LineColor); } }
-           if ( $DrawPlot )
+            $this->Shadow = $RestoreShadow;
+            if ( $DrawLine ) { for($i=2; $i<=count($Plots)-6; $i=$i+2) { $this->drawLine($Plots[$i],$Plots[$i+1],$Plots[$i+2],$Plots[$i+3],$LineColor); } }
+            if ( $DrawPlot )
             {
-             for($i=2; $i<=count($Plots)-4; $i=$i+2)
-              {
-               if ( $PlotBorder != 0 )
+                for($i=2; $i<=count($Plots)-4; $i=$i+2)
+                {
+                if ( $PlotBorder != 0 )
                 { $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius+$PlotBorder,$PlotBorderColor); }
 
-               $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius,$Color);
-              }
+                $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius,$Color);
+                }
+            }
+            $this->Shadow = FALSE;
             }
-           $this->Shadow = FALSE;
-          }
         }
-      }
-     $this->Shadow = $RestoreShadow;
+        }
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Returns a random color */
-   function getRandomColor($Alpha=100)
+    /* Returns a random color */
+    function getRandomColor($Alpha=100)
     { return(array("R"=>rand(0,255),"G"=>rand(0,255),"B"=>rand(0,255),"Alpha"=>$Alpha)); }
  
-   /* Validate a palette */
-   function validatePalette($Colors,$Surrounding=NULL)
+    /* Validate a palette */
+    function validatePalette($Colors,$Surrounding=NULL)
     {
-     $Result = "";
+        $Result = "";
 
-     if ( !is_array($Colors) ) { return($this->getRandomColor()); }
+        if ( !is_array($Colors) ) { return($this->getRandomColor()); }
 
-     foreach($Colors as $Key => $Values)
-      {
-       if ( isset($Values["R"]) ) { $Result[$Key]["R"] = $Values["R"]; } else { $Result[$Key]["R"] = rand(0,255); }
-       if ( isset($Values["G"]) ) { $Result[$Key]["G"] = $Values["G"]; } else { $Result[$Key]["G"] = rand(0,255); }
-       if ( isset($Values["B"]) ) { $Result[$Key]["B"] = $Values["B"]; } else { $Result[$Key]["B"] = rand(0,255); }
-       if ( isset($Values["Alpha"]) ) { $Result[$Key]["Alpha"] = $Values["Alpha"]; } else { $Result[$Key]["Alpha"] = 100; }
+        foreach($Colors as $Key => $Values)
+        {
+        if ( isset($Values["R"]) ) { $Result[$Key]["R"] = $Values["R"]; } else { $Result[$Key]["R"] = rand(0,255); }
+        if ( isset($Values["G"]) ) { $Result[$Key]["G"] = $Values["G"]; } else { $Result[$Key]["G"] = rand(0,255); }
+        if ( isset($Values["B"]) ) { $Result[$Key]["B"] = $Values["B"]; } else { $Result[$Key]["B"] = rand(0,255); }
+        if ( isset($Values["Alpha"]) ) { $Result[$Key]["Alpha"] = $Values["Alpha"]; } else { $Result[$Key]["Alpha"] = 100; }
 
-       if ( $Surrounding != NULL )
+        if ( $Surrounding != NULL )
         {
-         $Result[$Key]["BorderR"] = $Result[$Key]["R"] + $Surrounding;
-         $Result[$Key]["BorderG"] = $Result[$Key]["G"] + $Surrounding;
-         $Result[$Key]["BorderB"] = $Result[$Key]["B"] + $Surrounding;
+            $Result[$Key]["BorderR"] = $Result[$Key]["R"] + $Surrounding;
+            $Result[$Key]["BorderG"] = $Result[$Key]["G"] + $Surrounding;
+            $Result[$Key]["BorderB"] = $Result[$Key]["B"] + $Surrounding;
         }
-       else
+        else
         {
-         if ( isset($Values["BorderR"]) )     { $Result[$Key]["BorderR"] = $Values["BorderR"]; } else { $Result[$Key]["BorderR"] = $Result[$Key]["R"]; }
-         if ( isset($Values["BorderG"]) )     { $Result[$Key]["BorderG"] = $Values["BorderG"]; } else { $Result[$Key]["BorderG"] = $Result[$Key]["G"]; }
-         if ( isset($Values["BorderB"]) )     { $Result[$Key]["BorderB"] = $Values["BorderB"]; } else { $Result[$Key]["BorderB"] = $Result[$Key]["B"]; }
-         if ( isset($Values["BorderAlpha"]) ) { $Result[$Key]["BorderAlpha"] = $Values["BorderAlpha"]; } else { $Result[$Key]["BorderAlpha"] = $Result[$Key]["Alpha"]; }
+            if ( isset($Values["BorderR"]) )     { $Result[$Key]["BorderR"] = $Values["BorderR"]; } else { $Result[$Key]["BorderR"] = $Result[$Key]["R"]; }
+            if ( isset($Values["BorderG"]) )     { $Result[$Key]["BorderG"] = $Values["BorderG"]; } else { $Result[$Key]["BorderG"] = $Result[$Key]["G"]; }
+            if ( isset($Values["BorderB"]) )     { $Result[$Key]["BorderB"] = $Values["BorderB"]; } else { $Result[$Key]["BorderB"] = $Result[$Key]["B"]; }
+            if ( isset($Values["BorderAlpha"]) ) { $Result[$Key]["BorderAlpha"] = $Values["BorderAlpha"]; } else { $Result[$Key]["BorderAlpha"] = $Result[$Key]["Alpha"]; }
+        }
         }
-      }
 
-     return($Result);
+        return($Result);
     }
 
-   /* Draw the derivative chart associated to the data series */
-   function drawDerivative($Format=NULL)
+    /* Draw the derivative chart associated to the data series */
+    function drawDerivative($Format=NULL)
     {
-     $Offset		= isset($Format["Offset"]) ? $Format["Offset"] : 10;
-     $SerieSpacing	= isset($Format["SerieSpacing"]) ? $Format["SerieSpacing"] : 3;
-     $DerivativeHeight	= isset($Format["DerivativeHeight"]) ? $Format["DerivativeHeight"] : 4;
-     $ShadedSlopeBox	= isset($Format["ShadedSlopeBox"]) ? $Format["ShadedSlopeBox"] : FALSE;
-     $DrawBackground	= isset($Format["DrawBackground"]) ? $Format["DrawBackground"] : TRUE;
-     $BackgroundR	= isset($Format["BackgroundR"]) ? $Format["BackgroundR"] : 255;
-     $BackgroundG	= isset($Format["BackgroundG"]) ? $Format["BackgroundG"] : 255;
-     $BackgroundB	= isset($Format["BackgroundB"]) ? $Format["BackgroundB"] : 255;
-     $BackgroundAlpha	= isset($Format["BackgroundAlpha"]) ? $Format["BackgroundAlpha"] : 20;
-     $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
-     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 100;
-     $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : TRUE;
-     $CaptionHeight	= isset($Format["CaptionHeight"]) ? $Format["CaptionHeight"] : 10;
-     $CaptionWidth	= isset($Format["CaptionWidth"]) ? $Format["CaptionWidth"] : 20;
-     $CaptionMargin	= isset($Format["CaptionMargin"]) ? $Format["CaptionMargin"] : 4;
-     $CaptionLine	= isset($Format["CaptionLine"]) ? $Format["CaptionLine"] : FALSE;
-     $CaptionBox	= isset($Format["CaptionBox"]) ? $Format["CaptionBox"] : FALSE;
-     $CaptionBorderR	= isset($Format["CaptionBorderR"]) ? $Format["CaptionBorderR"] : 0;
-     $CaptionBorderG	= isset($Format["CaptionBorderG"]) ? $Format["CaptionBorderG"] : 0;
-     $CaptionBorderB	= isset($Format["CaptionBorderB"]) ? $Format["CaptionBorderB"] : 0;
-     $CaptionFillR	= isset($Format["CaptionFillR"]) ? $Format["CaptionFillR"] : 255;
-     $CaptionFillG	= isset($Format["CaptionFillG"]) ? $Format["CaptionFillG"] : 255;
-     $CaptionFillB	= isset($Format["CaptionFillB"]) ? $Format["CaptionFillB"] : 255;
-     $CaptionFillAlpha	= isset($Format["CaptionFillAlpha"]) ? $Format["CaptionFillAlpha"] : 80;
-     $PositiveSlopeStartR	= isset($Format["PositiveSlopeStartR"]) ? $Format["PositiveSlopeStartR"] : 184;
-     $PositiveSlopeStartG	= isset($Format["PositiveSlopeStartG"]) ? $Format["PositiveSlopeStartG"] : 234;
-     $PositiveSlopeStartB	= isset($Format["PositiveSlopeStartB"]) ? $Format["PositiveSlopeStartB"] : 88;
-     $PositiveSlopeEndR		= isset($Format["PositiveSlopeStartR"]) ? $Format["PositiveSlopeStartR"] : 239;
-     $PositiveSlopeEndG		= isset($Format["PositiveSlopeStartG"]) ? $Format["PositiveSlopeStartG"] : 31;
-     $PositiveSlopeEndB		= isset($Format["PositiveSlopeStartB"]) ? $Format["PositiveSlopeStartB"] : 36;
-     $NegativeSlopeStartR	= isset($Format["NegativeSlopeStartR"]) ? $Format["NegativeSlopeStartR"] : 184;
-     $NegativeSlopeStartG	= isset($Format["NegativeSlopeStartG"]) ? $Format["NegativeSlopeStartG"] : 234;
-     $NegativeSlopeStartB	= isset($Format["NegativeSlopeStartB"]) ? $Format["NegativeSlopeStartB"] : 88;
-     $NegativeSlopeEndR		= isset($Format["NegativeSlopeStartR"]) ? $Format["NegativeSlopeStartR"] : 67;
-     $NegativeSlopeEndG		= isset($Format["NegativeSlopeStartG"]) ? $Format["NegativeSlopeStartG"] : 124;
-     $NegativeSlopeEndB		= isset($Format["NegativeSlopeStartB"]) ? $Format["NegativeSlopeStartB"] : 227;
-
-     $Data = $this->DataSet->getData();
-
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      $YPos = $this->DataSet->Data["GraphArea"]["Y2"] + $Offset;
-     else
-      $XPos = $this->DataSet->Data["GraphArea"]["X2"] + $Offset;
-
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
-
-         $AxisID   = $Serie["Axis"];
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $Caption )
-            {
-             if ( $CaptionLine ) 
-              {
-               $StartX = floor($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin);
-               $EndX   = floor($this->GraphAreaX1-$CaptionMargin+$XMargin);
-
-               $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
-               if ( $CaptionBox ) { $this->drawFilledRectangle($StartX,$YPos,$EndX,$YPos+$CaptionHeight,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
-               $this->drawLine($StartX+2,$YPos+($CaptionHeight/2),$EndX-2,$YPos+($CaptionHeight/2),$CaptionSettings);
-              }
-             else
-              $this->drawFilledRectangle($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin,$YPos,$this->GraphAreaX1-$CaptionMargin+$XMargin,$YPos+$CaptionHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
-            }
-
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin;
-
-           $TopY    = $YPos + ($CaptionHeight/2) - ($DerivativeHeight/2);
-           $BottomY = $YPos + ($CaptionHeight/2) + ($DerivativeHeight/2);
-
-           $StartX  = floor($this->GraphAreaX1+$XMargin);
-           $EndX    = floor($this->GraphAreaX2-$XMargin);
-
-           if ( $DrawBackground ) { $this->drawFilledRectangle($StartX-1,$TopY-1,$EndX+1,$BottomY+1,array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha)); }
-           if ( $DrawBorder ) { $this->drawRectangle($StartX-1,$TopY-1,$EndX+1,$BottomY+1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-
-           $RestoreShadow = $this->Shadow;
-           $this->Shadow  = FALSE;
-
-           /* Determine the Max slope index */
-           $LastX = NULL; $LastY = NULL; $MinSlope = 0; $MaxSlope = 1;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $Y != VOID && $LastX != NULL )
-              { $Slope = ($LastY - $Y); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
-
-             if ( $Y == VOID )
-              { $LastX = NULL; $LastY = NULL; }
-             else
-              { $LastX = $X; $LastY = $Y; }
-            }
-
-           $LastX = NULL; $LastY = NULL; $LastColor = NULL;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $Y != VOID && $LastY != NULL )
-              {
-               $Slope = ($LastY - $Y);
-
-               if ( $Slope >= 0 )
+        $Offset		= isset($Format["Offset"]) ? $Format["Offset"] : 10;
+        $SerieSpacing	= isset($Format["SerieSpacing"]) ? $Format["SerieSpacing"] : 3;
+        $DerivativeHeight	= isset($Format["DerivativeHeight"]) ? $Format["DerivativeHeight"] : 4;
+        $ShadedSlopeBox	= isset($Format["ShadedSlopeBox"]) ? $Format["ShadedSlopeBox"] : FALSE;
+        $DrawBackground	= isset($Format["DrawBackground"]) ? $Format["DrawBackground"] : TRUE;
+        $BackgroundR	= isset($Format["BackgroundR"]) ? $Format["BackgroundR"] : 255;
+        $BackgroundG	= isset($Format["BackgroundG"]) ? $Format["BackgroundG"] : 255;
+        $BackgroundB	= isset($Format["BackgroundB"]) ? $Format["BackgroundB"] : 255;
+        $BackgroundAlpha	= isset($Format["BackgroundAlpha"]) ? $Format["BackgroundAlpha"] : 20;
+        $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
+        $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 100;
+        $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : TRUE;
+        $CaptionHeight	= isset($Format["CaptionHeight"]) ? $Format["CaptionHeight"] : 10;
+        $CaptionWidth	= isset($Format["CaptionWidth"]) ? $Format["CaptionWidth"] : 20;
+        $CaptionMargin	= isset($Format["CaptionMargin"]) ? $Format["CaptionMargin"] : 4;
+        $CaptionLine	= isset($Format["CaptionLine"]) ? $Format["CaptionLine"] : FALSE;
+        $CaptionBox	= isset($Format["CaptionBox"]) ? $Format["CaptionBox"] : FALSE;
+        $CaptionBorderR	= isset($Format["CaptionBorderR"]) ? $Format["CaptionBorderR"] : 0;
+        $CaptionBorderG	= isset($Format["CaptionBorderG"]) ? $Format["CaptionBorderG"] : 0;
+        $CaptionBorderB	= isset($Format["CaptionBorderB"]) ? $Format["CaptionBorderB"] : 0;
+        $CaptionFillR	= isset($Format["CaptionFillR"]) ? $Format["CaptionFillR"] : 255;
+        $CaptionFillG	= isset($Format["CaptionFillG"]) ? $Format["CaptionFillG"] : 255;
+        $CaptionFillB	= isset($Format["CaptionFillB"]) ? $Format["CaptionFillB"] : 255;
+        $CaptionFillAlpha	= isset($Format["CaptionFillAlpha"]) ? $Format["CaptionFillAlpha"] : 80;
+        $PositiveSlopeStartR	= isset($Format["PositiveSlopeStartR"]) ? $Format["PositiveSlopeStartR"] : 184;
+        $PositiveSlopeStartG	= isset($Format["PositiveSlopeStartG"]) ? $Format["PositiveSlopeStartG"] : 234;
+        $PositiveSlopeStartB	= isset($Format["PositiveSlopeStartB"]) ? $Format["PositiveSlopeStartB"] : 88;
+        $PositiveSlopeEndR		= isset($Format["PositiveSlopeStartR"]) ? $Format["PositiveSlopeStartR"] : 239;
+        $PositiveSlopeEndG		= isset($Format["PositiveSlopeStartG"]) ? $Format["PositiveSlopeStartG"] : 31;
+        $PositiveSlopeEndB		= isset($Format["PositiveSlopeStartB"]) ? $Format["PositiveSlopeStartB"] : 36;
+        $NegativeSlopeStartR	= isset($Format["NegativeSlopeStartR"]) ? $Format["NegativeSlopeStartR"] : 184;
+        $NegativeSlopeStartG	= isset($Format["NegativeSlopeStartG"]) ? $Format["NegativeSlopeStartG"] : 234;
+        $NegativeSlopeStartB	= isset($Format["NegativeSlopeStartB"]) ? $Format["NegativeSlopeStartB"] : 88;
+        $NegativeSlopeEndR		= isset($Format["NegativeSlopeStartR"]) ? $Format["NegativeSlopeStartR"] : 67;
+        $NegativeSlopeEndG		= isset($Format["NegativeSlopeStartG"]) ? $Format["NegativeSlopeStartG"] : 124;
+        $NegativeSlopeEndB		= isset($Format["NegativeSlopeStartB"]) ? $Format["NegativeSlopeStartB"] : 227;
+
+        $Data = $this->DataSet->getData();
+
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        $YPos = $this->DataSet->Data["GraphArea"]["Y2"] + $Offset;
+        else
+        $XPos = $this->DataSet->Data["GraphArea"]["X2"] + $Offset;
+
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+
+            $AxisID   = $Serie["Axis"];
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $Caption )
+            {
+                if ( $CaptionLine ) 
+                {
+                $StartX = floor($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin);
+                $EndX   = floor($this->GraphAreaX1-$CaptionMargin+$XMargin);
+
+                $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
+                if ( $CaptionBox ) { $this->drawFilledRectangle($StartX,$YPos,$EndX,$YPos+$CaptionHeight,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
+                $this->drawLine($StartX+2,$YPos+($CaptionHeight/2),$EndX-2,$YPos+($CaptionHeight/2),$CaptionSettings);
+                }
+                else
+                $this->drawFilledRectangle($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin,$YPos,$this->GraphAreaX1-$CaptionMargin+$XMargin,$YPos+$CaptionHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
+            }
+
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin;
+
+            $TopY    = $YPos + ($CaptionHeight/2) - ($DerivativeHeight/2);
+            $BottomY = $YPos + ($CaptionHeight/2) + ($DerivativeHeight/2);
+
+            $StartX  = floor($this->GraphAreaX1+$XMargin);
+            $EndX    = floor($this->GraphAreaX2-$XMargin);
+
+            if ( $DrawBackground ) { $this->drawFilledRectangle($StartX-1,$TopY-1,$EndX+1,$BottomY+1,array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha)); }
+            if ( $DrawBorder ) { $this->drawRectangle($StartX-1,$TopY-1,$EndX+1,$BottomY+1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+
+            $RestoreShadow = $this->Shadow;
+            $this->Shadow  = FALSE;
+
+            /* Determine the Max slope index */
+            $LastX = NULL; $LastY = NULL; $MinSlope = 0; $MaxSlope = 1;
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $Y != VOID && $LastX != NULL )
+                { $Slope = ($LastY - $Y); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
+
+                if ( $Y == VOID )
+                { $LastX = NULL; $LastY = NULL; }
+                else
+                { $LastX = $X; $LastY = $Y; }
+            }
+
+            $LastX = NULL; $LastY = NULL; $LastColor = NULL;
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $Y != VOID && $LastY != NULL )
+                {
+                $Slope = ($LastY - $Y);
+
+                if ( $Slope >= 0 )
                 {
-                 $SlopeIndex = (100 / $MaxSlope) * $Slope;
-                 $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
-                 $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
-                 $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
+                    $SlopeIndex = (100 / $MaxSlope) * $Slope;
+                    $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
+                    $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
+                    $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
                 }
-               elseif ( $Slope < 0 )
+                elseif ( $Slope < 0 )
                 {
-                 $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
-                 $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
-                 $G = (($NegativeSlopeEndG - $NegativeSlopeStartG)/100)*$SlopeIndex+$NegativeSlopeStartG;
-                 $B = (($NegativeSlopeEndB - $NegativeSlopeStartB)/100)*$SlopeIndex+$NegativeSlopeStartB;
+                    $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
+                    $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
+                    $G = (($NegativeSlopeEndG - $NegativeSlopeStartG)/100)*$SlopeIndex+$NegativeSlopeStartG;
+                    $B = (($NegativeSlopeEndB - $NegativeSlopeStartB)/100)*$SlopeIndex+$NegativeSlopeStartB;
                 }
 
-               $Color = array("R"=>$R,"G"=>$G,"B"=>$B);
+                $Color = array("R"=>$R,"G"=>$G,"B"=>$B);
 
-               if ( $ShadedSlopeBox && $LastColor != NULL ) // && $Slope != 0
+                if ( $ShadedSlopeBox && $LastColor != NULL ) // && $Slope != 0
                 {
-                 $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
-                 $this->drawGradientArea($LastX,$TopY,$X,$BottomY,DIRECTION_HORIZONTAL,$GradientSettings);
+                    $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
+                    $this->drawGradientArea($LastX,$TopY,$X,$BottomY,DIRECTION_HORIZONTAL,$GradientSettings);
                 }
-               elseif ( !$ShadedSlopeBox || $LastColor == NULL ) // || $Slope == 0
+                elseif ( !$ShadedSlopeBox || $LastColor == NULL ) // || $Slope == 0
                 $this->drawFilledRectangle(floor($LastX),$TopY,floor($X),$BottomY,$Color);
 
-               $LastColor = $Color;
-              }
+                $LastColor = $Color;
+                }
 
-             if ( $Y == VOID )
-              { $LastY = NULL; }
-             else
-              { $LastX = $X; $LastY = $Y; }
+                if ( $Y == VOID )
+                { $LastY = NULL; }
+                else
+                { $LastX = $X; $LastY = $Y; }
 
-             $X = $X + $XStep;
+                $X = $X + $XStep;
             }
 
-           $YPos = $YPos + $CaptionHeight + $SerieSpacing;
-          }
-         else
-          {
-           if ( $Caption )
+            $YPos = $YPos + $CaptionHeight + $SerieSpacing;
+            }
+            else
+            {
+            if ( $Caption )
             {
-             $StartY = floor($this->GraphAreaY1-$CaptionWidth+$XMargin-$CaptionMargin);
-             $EndY   = floor($this->GraphAreaY1-$CaptionMargin+$XMargin);
-             if ( $CaptionLine ) 
-              {
-               $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
-               if ( $CaptionBox ) { $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
-               $this->drawLine($XPos+($CaptionHeight/2),$StartY+2,$XPos+($CaptionHeight/2),$EndY-2,$CaptionSettings);
-              }
-             else
-              $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
+                $StartY = floor($this->GraphAreaY1-$CaptionWidth+$XMargin-$CaptionMargin);
+                $EndY   = floor($this->GraphAreaY1-$CaptionMargin+$XMargin);
+                if ( $CaptionLine ) 
+                {
+                $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
+                if ( $CaptionBox ) { $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
+                $this->drawLine($XPos+($CaptionHeight/2),$StartY+2,$XPos+($CaptionHeight/2),$EndY-2,$CaptionSettings);
+                }
+                else
+                $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
             }
 
 
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y = $this->GraphAreaY1 + $XMargin;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin;
 
-           $TopX    = $XPos + ($CaptionHeight/2) - ($DerivativeHeight/2);
-           $BottomX = $XPos + ($CaptionHeight/2) + ($DerivativeHeight/2);
+            $TopX    = $XPos + ($CaptionHeight/2) - ($DerivativeHeight/2);
+            $BottomX = $XPos + ($CaptionHeight/2) + ($DerivativeHeight/2);
 
-           $StartY  = floor($this->GraphAreaY1+$XMargin);
-           $EndY    = floor($this->GraphAreaY2-$XMargin);
+            $StartY  = floor($this->GraphAreaY1+$XMargin);
+            $EndY    = floor($this->GraphAreaY2-$XMargin);
 
-           if ( $DrawBackground ) { $this->drawFilledRectangle($TopX-1,$StartY-1,$BottomX+1,$EndY+1,array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha)); }
-           if ( $DrawBorder ) { $this->drawRectangle($TopX-1,$StartY-1,$BottomX+1,$EndY+1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
+            if ( $DrawBackground ) { $this->drawFilledRectangle($TopX-1,$StartY-1,$BottomX+1,$EndY+1,array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha)); }
+            if ( $DrawBorder ) { $this->drawRectangle($TopX-1,$StartY-1,$BottomX+1,$EndY+1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
 
-           $RestoreShadow = $this->Shadow;
-           $this->Shadow  = FALSE;
+            $RestoreShadow = $this->Shadow;
+            $this->Shadow  = FALSE;
 
-           /* Determine the Max slope index */
-           $LastX = NULL; $LastY = NULL; $MinSlope = 0; $MaxSlope = 1;
-           foreach($PosArray as $Key => $X)
+            /* Determine the Max slope index */
+            $LastX = NULL; $LastY = NULL; $MinSlope = 0; $MaxSlope = 1;
+            foreach($PosArray as $Key => $X)
             {
-             if ( $X != VOID && $LastX != NULL )
-              { $Slope = ($X - $LastX); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
+                if ( $X != VOID && $LastX != NULL )
+                { $Slope = ($X - $LastX); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
 
-             if ( $X == VOID )
-              { $LastX = NULL; }
-             else
-              { $LastX = $X; }
+                if ( $X == VOID )
+                { $LastX = NULL; }
+                else
+                { $LastX = $X; }
             }
 
-           $LastX = NULL; $LastY = NULL; $LastColor = NULL;
-           foreach($PosArray as $Key => $X)
+            $LastX = NULL; $LastY = NULL; $LastColor = NULL;
+            foreach($PosArray as $Key => $X)
             {
-             if ( $X != VOID && $LastX != NULL )
-              {
-               $Slope = ($X - $LastX);
+                if ( $X != VOID && $LastX != NULL )
+                {
+                $Slope = ($X - $LastX);
 
-               if ( $Slope >= 0 )
+                if ( $Slope >= 0 )
                 {
-                 $SlopeIndex = (100 / $MaxSlope) * $Slope;
-                 $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
-                 $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
-                 $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
+                    $SlopeIndex = (100 / $MaxSlope) * $Slope;
+                    $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
+                    $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
+                    $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
                 }
-               elseif ( $Slope < 0 )
+                elseif ( $Slope < 0 )
                 {
-                 $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
-                 $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
-                 $G = (($NegativeSlopeEndG - $NegativeSlopeStartG)/100)*$SlopeIndex+$NegativeSlopeStartG;
-                 $B = (($NegativeSlopeEndB - $NegativeSlopeStartB)/100)*$SlopeIndex+$NegativeSlopeStartB;
+                    $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
+                    $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
+                    $G = (($NegativeSlopeEndG - $NegativeSlopeStartG)/100)*$SlopeIndex+$NegativeSlopeStartG;
+                    $B = (($NegativeSlopeEndB - $NegativeSlopeStartB)/100)*$SlopeIndex+$NegativeSlopeStartB;
                 }
 
-               $Color = array("R"=>$R,"G"=>$G,"B"=>$B);
+                $Color = array("R"=>$R,"G"=>$G,"B"=>$B);
 
-               if ( $ShadedSlopeBox && $LastColor != NULL )
+                if ( $ShadedSlopeBox && $LastColor != NULL )
                 {
-                 $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
+                    $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
 
-                 $this->drawGradientArea($TopX,$LastY,$BottomX,$Y,DIRECTION_VERTICAL,$GradientSettings);
+                    $this->drawGradientArea($TopX,$LastY,$BottomX,$Y,DIRECTION_VERTICAL,$GradientSettings);
                 }
-               elseif ( !$ShadedSlopeBox || $LastColor == NULL ) 
+                elseif ( !$ShadedSlopeBox || $LastColor == NULL ) 
                 $this->drawFilledRectangle($TopX,floor($LastY),$BottomX,floor($Y),$Color);
 
-               $LastColor = $Color;
-              }
+                $LastColor = $Color;
+                }
 
-             if ( $X == VOID )
-              { $LastX = NULL; }
-             else
-              { $LastX = $X; $LastY = $Y; }
+                if ( $X == VOID )
+                { $LastX = NULL; }
+                else
+                { $LastX = $X; $LastY = $Y; }
 
-             $Y = $Y + $XStep;
+                $Y = $Y + $XStep;
             }
 
-           $XPos = $XPos + $CaptionHeight + $SerieSpacing;
-          }
+            $XPos = $XPos + $CaptionHeight + $SerieSpacing;
+            }
 
-         $this->Shadow = $RestoreShadow;
+            $this->Shadow = $RestoreShadow;
+        }
         }
-      }
     }
 
-   /* Draw the line of best fit */
-   function drawBestFit($Format="")
+    /* Draw the line of best fit */
+    function drawBestFit($Format="")
     {
-     $OverrideTicks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $OverrideR		= isset($Format["R"]) ? $Format["R"] : VOID;
-     $OverrideG		= isset($Format["G"]) ? $Format["G"] : VOID;
-     $OverrideB		= isset($Format["B"]) ? $Format["B"] : VOID;
-     $OverrideAlpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : VOID;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         if ( $OverrideR != VOID && $OverrideG != VOID && $OverrideB != VOID ) { $R = $OverrideR; $G = $OverrideG; $B = $OverrideB; } else { $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; }
-         if ( $OverrideTicks == NULL ) { $Ticks = $Serie["Ticks"]; } else { $Ticks = $OverrideTicks; }
-         if ( $OverrideAlpha == VOID ) { $Alpha = $Serie["Color"]["Alpha"]; } else { $Alpha = $OverrideAlpha; }
-
-         $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks);
-
-         $AxisID   = $Serie["Axis"];
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $Y != VOID )
-              {
-               $Sxy = $Sxy + $X*$Y;
-               $Sx  = $Sx + $X;
-               $Sy  = $Sy + $Y;
-               $Sxx = $Sxx + $X*$X;
-              }
-
-             $X = $X + $XStep;
-            }
-           $n = count($this->DataSet->stripVOID($PosArray)); //$n = count($PosArray);
-           $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
-           $B = (($Sy)-($M*$Sx))/($n);
-
-           $X1 = $this->GraphAreaX1 + $XMargin;
-           $Y1 = $M * $X1 + $B;
-           $X2 = $this->GraphAreaX2 - $XMargin;
-           $Y2 = $M * $X2 + $B;
-
-           if ( $Y1 < $this->GraphAreaY1 ) { $X1 = $X1 + ($this->GraphAreaY1-$Y1); $Y1 = $this->GraphAreaY1; }
-           if ( $Y1 > $this->GraphAreaY2 ) { $X1 = $X1 + ($Y1-$this->GraphAreaY2); $Y1 = $this->GraphAreaY2; }
-           if ( $Y2 < $this->GraphAreaY1 ) { $X2 = $X2 - ($this->GraphAreaY1-$Y2); $Y2 = $this->GraphAreaY1; }
-           if ( $Y2 > $this->GraphAreaY2 ) { $X2 = $X2 - ($Y2-$this->GraphAreaY2); $Y2 = $this->GraphAreaY2; }
-
-           $this->drawLine($X1,$Y1,$X2,$Y2,$Color);
-          }
-         else
-          {
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y = $this->GraphAreaY1 + $XMargin;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
-           foreach($PosArray as $Key => $X)
-            {
-             if ( $X != VOID )
-              {
-               $Sxy = $Sxy + $X*$Y;
-               $Sx  = $Sx + $Y;
-               $Sy  = $Sy + $X;
-               $Sxx = $Sxx + $Y*$Y;
-              }
-
-             $Y = $Y + $YStep;
-            }
-           $n = count($this->DataSet->stripVOID($PosArray)); //$n = count($PosArray);
-           $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
-           $B = (($Sy)-($M*$Sx))/($n);
-
-           $Y1 = $this->GraphAreaY1 + $XMargin;
-           $X1 = $M * $Y1 + $B;
-           $Y2 = $this->GraphAreaY2 - $XMargin;
-           $X2 = $M * $Y2 + $B;
-
-           if ( $X1 < $this->GraphAreaX1 ) { $Y1 = $Y1 + ($this->GraphAreaX1-$X1); $X1 = $this->GraphAreaX1; }
-           if ( $X1 > $this->GraphAreaX2 ) { $Y1 = $Y1 + ($X1-$this->GraphAreaX2); $X1 = $this->GraphAreaX2; }
-           if ( $X2 < $this->GraphAreaX1 ) { $Y2 = $Y2 - ($this->GraphAreaY1-$X2); $X2 = $this->GraphAreaX1; }
-           if ( $X2 > $this->GraphAreaX2 ) { $Y2 = $Y2 - ($X2-$this->GraphAreaX2); $X2 = $this->GraphAreaX2; }
-
-           $this->drawLine($X1,$Y1,$X2,$Y2,$Color);
-          }
-        }
-      }
+        $OverrideTicks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $OverrideR		= isset($Format["R"]) ? $Format["R"] : VOID;
+        $OverrideG		= isset($Format["G"]) ? $Format["G"] : VOID;
+        $OverrideB		= isset($Format["B"]) ? $Format["B"] : VOID;
+        $OverrideAlpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : VOID;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            if ( $OverrideR != VOID && $OverrideG != VOID && $OverrideB != VOID ) { $R = $OverrideR; $G = $OverrideG; $B = $OverrideB; } else { $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; }
+            if ( $OverrideTicks == NULL ) { $Ticks = $Serie["Ticks"]; } else { $Ticks = $OverrideTicks; }
+            if ( $OverrideAlpha == VOID ) { $Alpha = $Serie["Color"]["Alpha"]; } else { $Alpha = $OverrideAlpha; }
+
+            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks);
+
+            $AxisID   = $Serie["Axis"];
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin;
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $Y != VOID )
+                {
+                $Sxy = $Sxy + $X*$Y;
+                $Sx  = $Sx + $X;
+                $Sy  = $Sy + $Y;
+                $Sxx = $Sxx + $X*$X;
+                }
+
+                $X = $X + $XStep;
+            }
+            $n = count($this->DataSet->stripVOID($PosArray)); //$n = count($PosArray);
+            $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
+            $B = (($Sy)-($M*$Sx))/($n);
+
+            $X1 = $this->GraphAreaX1 + $XMargin;
+            $Y1 = $M * $X1 + $B;
+            $X2 = $this->GraphAreaX2 - $XMargin;
+            $Y2 = $M * $X2 + $B;
+
+            if ( $Y1 < $this->GraphAreaY1 ) { $X1 = $X1 + ($this->GraphAreaY1-$Y1); $Y1 = $this->GraphAreaY1; }
+            if ( $Y1 > $this->GraphAreaY2 ) { $X1 = $X1 + ($Y1-$this->GraphAreaY2); $Y1 = $this->GraphAreaY2; }
+            if ( $Y2 < $this->GraphAreaY1 ) { $X2 = $X2 - ($this->GraphAreaY1-$Y2); $Y2 = $this->GraphAreaY1; }
+            if ( $Y2 > $this->GraphAreaY2 ) { $X2 = $X2 - ($Y2-$this->GraphAreaY2); $Y2 = $this->GraphAreaY2; }
+
+            $this->drawLine($X1,$Y1,$X2,$Y2,$Color);
+            }
+            else
+            {
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin;
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
+            foreach($PosArray as $Key => $X)
+            {
+                if ( $X != VOID )
+                {
+                $Sxy = $Sxy + $X*$Y;
+                $Sx  = $Sx + $Y;
+                $Sy  = $Sy + $X;
+                $Sxx = $Sxx + $Y*$Y;
+                }
+
+                $Y = $Y + $YStep;
+            }
+            $n = count($this->DataSet->stripVOID($PosArray)); //$n = count($PosArray);
+            $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
+            $B = (($Sy)-($M*$Sx))/($n);
+
+            $Y1 = $this->GraphAreaY1 + $XMargin;
+            $X1 = $M * $Y1 + $B;
+            $Y2 = $this->GraphAreaY2 - $XMargin;
+            $X2 = $M * $Y2 + $B;
+
+            if ( $X1 < $this->GraphAreaX1 ) { $Y1 = $Y1 + ($this->GraphAreaX1-$X1); $X1 = $this->GraphAreaX1; }
+            if ( $X1 > $this->GraphAreaX2 ) { $Y1 = $Y1 + ($X1-$this->GraphAreaX2); $X1 = $this->GraphAreaX2; }
+            if ( $X2 < $this->GraphAreaX1 ) { $Y2 = $Y2 - ($this->GraphAreaY1-$X2); $X2 = $this->GraphAreaX1; }
+            if ( $X2 > $this->GraphAreaX2 ) { $Y2 = $Y2 - ($X2-$this->GraphAreaX2); $X2 = $this->GraphAreaX2; }
+
+            $this->drawLine($X1,$Y1,$X2,$Y2,$Color);
+            }
+        }
+        }
     }
 
-   /* Write labels */
-   function writeLabel($SeriesName,$Indexes,$Format="")
+    /* Write labels */
+    function writeLabel($SeriesName,$Indexes,$Format="")
     {
-     $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
-     $ForceLabels	= isset($Format["ForceLabels"]) ? $Format["ForceLabels"] : NULL;
-     $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
-     $DrawVerticalLine	= isset($Format["DrawVerticalLine"]) ? $Format["DrawVerticalLine"] : FALSE;
-     $VerticalLineR	= isset($Format["VerticalLineR"]) ? $Format["VerticalLineR"] : 0;
-     $VerticalLineG	= isset($Format["VerticalLineG"]) ? $Format["VerticalLineG"] : 0;
-     $VerticalLineB	= isset($Format["VerticalLineB"]) ? $Format["VerticalLineB"] : 0;
-     $VerticalLineAlpha	= isset($Format["VerticalLineAlpha"]) ? $Format["VerticalLineAlpha"] : 40;
-     $VerticalLineTicks	= isset($Format["VerticalLineTicks"]) ? $Format["VerticalLineTicks"] : 2;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     if ( !is_array($Indexes) )    { $Index = $Indexes; $Indexes = ""; $Indexes[] = $Index; }
-     if ( !is_array($SeriesName) ) { $SerieName = $SeriesName; $SeriesName = ""; $SeriesName[] = $SerieName; }
-     if ( $ForceLabels != NULL && !is_array($ForceLabels) ) { $ForceLabel = $ForceLabels; $ForceLabels = ""; $ForceLabels[] = $ForceLabel; }
-
-     foreach ($Indexes as $Key => $Index)
-      {
-       $Series = "";
-
-       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-        {
-         if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-         $X = $this->GraphAreaX1 + $XMargin + $Index * $XStep;
-
-         if ( $DrawVerticalLine ) { $this->drawLine($X,$this->GraphAreaY1+$Data["YMargin"],$X,$this->GraphAreaY2-$Data["YMargin"],array("R"=>$VerticalLineR,"G"=>$VerticalLineG,"B"=>$VerticalLineB,"Alpha"=>$VerticalLineAlpha,"Ticks"=>$VerticalLineTicks)); }
-
-         $MinY = $this->GraphAreaY2;
-         foreach ($SeriesName as $iKey => $SerieName)
-          {
-           if ( isset($Data["Series"][$SerieName]["Data"][$Index]) )
-            {
-             $AxisID      = $Data["Series"][$SerieName]["Axis"];
-
-             if ( $OverrideTitle != NULL)
-              $Description = $OverrideTitle;
-             elseif ( count($SeriesName) == 1 )
-              {
-               if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+        $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
+        $ForceLabels	= isset($Format["ForceLabels"]) ? $Format["ForceLabels"] : NULL;
+        $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
+        $DrawVerticalLine	= isset($Format["DrawVerticalLine"]) ? $Format["DrawVerticalLine"] : FALSE;
+        $VerticalLineR	= isset($Format["VerticalLineR"]) ? $Format["VerticalLineR"] : 0;
+        $VerticalLineG	= isset($Format["VerticalLineG"]) ? $Format["VerticalLineG"] : 0;
+        $VerticalLineB	= isset($Format["VerticalLineB"]) ? $Format["VerticalLineB"] : 0;
+        $VerticalLineAlpha	= isset($Format["VerticalLineAlpha"]) ? $Format["VerticalLineAlpha"] : 40;
+        $VerticalLineTicks	= isset($Format["VerticalLineTicks"]) ? $Format["VerticalLineTicks"] : 2;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        if ( !is_array($Indexes) )    { $Index = $Indexes; $Indexes = ""; $Indexes[] = $Index; }
+        if ( !is_array($SeriesName) ) { $SerieName = $SeriesName; $SeriesName = ""; $SeriesName[] = $SerieName; }
+        if ( $ForceLabels != NULL && !is_array($ForceLabels) ) { $ForceLabel = $ForceLabels; $ForceLabels = ""; $ForceLabels[] = $ForceLabel; }
+
+        foreach ($Indexes as $Key => $Index)
+        {
+        $Series = "";
+
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin + $Index * $XStep;
+
+            if ( $DrawVerticalLine ) { $this->drawLine($X,$this->GraphAreaY1+$Data["YMargin"],$X,$this->GraphAreaY2-$Data["YMargin"],array("R"=>$VerticalLineR,"G"=>$VerticalLineG,"B"=>$VerticalLineB,"Alpha"=>$VerticalLineAlpha,"Ticks"=>$VerticalLineTicks)); }
+
+            $MinY = $this->GraphAreaY2;
+            foreach ($SeriesName as $iKey => $SerieName)
+            {
+            if ( isset($Data["Series"][$SerieName]["Data"][$Index]) )
+            {
+                $AxisID      = $Data["Series"][$SerieName]["Axis"];
+
+                if ( $OverrideTitle != NULL)
+                $Description = $OverrideTitle;
+                elseif ( count($SeriesName) == 1 )
+                {
+                if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
                 $Description = $Data["Series"][$SerieName]["Description"]." - ".$Data["Series"][$Data["Abscissa"]]["Data"][$Index];
-               else
+                else
                 $Description = $Data["Series"][$SerieName]["Description"];
-              }
-             elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
-              $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
-
-             $AxisMode     = $Data["Axis"][$AxisID]["Display"];
-             $AxisFormat   = $Data["Axis"][$AxisID]["Format"];
-             $AxisUnit     = $Data["Axis"][$AxisID]["Unit"];
-
-             $Serie = "";
-             $Serie["R"] = $Data["Series"][$SerieName]["Color"]["R"];
-             $Serie["G"] = $Data["Series"][$SerieName]["Color"]["G"];
-             $Serie["B"] = $Data["Series"][$SerieName]["Color"]["B"];
-             $Serie["Alpha"] = $Data["Series"][$SerieName]["Color"]["Alpha"];
-
-             if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) )
-              $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
-             else
-              $SerieOffset = 0;
-
-             $Value = $Data["Series"][$SerieName]["Data"][$Index];
-             if ( $Value == VOID ) { $Value = "NaN"; }
-
-             if ( $ForceLabels != NULL )
-              $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
-             else
-              $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
-
-             if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
-              {
-               if ( $Value >=0 ) { $LookFor = "+"; } else { $LookFor = "-"; }
-
-               $Value = 0; $Done = FALSE;
-               foreach($Data["Series"] as $Name => $SerieLookup)
+                }
+                elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+                $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+
+                $AxisMode     = $Data["Axis"][$AxisID]["Display"];
+                $AxisFormat   = $Data["Axis"][$AxisID]["Format"];
+                $AxisUnit     = $Data["Axis"][$AxisID]["Unit"];
+
+                $Serie = "";
+                $Serie["R"] = $Data["Series"][$SerieName]["Color"]["R"];
+                $Serie["G"] = $Data["Series"][$SerieName]["Color"]["G"];
+                $Serie["B"] = $Data["Series"][$SerieName]["Color"]["B"];
+                $Serie["Alpha"] = $Data["Series"][$SerieName]["Color"]["Alpha"];
+
+                if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) )
+                $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
+                else
+                $SerieOffset = 0;
+
+                $Value = $Data["Series"][$SerieName]["Data"][$Index];
+                if ( $Value == VOID ) { $Value = "NaN"; }
+
+                if ( $ForceLabels != NULL )
+                $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
+                else
+                $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+
+                if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
+                {
+                if ( $Value >=0 ) { $LookFor = "+"; } else { $LookFor = "-"; }
+
+                $Value = 0; $Done = FALSE;
+                foreach($Data["Series"] as $Name => $SerieLookup)
                 {
-                 if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done )
-                  {
-                   if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID )
+                    if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done )
+                    {
+                    if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID )
                     {
-                     if ($Data["Series"][$Name]["Data"][$Index] >= 0 && $LookFor == "+" ) { $Value = $Value + $Data["Series"][$Name]["Data"][$Index]; }
-                     if ($Data["Series"][$Name]["Data"][$Index] < 0 && $LookFor == "-" )  { $Value = $Value - $Data["Series"][$Name]["Data"][$Index]; }
-                     if ($Name == $SerieName ) { $Done = TRUE; }
+                        if ($Data["Series"][$Name]["Data"][$Index] >= 0 && $LookFor == "+" ) { $Value = $Value + $Data["Series"][$Name]["Data"][$Index]; }
+                        if ($Data["Series"][$Name]["Data"][$Index] < 0 && $LookFor == "-" )  { $Value = $Value - $Data["Series"][$Name]["Data"][$Index]; }
+                        if ($Name == $SerieName ) { $Done = TRUE; }
                     }
-                  }
+                    }
+                }
                 }
-              }
 
-             $X = floor($this->GraphAreaX1 + $XMargin + $Index * $XStep + $SerieOffset);
-             $Y = floor($this->scaleComputeY($Value,array("AxisID"=>$AxisID)));
+                $X = floor($this->GraphAreaX1 + $XMargin + $Index * $XStep + $SerieOffset);
+                $Y = floor($this->scaleComputeY($Value,array("AxisID"=>$AxisID)));
 
-             if ($Y < $MinY) { $MinY = $Y; }
+                if ($Y < $MinY) { $MinY = $Y; }
 
-             if ( $DrawPoint == LABEL_POINT_CIRCLE )
-              $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
-             elseif ( $DrawPoint == LABEL_POINT_BOX )
-              $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+                if ( $DrawPoint == LABEL_POINT_CIRCLE )
+                $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+                elseif ( $DrawPoint == LABEL_POINT_BOX )
+                $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
 
-             $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
+                $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
             }
-          }
-         $this->drawLabelBox($X,$MinY-3,$Description,$Series,$Format);
+            }
+            $this->drawLabelBox($X,$MinY-3,$Description,$Series,$Format);
 
         }
-       else
+        else
         {
-         if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-         $Y = $this->GraphAreaY1 + $XMargin + $Index * $XStep;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin + $Index * $XStep;
 
-         if ( $DrawVerticalLine ) { $this->drawLine($this->GraphAreaX1+$Data["YMargin"],$Y,$this->GraphAreaX2-$Data["YMargin"],$Y,array("R"=>$VerticalLineR,"G"=>$VerticalLineG,"B"=>$VerticalLineB,"Alpha"=>$VerticalLineAlpha,"Ticks"=>$VerticalLineTicks)); }
+            if ( $DrawVerticalLine ) { $this->drawLine($this->GraphAreaX1+$Data["YMargin"],$Y,$this->GraphAreaX2-$Data["YMargin"],$Y,array("R"=>$VerticalLineR,"G"=>$VerticalLineG,"B"=>$VerticalLineB,"Alpha"=>$VerticalLineAlpha,"Ticks"=>$VerticalLineTicks)); }
 
-         $MinX = $this->GraphAreaX2;
-         foreach ($SeriesName as $Key => $SerieName)
-          {
-           if ( isset($Data["Series"][$SerieName]["Data"][$Index]) )
+            $MinX = $this->GraphAreaX2;
+            foreach ($SeriesName as $Key => $SerieName)
+            {
+            if ( isset($Data["Series"][$SerieName]["Data"][$Index]) )
             {
-             $AxisID      = $Data["Series"][$SerieName]["Axis"];
+                $AxisID      = $Data["Series"][$SerieName]["Axis"];
 
-             if ( $OverrideTitle != NULL)
-              $Description = $OverrideTitle;
-             elseif ( count($SeriesName) == 1 )
-              {
-               if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+                if ( $OverrideTitle != NULL)
+                $Description = $OverrideTitle;
+                elseif ( count($SeriesName) == 1 )
+                {
+                if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
                 $Description = $Data["Series"][$SerieName]["Description"]." - ".$Data["Series"][$Data["Abscissa"]]["Data"][$Index];
-               else
+                else
                 $Description = $Data["Series"][$SerieName]["Description"];
-              }
-             elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
-              $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
-
-             $AxisMode     = $Data["Axis"][$AxisID]["Display"];
-             $AxisFormat   = $Data["Axis"][$AxisID]["Format"];
-             $AxisUnit     = $Data["Axis"][$AxisID]["Unit"];
-
-             $Serie = "";
-             if ( isset($Data["Extended"]["Palette"][$Index] ) )
-              {
-               $Serie["R"] = $Data["Extended"]["Palette"][$Index]["R"];
-               $Serie["G"] = $Data["Extended"]["Palette"][$Index]["G"];
-               $Serie["B"] = $Data["Extended"]["Palette"][$Index]["B"];
-               $Serie["Alpha"] = $Data["Extended"]["Palette"][$Index]["Alpha"];
-              }
-             else
-              {
-               $Serie["R"] = $Data["Series"][$SerieName]["Color"]["R"];
-               $Serie["G"] = $Data["Series"][$SerieName]["Color"]["G"];
-               $Serie["B"] = $Data["Series"][$SerieName]["Color"]["B"];
-               $Serie["Alpha"] = $Data["Series"][$SerieName]["Color"]["Alpha"];
-              }
-
-             if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) )
-              $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
-             else
-              $SerieOffset = 0;
-
-             $Value = $Data["Series"][$SerieName]["Data"][$Index];
-             if ( $ForceLabels != NULL )
-              $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
-             else
-              $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
-             if ( $Value == VOID ) { $Value = "NaN"; }
-
-             if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
-              {
-               if ( $Value >=0 ) { $LookFor = "+"; } else { $LookFor = "-"; }
-
-               $Value = 0; $Done = FALSE;
-               foreach($Data["Series"] as $Name => $SerieLookup)
+                }
+                elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+                $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+
+                $AxisMode     = $Data["Axis"][$AxisID]["Display"];
+                $AxisFormat   = $Data["Axis"][$AxisID]["Format"];
+                $AxisUnit     = $Data["Axis"][$AxisID]["Unit"];
+
+                $Serie = "";
+                if ( isset($Data["Extended"]["Palette"][$Index] ) )
+                {
+                $Serie["R"] = $Data["Extended"]["Palette"][$Index]["R"];
+                $Serie["G"] = $Data["Extended"]["Palette"][$Index]["G"];
+                $Serie["B"] = $Data["Extended"]["Palette"][$Index]["B"];
+                $Serie["Alpha"] = $Data["Extended"]["Palette"][$Index]["Alpha"];
+                }
+                else
+                {
+                $Serie["R"] = $Data["Series"][$SerieName]["Color"]["R"];
+                $Serie["G"] = $Data["Series"][$SerieName]["Color"]["G"];
+                $Serie["B"] = $Data["Series"][$SerieName]["Color"]["B"];
+                $Serie["Alpha"] = $Data["Series"][$SerieName]["Color"]["Alpha"];
+                }
+
+                if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) )
+                $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
+                else
+                $SerieOffset = 0;
+
+                $Value = $Data["Series"][$SerieName]["Data"][$Index];
+                if ( $ForceLabels != NULL )
+                $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
+                else
+                $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+                if ( $Value == VOID ) { $Value = "NaN"; }
+
+                if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
+                {
+                if ( $Value >=0 ) { $LookFor = "+"; } else { $LookFor = "-"; }
+
+                $Value = 0; $Done = FALSE;
+                foreach($Data["Series"] as $Name => $SerieLookup)
                 {
-                 if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done )
-                  {
-                   if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID )
+                    if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done )
+                    {
+                    if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID )
                     {
-                     if ($Data["Series"][$Name]["Data"][$Index] >= 0 && $LookFor == "+" ) { $Value = $Value + $Data["Series"][$Name]["Data"][$Index]; }
-                     if ($Data["Series"][$Name]["Data"][$Index] < 0 && $LookFor == "-" )  { $Value = $Value - $Data["Series"][$Name]["Data"][$Index]; }
-                     if ($Name == $SerieName ) { $Done = TRUE; }
+                        if ($Data["Series"][$Name]["Data"][$Index] >= 0 && $LookFor == "+" ) { $Value = $Value + $Data["Series"][$Name]["Data"][$Index]; }
+                        if ($Data["Series"][$Name]["Data"][$Index] < 0 && $LookFor == "-" )  { $Value = $Value - $Data["Series"][$Name]["Data"][$Index]; }
+                        if ($Name == $SerieName ) { $Done = TRUE; }
                     }
-                  }
+                    }
+                }
                 }
-              }
 
-             $X = floor($this->scaleComputeY($Value,array("AxisID"=>$AxisID)));
-             $Y = floor($this->GraphAreaY1 + $XMargin + $Index * $XStep + $SerieOffset);
+                $X = floor($this->scaleComputeY($Value,array("AxisID"=>$AxisID)));
+                $Y = floor($this->GraphAreaY1 + $XMargin + $Index * $XStep + $SerieOffset);
 
-             if ($X < $MinX) { $MinX = $X; }
+                if ($X < $MinX) { $MinX = $X; }
 
-             if ( $DrawPoint == LABEL_POINT_CIRCLE )
-              $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
-             elseif ( $DrawPoint == LABEL_POINT_BOX )
-              $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+                if ( $DrawPoint == LABEL_POINT_CIRCLE )
+                $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+                elseif ( $DrawPoint == LABEL_POINT_BOX )
+                $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
 
-             $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
+                $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
             }
-          }
-         $this->drawLabelBox($MinX,$Y-3,$Description,$Series,$Format);
+            }
+            $this->drawLabelBox($MinX,$Y-3,$Description,$Series,$Format);
 
         }
-      }
+        }
     }
 
-   /* Draw a label box */
-   function drawLabelBox($X,$Y,$Title,$Captions,$Format="")
+    /* Draw a label box */
+    function drawLabelBox($X,$Y,$Title,$Captions,$Format="")
     {
-     $NoTitle		= isset($Format["NoTitle"]) ? $Format["NoTitle"] : NULL;
-     $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 50;
-     $DrawSerieColor	= isset($Format["DrawSerieColor"]) ? $Format["DrawSerieColor"] : TRUE;
-     $SerieR		= isset($Format["SerieR"]) ? $Format["SerieR"] : NULL;
-     $SerieG		= isset($Format["SerieG"]) ? $Format["SerieG"] : NULL;
-     $SerieB		= isset($Format["SerieB"]) ? $Format["SerieB"] : NULL;
-     $SerieAlpha	= isset($Format["SerieAlpha"]) ? $Format["SerieAlpha"] : NULL;
-     $SerieBoxSize	= isset($Format["SerieBoxSize"]) ? $Format["SerieBoxSize"] : 6;
-     $SerieBoxSpacing	= isset($Format["SerieBoxSpacing"]) ? $Format["SerieBoxSpacing"] : 4;
-     $VerticalMargin	= isset($Format["VerticalMargin"]) ? $Format["VerticalMargin"] : 10;
-     $HorizontalMargin	= isset($Format["HorizontalMargin"]) ? $Format["HorizontalMargin"] : 8;
-     $R			= isset($Format["R"]) ? $Format["R"] : $this->FontColorR;
-     $G			= isset($Format["G"]) ? $Format["G"] : $this->FontColorG;
-     $B			= isset($Format["B"]) ? $Format["B"] : $this->FontColorB;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->FontColorA;
-     $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
-     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
-     $TitleMode		= isset($Format["TitleMode"]) ? $Format["TitleMode"] : LABEL_TITLE_NOBACKGROUND;
-     $TitleR		= isset($Format["TitleR"]) ? $Format["TitleR"] : $R;
-     $TitleG		= isset($Format["TitleG"]) ? $Format["TitleG"] : $G;
-     $TitleB		= isset($Format["TitleB"]) ? $Format["TitleB"] : $B;
-     $TitleBackgroundR	= isset($Format["TitleBackgroundR"]) ? $Format["TitleBackgroundR"] : 0;
-     $TitleBackgroundG	= isset($Format["TitleBackgroundG"]) ? $Format["TitleBackgroundG"] : 0;
-     $TitleBackgroundB	= isset($Format["TitleBackgroundB"]) ? $Format["TitleBackgroundB"] : 0;
-     $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
-     $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
-     $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
-     $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 220;
-     $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 220;
-     $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 220;
-
-     if ( !$DrawSerieColor ) { $SerieBoxSize = 0; $SerieBoxSpacing = 0; }
-
-     $TxtPos      = $this->getTextBox($X,$Y,$FontName,$FontSize,0,$Title);
-     $TitleWidth  = ($TxtPos[1]["X"] - $TxtPos[0]["X"])+$VerticalMargin*2;
-     $TitleHeight = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]);
-
-     if ( $NoTitle ) { $TitleWidth = 0; $TitleHeight = 0; }
-
-     $CaptionWidth = 0; $CaptionHeight = -$HorizontalMargin;
-     foreach($Captions as $Key =>$Caption)
-      {
-       $TxtPos        = $this->getTextBox($X,$Y,$FontName,$FontSize,0,$Caption["Caption"]);
-       $CaptionWidth  = max($CaptionWidth,($TxtPos[1]["X"] - $TxtPos[0]["X"])+$VerticalMargin*2);
-       $CaptionHeight = $CaptionHeight + max(($TxtPos[0]["Y"] - $TxtPos[2]["Y"]),($SerieBoxSize+2)) + $HorizontalMargin;
-      }
-
-     if ( $CaptionHeight <= 5 ) { $CaptionHeight = $CaptionHeight + $HorizontalMargin/2; }
-
-     if ( $DrawSerieColor ) { $CaptionWidth = $CaptionWidth + $SerieBoxSize + $SerieBoxSpacing; }
-
-     $BoxWidth = max($BoxWidth,$TitleWidth,$CaptionWidth);
-
-     $XMin = $X - 5 - floor(($BoxWidth-10) / 2);
-     $XMax = $X + 5 + floor(($BoxWidth-10) / 2);
-
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow == TRUE )
-      {
-       $this->Shadow = FALSE;
-
-       $Poly = "";
-       $Poly[] = $X+$this->ShadowX; $Poly[] = $Y+$this->ShadowX;
-       $Poly[] = $X+5+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
-       $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
-
-       if ( $NoTitle )
-        {
-         $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
-         $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
-        }
-       else
-        {
-         $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
-         $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
-        }
-
-       $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
-       $Poly[] = $X-5+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
-       $this->drawPolygon($Poly,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
-      }
-
-     /* Draw the background */
-     $GradientSettings = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB);
-     if ( $NoTitle )
-      $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
-     else
-      $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
-     $Poly = ""; $Poly[] = $X; $Poly[] = $Y; $Poly[] = $X-5; $Poly[] = $Y-5; $Poly[] = $X+5; $Poly[] = $Y-5;
-     $this->drawPolygon($Poly,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB,"NoBorder"=>TRUE));
-
-     /* Outer border */
-     $OuterBorderColor = $this->allocateColor($this->Picture,100,100,100,100);
-     imageline($this->Picture,$XMin,$Y-5,$X-5,$Y-5,$OuterBorderColor);
-     imageline($this->Picture,$X,$Y,$X-5,$Y-5,$OuterBorderColor);
-     imageline($this->Picture,$X,$Y,$X+5,$Y-5,$OuterBorderColor);
-     imageline($this->Picture,$X+5,$Y-5,$XMax,$Y-5,$OuterBorderColor);
-     if ( $NoTitle )
-      {
-       imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin,$Y-5,$OuterBorderColor);
-       imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5,$OuterBorderColor);
-       imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$OuterBorderColor);
-      }
-     else
-      {
-       imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin,$Y-5,$OuterBorderColor);
-       imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5,$OuterBorderColor);
-       imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$OuterBorderColor);
-      }
-
-     /* Inner border */
-     $InnerBorderColor = $this->allocateColor($this->Picture,255,255,255,100);
-     imageline($this->Picture,$XMin+1,$Y-6,$X-5,$Y-6,$InnerBorderColor);
-     imageline($this->Picture,$X,$Y-1,$X-5,$Y-6,$InnerBorderColor);
-     imageline($this->Picture,$X,$Y-1,$X+5,$Y-6,$InnerBorderColor);
-     imageline($this->Picture,$X+5,$Y-6,$XMax-1,$Y-6,$InnerBorderColor);
-     if ( $NoTitle )
-      {
-       imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin+1,$Y-6,$InnerBorderColor);
-       imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-6,$InnerBorderColor);
-       imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$InnerBorderColor);
-      }
-     else
-      {
-       imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin+1,$Y-6,$InnerBorderColor);
-       imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-6,$InnerBorderColor);
-       imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$InnerBorderColor);
-      }
-
-     /* Draw the separator line */
-     if ( $TitleMode == LABEL_TITLE_NOBACKGROUND && !$NoTitle )
-      {
-       $YPos    = $Y-7-$CaptionHeight-$HorizontalMargin-$HorizontalMargin/2;
-       $XMargin = $VerticalMargin / 2;
-       $this->drawLine($XMin+$XMargin,$YPos+1,$XMax-$XMargin,$YPos+1,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB));
-       $this->drawLine($XMin+$XMargin,$YPos,$XMax-$XMargin,$YPos,array("R"=>$GradientStartR,"G"=>$GradientStartG,"B"=>$GradientStartB));
-      }
-     elseif ( $TitleMode == LABEL_TITLE_BACKGROUND )
-      {
-       $this->drawFilledRectangle($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2,array("R"=>$TitleBackgroundR,"G"=>$TitleBackgroundG,"B"=>$TitleBackgroundB));
-       imageline($this->Picture,$XMin+1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$XMax-1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$InnerBorderColor);
-      }
-
-     /* Write the description */
-     if ( !$NoTitle )
-      $this->drawText($XMin+$VerticalMargin,$Y-7-$CaptionHeight-$HorizontalMargin*2,$Title,array("Align"=>TEXT_ALIGN_BOTTOMLEFT,"R"=>$TitleR,"G"=>$TitleG,"B"=>$TitleB));
-
-     /* Write the value */
-     $YPos = $Y-5-$HorizontalMargin; $XPos = $XMin+$VerticalMargin+$SerieBoxSize+$SerieBoxSpacing;
-     foreach($Captions as $Key => $Caption)
-      {
-       $CaptionTxt    = $Caption["Caption"];
-       $TxtPos        = $this->getTextBox($XPos,$YPos,$FontName,$FontSize,0,$CaptionTxt);
-       $CaptionHeight = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]);
-
-       /* Write the serie color if needed */
-       if ( $DrawSerieColor )
-        {
-         $BoxSettings = array("R"=>$Caption["Format"]["R"],"G"=>$Caption["Format"]["G"],"B"=>$Caption["Format"]["B"],"Alpha"=>$Caption["Format"]["Alpha"],"BorderR"=>0,"BorderG"=>0,"BorderB"=>0);
-         $this->drawFilledRectangle($XMin+$VerticalMargin,$YPos-$SerieBoxSize,$XMin+$VerticalMargin+$SerieBoxSize,$YPos,$BoxSettings);
-        }
-
-       $this->drawText($XPos,$YPos,$CaptionTxt,array("Align"=>TEXT_ALIGN_BOTTOMLEFT));
-
-       $YPos = $YPos - $CaptionHeight - $HorizontalMargin;
-      }
-
-     $this->Shadow = $RestoreShadow;
+        $NoTitle		= isset($Format["NoTitle"]) ? $Format["NoTitle"] : NULL;
+        $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 50;
+        $DrawSerieColor	= isset($Format["DrawSerieColor"]) ? $Format["DrawSerieColor"] : TRUE;
+        $SerieR		= isset($Format["SerieR"]) ? $Format["SerieR"] : NULL;
+        $SerieG		= isset($Format["SerieG"]) ? $Format["SerieG"] : NULL;
+        $SerieB		= isset($Format["SerieB"]) ? $Format["SerieB"] : NULL;
+        $SerieAlpha	= isset($Format["SerieAlpha"]) ? $Format["SerieAlpha"] : NULL;
+        $SerieBoxSize	= isset($Format["SerieBoxSize"]) ? $Format["SerieBoxSize"] : 6;
+        $SerieBoxSpacing	= isset($Format["SerieBoxSpacing"]) ? $Format["SerieBoxSpacing"] : 4;
+        $VerticalMargin	= isset($Format["VerticalMargin"]) ? $Format["VerticalMargin"] : 10;
+        $HorizontalMargin	= isset($Format["HorizontalMargin"]) ? $Format["HorizontalMargin"] : 8;
+        $R			= isset($Format["R"]) ? $Format["R"] : $this->FontColorR;
+        $G			= isset($Format["G"]) ? $Format["G"] : $this->FontColorG;
+        $B			= isset($Format["B"]) ? $Format["B"] : $this->FontColorB;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->FontColorA;
+        $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+        $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+        $TitleMode		= isset($Format["TitleMode"]) ? $Format["TitleMode"] : LABEL_TITLE_NOBACKGROUND;
+        $TitleR		= isset($Format["TitleR"]) ? $Format["TitleR"] : $R;
+        $TitleG		= isset($Format["TitleG"]) ? $Format["TitleG"] : $G;
+        $TitleB		= isset($Format["TitleB"]) ? $Format["TitleB"] : $B;
+        $TitleBackgroundR	= isset($Format["TitleBackgroundR"]) ? $Format["TitleBackgroundR"] : 0;
+        $TitleBackgroundG	= isset($Format["TitleBackgroundG"]) ? $Format["TitleBackgroundG"] : 0;
+        $TitleBackgroundB	= isset($Format["TitleBackgroundB"]) ? $Format["TitleBackgroundB"] : 0;
+        $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
+        $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
+        $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
+        $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 220;
+        $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 220;
+        $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 220;
+
+        if ( !$DrawSerieColor ) { $SerieBoxSize = 0; $SerieBoxSpacing = 0; }
+
+        $TxtPos      = $this->getTextBox($X,$Y,$FontName,$FontSize,0,$Title);
+        $TitleWidth  = ($TxtPos[1]["X"] - $TxtPos[0]["X"])+$VerticalMargin*2;
+        $TitleHeight = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]);
+
+        if ( $NoTitle ) { $TitleWidth = 0; $TitleHeight = 0; }
+
+        $CaptionWidth = 0; $CaptionHeight = -$HorizontalMargin;
+        foreach($Captions as $Key =>$Caption)
+        {
+        $TxtPos        = $this->getTextBox($X,$Y,$FontName,$FontSize,0,$Caption["Caption"]);
+        $CaptionWidth  = max($CaptionWidth,($TxtPos[1]["X"] - $TxtPos[0]["X"])+$VerticalMargin*2);
+        $CaptionHeight = $CaptionHeight + max(($TxtPos[0]["Y"] - $TxtPos[2]["Y"]),($SerieBoxSize+2)) + $HorizontalMargin;
+        }
+
+        if ( $CaptionHeight <= 5 ) { $CaptionHeight = $CaptionHeight + $HorizontalMargin/2; }
+
+        if ( $DrawSerieColor ) { $CaptionWidth = $CaptionWidth + $SerieBoxSize + $SerieBoxSpacing; }
+
+        $BoxWidth = max($BoxWidth,$TitleWidth,$CaptionWidth);
+
+        $XMin = $X - 5 - floor(($BoxWidth-10) / 2);
+        $XMax = $X + 5 + floor(($BoxWidth-10) / 2);
+
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow == TRUE )
+        {
+        $this->Shadow = FALSE;
+
+        $Poly = "";
+        $Poly[] = $X+$this->ShadowX; $Poly[] = $Y+$this->ShadowX;
+        $Poly[] = $X+5+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
+        $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
+
+        if ( $NoTitle )
+        {
+            $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
+            $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
+        }
+        else
+        {
+            $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
+            $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
+        }
+
+        $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
+        $Poly[] = $X-5+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
+        $this->drawPolygon($Poly,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+        }
+
+        /* Draw the background */
+        $GradientSettings = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB);
+        if ( $NoTitle )
+        $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
+        else
+        $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
+        $Poly = ""; $Poly[] = $X; $Poly[] = $Y; $Poly[] = $X-5; $Poly[] = $Y-5; $Poly[] = $X+5; $Poly[] = $Y-5;
+        $this->drawPolygon($Poly,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB,"NoBorder"=>TRUE));
+
+        /* Outer border */
+        $OuterBorderColor = $this->allocateColor($this->Picture,100,100,100,100);
+        imageline($this->Picture,$XMin,$Y-5,$X-5,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$X,$Y,$X-5,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$X,$Y,$X+5,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$X+5,$Y-5,$XMax,$Y-5,$OuterBorderColor);
+        if ( $NoTitle )
+        {
+        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$OuterBorderColor);
+        }
+        else
+        {
+        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$OuterBorderColor);
+        }
+
+        /* Inner border */
+        $InnerBorderColor = $this->allocateColor($this->Picture,255,255,255,100);
+        imageline($this->Picture,$XMin+1,$Y-6,$X-5,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$X,$Y-1,$X-5,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$X,$Y-1,$X+5,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$X+5,$Y-6,$XMax-1,$Y-6,$InnerBorderColor);
+        if ( $NoTitle )
+        {
+        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin+1,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$InnerBorderColor);
+        }
+        else
+        {
+        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin+1,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$InnerBorderColor);
+        }
+
+        /* Draw the separator line */
+        if ( $TitleMode == LABEL_TITLE_NOBACKGROUND && !$NoTitle )
+        {
+        $YPos    = $Y-7-$CaptionHeight-$HorizontalMargin-$HorizontalMargin/2;
+        $XMargin = $VerticalMargin / 2;
+        $this->drawLine($XMin+$XMargin,$YPos+1,$XMax-$XMargin,$YPos+1,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB));
+        $this->drawLine($XMin+$XMargin,$YPos,$XMax-$XMargin,$YPos,array("R"=>$GradientStartR,"G"=>$GradientStartG,"B"=>$GradientStartB));
+        }
+        elseif ( $TitleMode == LABEL_TITLE_BACKGROUND )
+        {
+        $this->drawFilledRectangle($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2,array("R"=>$TitleBackgroundR,"G"=>$TitleBackgroundG,"B"=>$TitleBackgroundB));
+        imageline($this->Picture,$XMin+1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$XMax-1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$InnerBorderColor);
+        }
+
+        /* Write the description */
+        if ( !$NoTitle )
+        $this->drawText($XMin+$VerticalMargin,$Y-7-$CaptionHeight-$HorizontalMargin*2,$Title,array("Align"=>TEXT_ALIGN_BOTTOMLEFT,"R"=>$TitleR,"G"=>$TitleG,"B"=>$TitleB));
+
+        /* Write the value */
+        $YPos = $Y-5-$HorizontalMargin; $XPos = $XMin+$VerticalMargin+$SerieBoxSize+$SerieBoxSpacing;
+        foreach($Captions as $Key => $Caption)
+        {
+        $CaptionTxt    = $Caption["Caption"];
+        $TxtPos        = $this->getTextBox($XPos,$YPos,$FontName,$FontSize,0,$CaptionTxt);
+        $CaptionHeight = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]);
+
+        /* Write the serie color if needed */
+        if ( $DrawSerieColor )
+        {
+            $BoxSettings = array("R"=>$Caption["Format"]["R"],"G"=>$Caption["Format"]["G"],"B"=>$Caption["Format"]["B"],"Alpha"=>$Caption["Format"]["Alpha"],"BorderR"=>0,"BorderG"=>0,"BorderB"=>0);
+            $this->drawFilledRectangle($XMin+$VerticalMargin,$YPos-$SerieBoxSize,$XMin+$VerticalMargin+$SerieBoxSize,$YPos,$BoxSettings);
+        }
+
+        $this->drawText($XPos,$YPos,$CaptionTxt,array("Align"=>TEXT_ALIGN_BOTTOMLEFT));
+
+        $YPos = $YPos - $CaptionHeight - $HorizontalMargin;
+        }
+
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Draw a basic shape */
-   function drawShape($X,$Y,$Shape,$PlotSize,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha)
+    /* Draw a basic shape */
+    function drawShape($X,$Y,$Shape,$PlotSize,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha)
     {
-     if ( $Shape == SERIE_SHAPE_FILLEDCIRCLE )
-      {
-       if ( $PlotBorder ) { $this->drawFilledCircle($X,$Y,$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
-       $this->drawFilledCircle($X,$Y,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_FILLEDSQUARE )
-      {
-       if ( $PlotBorder ) { $this->drawFilledRectangle($X-$PlotSize-$BorderSize,$Y-$PlotSize-$BorderSize,$X+$PlotSize+$BorderSize,$Y+$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
-       $this->drawFilledRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_FILLEDTRIANGLE )
-      {
-       if ( $PlotBorder )
-        {
-         $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize-$BorderSize; $Pos[]=$X-$PlotSize-$BorderSize; $Pos[]=$Y+$PlotSize+$BorderSize; $Pos[]=$X+$PlotSize+$BorderSize; $Pos[]=$Y+$PlotSize+$BorderSize;
-         $this->drawPolygon($Pos,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha));
-        }
-
-       $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X-$PlotSize; $Pos[]=$Y+$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y+$PlotSize;
-       $this->drawPolygon($Pos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_TRIANGLE )
-      {
-       $this->drawLine($X,$Y-$PlotSize,$X-$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-       $this->drawLine($X-$PlotSize,$Y+$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-       $this->drawLine($X+$PlotSize,$Y+$PlotSize,$X,$Y-$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_SQUARE )
-      $this->drawRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-     elseif ( $Shape == SERIE_SHAPE_CIRCLE )
-      $this->drawCircle($X,$Y,$PlotSize,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-     elseif ( $Shape == SERIE_SHAPE_DIAMOND )
-      {
-       $Pos = ""; $Pos[]=$X-$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize;
-       $this->drawPolygon($Pos,array("NoFill"=>TRUE,"BorderR"=>$R,"BorderG"=>$G,"BorderB"=>$B,"BorderAlpha"=>$Alpha));
-      }      
-     elseif ( $Shape == SERIE_SHAPE_FILLEDDIAMOND )
-      {
-       if ( $PlotBorder )
-        {
-         $Pos = ""; $Pos[]=$X-$PlotSize-$BorderSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize-$BorderSize; $Pos[]=$X+$PlotSize+$BorderSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize+$BorderSize;
-         $this->drawPolygon($Pos,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha));
-        }
-
-       $Pos = ""; $Pos[]=$X-$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize;
-       $this->drawPolygon($Pos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }      
+        if ( $Shape == SERIE_SHAPE_FILLEDCIRCLE )
+        {
+        if ( $PlotBorder ) { $this->drawFilledCircle($X,$Y,$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
+        $this->drawFilledCircle($X,$Y,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        }
+        elseif ( $Shape == SERIE_SHAPE_FILLEDSQUARE )
+        {
+        if ( $PlotBorder ) { $this->drawFilledRectangle($X-$PlotSize-$BorderSize,$Y-$PlotSize-$BorderSize,$X+$PlotSize+$BorderSize,$Y+$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
+        $this->drawFilledRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        }
+        elseif ( $Shape == SERIE_SHAPE_FILLEDTRIANGLE )
+        {
+        if ( $PlotBorder )
+        {
+            $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize-$BorderSize; $Pos[]=$X-$PlotSize-$BorderSize; $Pos[]=$Y+$PlotSize+$BorderSize; $Pos[]=$X+$PlotSize+$BorderSize; $Pos[]=$Y+$PlotSize+$BorderSize;
+            $this->drawPolygon($Pos,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha));
+        }
+
+        $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X-$PlotSize; $Pos[]=$Y+$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y+$PlotSize;
+        $this->drawPolygon($Pos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        }
+        elseif ( $Shape == SERIE_SHAPE_TRIANGLE )
+        {
+        $this->drawLine($X,$Y-$PlotSize,$X-$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        $this->drawLine($X-$PlotSize,$Y+$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        $this->drawLine($X+$PlotSize,$Y+$PlotSize,$X,$Y-$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        }
+        elseif ( $Shape == SERIE_SHAPE_SQUARE )
+        $this->drawRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        elseif ( $Shape == SERIE_SHAPE_CIRCLE )
+        $this->drawCircle($X,$Y,$PlotSize,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        elseif ( $Shape == SERIE_SHAPE_DIAMOND )
+        {
+        $Pos = ""; $Pos[]=$X-$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize;
+        $this->drawPolygon($Pos,array("NoFill"=>TRUE,"BorderR"=>$R,"BorderG"=>$G,"BorderB"=>$B,"BorderAlpha"=>$Alpha));
+        }      
+        elseif ( $Shape == SERIE_SHAPE_FILLEDDIAMOND )
+        {
+        if ( $PlotBorder )
+        {
+            $Pos = ""; $Pos[]=$X-$PlotSize-$BorderSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize-$BorderSize; $Pos[]=$X+$PlotSize+$BorderSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize+$BorderSize;
+            $this->drawPolygon($Pos,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha));
+        }
+
+        $Pos = ""; $Pos[]=$X-$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize;
+        $this->drawPolygon($Pos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        }      
     }
 
-   function drawPolygonChart($Points,$Format="")
+    function drawPolygonChart($Points,$Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : 0;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $NoFill		= isset($Format["NoFill"]) ? $Format["NoFill"] : FALSE;
-     $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
-     $BorderAlpha 	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha / 2;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $Threshold         = isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
-
-     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-
-     $RestoreShadow = $this->Shadow;
-     $this->Shadow = FALSE;
-
-     $AllIntegers = TRUE;
-     for($i=0;$i<=count($Points)-2;$i=$i+2)
-      { if ( $this->getFirstDecimal($Points[$i+1]) != 0 ) { $AllIntegers = FALSE; } }
-
-     /* Convert polygon to segments */
-     $Segments = "";
-     for($i=2;$i<=count($Points)-2;$i=$i+2)
-      { $Segments[] = array("X1"=>$Points[$i-2],"Y1"=>$Points[$i-1],"X2"=>$Points[$i],"Y2"=>$Points[$i+1]); }
-     $Segments[] = array("X1"=>$Points[$i-2],"Y1"=>$Points[$i-1],"X2"=>$Points[0],"Y2"=>$Points[1]);
-
-     /* Simplify straight lines */
-     $Result = ""; $inHorizon = FALSE; $LastX = VOID;
-     foreach($Segments as $Key => $Pos)
-      {
-       if ( $Pos["Y1"] != $Pos["Y2"] )
-        {
-         if ( $inHorizon ) { $inHorizon = FALSE; $Result[] = array("X1"=>$LastX,"Y1"=>$Pos["Y1"],"X2"=>$Pos["X1"],"Y2"=>$Pos["Y1"]); }
-
-         $Result[] = array("X1"=>$Pos["X1"],"Y1"=>$Pos["Y1"],"X2"=>$Pos["X2"],"Y2"=>$Pos["Y2"]);
-        }
-       else { if ( !$inHorizon ) { $inHorizon = TRUE; $LastX = $Pos["X1"];} }
-      }
-     $Segments = $Result;
-
-     /* Do we have something to draw */
-     if ( $Segments == "" ) { return(0); }
-
-     /* For segments debugging purpose */
-     //foreach($Segments as $Key => $Pos)
-     // echo $Pos["X1"].",".$Pos["Y1"].",".$Pos["X2"].",".$Pos["Y2"]."\r\n";
-
-     /* Find out the min & max Y boundaries */
-     $MinY = OUT_OF_SIGHT; $MaxY = OUT_OF_SIGHT;
-     foreach($Segments as $Key => $Coords)
-      {
-       if ( $MinY == OUT_OF_SIGHT || $MinY > min($Coords["Y1"],$Coords["Y2"]) ) { $MinY = min($Coords["Y1"],$Coords["Y2"]); }
-       if ( $MaxY == OUT_OF_SIGHT || $MaxY < max($Coords["Y1"],$Coords["Y2"]) ) { $MaxY = max($Coords["Y1"],$Coords["Y2"]); }
-      }
-
-     if ( $AllIntegers ) { $YStep = 1; } else { $YStep = .5; }
-
-     $MinY = floor($MinY); $MaxY = floor($MaxY);
-
-     /* Scan each Y lines */
-     $DefaultColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     $DebugLine = 0; $DebugColor = $this->allocateColor($this->Picture,255,0,0,100);
-
-     $MinY = floor($MinY); $MaxY = floor($MaxY); $YStep = 1; 
-
-     if ( !$NoFill )
-      {
-       //if ( $DebugLine ) { $MinY = $DebugLine; $MaxY = $DebugLine; }
-       for($Y=$MinY;$Y<=$MaxY;$Y=$Y+$YStep)
-        {
-         $Intersections = ""; $LastSlope = NULL; $RestoreLast = "-";
-         foreach($Segments as $Key => $Coords)
-          {
-           $X1 = $Coords["X1"]; $X2 = $Coords["X2"]; $Y1 = $Coords["Y1"]; $Y2 = $Coords["Y2"];
-
-           if ( min($Y1,$Y2) <= $Y && max($Y1,$Y2) >= $Y )
-            {
-             if ( $Y1 == $Y2 )
-              { $X = $X1; }
-             else
-              { $X = $X1 + ( ($Y-$Y1)*$X2 - ($Y-$Y1)*$X1 ) / ($Y2-$Y1); }
-
-             $X = floor($X);
-
-             if ( $X2 == $X1 )
-              { $Slope = "!"; }
-             else
-              {
-               $SlopeC = ($Y2 - $Y1) / ($X2 - $X1);
-               if( $SlopeC == 0 )
+        $R			= isset($Format["R"]) ? $Format["R"] : 0;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $NoFill		= isset($Format["NoFill"]) ? $Format["NoFill"] : FALSE;
+        $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+        $BorderAlpha 	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha / 2;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $Threshold         = isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
+
+        if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+
+        $RestoreShadow = $this->Shadow;
+        $this->Shadow = FALSE;
+
+        $AllIntegers = TRUE;
+        for($i=0;$i<=count($Points)-2;$i=$i+2)
+        { if ( $this->getFirstDecimal($Points[$i+1]) != 0 ) { $AllIntegers = FALSE; } }
+
+        /* Convert polygon to segments */
+        $Segments = "";
+        for($i=2;$i<=count($Points)-2;$i=$i+2)
+        { $Segments[] = array("X1"=>$Points[$i-2],"Y1"=>$Points[$i-1],"X2"=>$Points[$i],"Y2"=>$Points[$i+1]); }
+        $Segments[] = array("X1"=>$Points[$i-2],"Y1"=>$Points[$i-1],"X2"=>$Points[0],"Y2"=>$Points[1]);
+
+        /* Simplify straight lines */
+        $Result = ""; $inHorizon = FALSE; $LastX = VOID;
+        foreach($Segments as $Key => $Pos)
+        {
+        if ( $Pos["Y1"] != $Pos["Y2"] )
+        {
+            if ( $inHorizon ) { $inHorizon = FALSE; $Result[] = array("X1"=>$LastX,"Y1"=>$Pos["Y1"],"X2"=>$Pos["X1"],"Y2"=>$Pos["Y1"]); }
+
+            $Result[] = array("X1"=>$Pos["X1"],"Y1"=>$Pos["Y1"],"X2"=>$Pos["X2"],"Y2"=>$Pos["Y2"]);
+        }
+        else { if ( !$inHorizon ) { $inHorizon = TRUE; $LastX = $Pos["X1"];} }
+        }
+        $Segments = $Result;
+
+        /* Do we have something to draw */
+        if ( $Segments == "" ) { return(0); }
+
+        /* For segments debugging purpose */
+        //foreach($Segments as $Key => $Pos)
+        // echo $Pos["X1"].",".$Pos["Y1"].",".$Pos["X2"].",".$Pos["Y2"]."\r\n";
+
+        /* Find out the min & max Y boundaries */
+        $MinY = OUT_OF_SIGHT; $MaxY = OUT_OF_SIGHT;
+        foreach($Segments as $Key => $Coords)
+        {
+        if ( $MinY == OUT_OF_SIGHT || $MinY > min($Coords["Y1"],$Coords["Y2"]) ) { $MinY = min($Coords["Y1"],$Coords["Y2"]); }
+        if ( $MaxY == OUT_OF_SIGHT || $MaxY < max($Coords["Y1"],$Coords["Y2"]) ) { $MaxY = max($Coords["Y1"],$Coords["Y2"]); }
+        }
+
+        if ( $AllIntegers ) { $YStep = 1; } else { $YStep = .5; }
+
+        $MinY = floor($MinY); $MaxY = floor($MaxY);
+
+        /* Scan each Y lines */
+        $DefaultColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        $DebugLine = 0; $DebugColor = $this->allocateColor($this->Picture,255,0,0,100);
+
+        $MinY = floor($MinY); $MaxY = floor($MaxY); $YStep = 1; 
+
+        if ( !$NoFill )
+        {
+        //if ( $DebugLine ) { $MinY = $DebugLine; $MaxY = $DebugLine; }
+        for($Y=$MinY;$Y<=$MaxY;$Y=$Y+$YStep)
+        {
+            $Intersections = ""; $LastSlope = NULL; $RestoreLast = "-";
+            foreach($Segments as $Key => $Coords)
+            {
+            $X1 = $Coords["X1"]; $X2 = $Coords["X2"]; $Y1 = $Coords["Y1"]; $Y2 = $Coords["Y2"];
+
+            if ( min($Y1,$Y2) <= $Y && max($Y1,$Y2) >= $Y )
+            {
+                if ( $Y1 == $Y2 )
+                { $X = $X1; }
+                else
+                { $X = $X1 + ( ($Y-$Y1)*$X2 - ($Y-$Y1)*$X1 ) / ($Y2-$Y1); }
+
+                $X = floor($X);
+
+                if ( $X2 == $X1 )
+                { $Slope = "!"; }
+                else
+                {
+                $SlopeC = ($Y2 - $Y1) / ($X2 - $X1);
+                if( $SlopeC == 0 )
                 { $Slope = "="; }
-               elseif( $SlopeC > 0 )
+                elseif( $SlopeC > 0 )
                 { $Slope = "+"; }
-               elseif ( $SlopeC < 0 )
+                elseif ( $SlopeC < 0 )
                 { $Slope = "-"; }
-              }
+                }
 
-             if ( !is_array($Intersections) )
-              { $Intersections[] = $X; }
-             elseif( !in_array($X,$Intersections) )
-              { $Intersections[] = $X; }
-             elseif( in_array($X,$Intersections) )
-              {
-               if ($Y == $DebugLine) { echo $Slope."/".$LastSlope."(".$X.") "; }
+                if ( !is_array($Intersections) )
+                { $Intersections[] = $X; }
+                elseif( !in_array($X,$Intersections) )
+                { $Intersections[] = $X; }
+                elseif( in_array($X,$Intersections) )
+                {
+                if ($Y == $DebugLine) { echo $Slope."/".$LastSlope."(".$X.") "; }
 
-               if ( $Slope == "=" && $LastSlope == "-"  )                             { $Intersections[] = $X; }
-               if ( $Slope != $LastSlope && $LastSlope != "!" && $LastSlope != "=" )  { $Intersections[] = $X; }
-               if ( $Slope != $LastSlope && $LastSlope == "!" && $Slope == "+" )      { $Intersections[] = $X; }
-              }
+                if ( $Slope == "=" && $LastSlope == "-"  )                             { $Intersections[] = $X; }
+                if ( $Slope != $LastSlope && $LastSlope != "!" && $LastSlope != "=" )  { $Intersections[] = $X; }
+                if ( $Slope != $LastSlope && $LastSlope == "!" && $Slope == "+" )      { $Intersections[] = $X; }
+                }
 
-             if ( is_array($Intersections) && in_array($X,$Intersections) && $LastSlope == "=" && ($Slope == "-" )) { $Intersections[] = $X; }
+                if ( is_array($Intersections) && in_array($X,$Intersections) && $LastSlope == "=" && ($Slope == "-" )) { $Intersections[] = $X; }
 
-             $LastSlope = $Slope;
+                $LastSlope = $Slope;
+            }
             }
-          }
-         if ( $RestoreLast != "-" ) { $Intersections[] = $RestoreLast; echo "@".$Y."\r\n"; }
+            if ( $RestoreLast != "-" ) { $Intersections[] = $RestoreLast; echo "@".$Y."\r\n"; }
 
-         if ( is_array($Intersections) )
-          {
-           sort($Intersections);
+            if ( is_array($Intersections) )
+            {
+            sort($Intersections);
 
-           if ($Y == $DebugLine) { print_r($Intersections); }
+            if ($Y == $DebugLine) { print_r($Intersections); }
 
-           /* Remove NULL plots */
-           $Result = "";
-           for($i=0;$i<=count($Intersections)-1;$i=$i+2)
+            /* Remove NULL plots */
+            $Result = "";
+            for($i=0;$i<=count($Intersections)-1;$i=$i+2)
             {
-             if ( isset($Intersections[$i+1]) )
-              { if ( $Intersections[$i] != $Intersections[$i+1] ) { $Result[] = $Intersections[$i]; $Result[] = $Intersections[$i+1]; } }
+                if ( isset($Intersections[$i+1]) )
+                { if ( $Intersections[$i] != $Intersections[$i+1] ) { $Result[] = $Intersections[$i]; $Result[] = $Intersections[$i+1]; } }
             }
 
-           if ( is_array($Result) )
+            if ( is_array($Result) )
             {
-             $Intersections = $Result;
+                $Intersections = $Result;
 
-             $LastX = OUT_OF_SIGHT;
-             foreach($Intersections as $Key => $X)
-              {
-               if ( $LastX == OUT_OF_SIGHT )
+                $LastX = OUT_OF_SIGHT;
+                foreach($Intersections as $Key => $X)
+                {
+                if ( $LastX == OUT_OF_SIGHT )
                 $LastX = $X;
-               elseif ( $LastX != OUT_OF_SIGHT )
+                elseif ( $LastX != OUT_OF_SIGHT )
                 {
-                 if ( $this->getFirstDecimal($LastX) > 1 ) { $LastX++; }
+                    if ( $this->getFirstDecimal($LastX) > 1 ) { $LastX++; }
 
-                 $Color = $DefaultColor;
-                 if ( $Threshold != NULL )
-                  {
-                   foreach($Threshold as $Key => $Parameters)
+                    $Color = $DefaultColor;
+                    if ( $Threshold != NULL )
                     {
-                     if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"])
-                      {
-                       if ( isset($Parameters["R"]) ) { $R = $Parameters["R"]; } else { $R = 0; }
-                       if ( isset($Parameters["G"]) ) { $G = $Parameters["G"]; } else { $G = 0; }
-                       if ( isset($Parameters["B"]) ) { $B = $Parameters["B"]; } else { $B = 0; }
-                       if ( isset($Parameters["Alpha"]) ) { $Alpha = $Parameters["Alpha"]; } else { $Alpha = 100; }
-                       $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-                      }
+                    foreach($Threshold as $Key => $Parameters)
+                    {
+                        if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"])
+                        {
+                        if ( isset($Parameters["R"]) ) { $R = $Parameters["R"]; } else { $R = 0; }
+                        if ( isset($Parameters["G"]) ) { $G = $Parameters["G"]; } else { $G = 0; }
+                        if ( isset($Parameters["B"]) ) { $B = $Parameters["B"]; } else { $B = 0; }
+                        if ( isset($Parameters["Alpha"]) ) { $Alpha = $Parameters["Alpha"]; } else { $Alpha = 100; }
+                        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+                        }
+                    }
                     }
-                  }
 
-                 imageline($this->Picture,$LastX,$Y,$X,$Y,$Color);
+                    imageline($this->Picture,$LastX,$Y,$X,$Y,$Color);
 
-                 if ( $Y == $DebugLine) { imageline($this->Picture,$LastX,$Y,$X,$Y,$DebugColor); }
+                    if ( $Y == $DebugLine) { imageline($this->Picture,$LastX,$Y,$X,$Y,$DebugColor); }
 
-                 $LastX = OUT_OF_SIGHT;
+                    $LastX = OUT_OF_SIGHT;
                 }
-              }
+                }
+            }
             }
-          }
         }
-      }
+        }
 
-     /* Draw the polygon border, if required */
-     if ( !$NoBorder)
-      {
-       foreach($Segments as $Key => $Coords)
+        /* Draw the polygon border, if required */
+        if ( !$NoBorder)
+        {
+        foreach($Segments as $Key => $Coords)
         $this->drawLine($Coords["X1"],$Coords["Y1"],$Coords["X2"],$Coords["Y2"],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Threshold"=>$Threshold));
-      }
+        }
 
-     $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Return the abscissa margin */
-   function getAbscissaMargin($Data)
+    /* Return the abscissa margin */
+    function getAbscissaMargin($Data)
     {
-     foreach($Data["Axis"] as $AxisID => $Values) { if ( $Values["Identity"] == AXIS_X ) { return($Values["Margin"]); } }
-     return(0);
+        foreach($Data["Axis"] as $AxisID => $Values) { if ( $Values["Identity"] == AXIS_X ) { return($Values["Margin"]); } }
+        return(0);
     }
 
-  }
+    }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pData.class.php

Indentation +524 added lines, -524 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pDraw - class to manipulate data arrays
 
      Version     : 2.1.3
@@ -13,50 +13,50 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- /* Axis configuration */
- define("AXIS_FORMAT_DEFAULT"		, 680001);
- define("AXIS_FORMAT_TIME"		, 680002);
- define("AXIS_FORMAT_DATE"		, 680003);
- define("AXIS_FORMAT_METRIC"		, 680004);
- define("AXIS_FORMAT_CURRENCY"		, 680005);
- define("AXIS_FORMAT_CUSTOM"		, 680006);
-
- /* Axis position */
- define("AXIS_POSITION_LEFT"		, 681001);
- define("AXIS_POSITION_RIGHT"		, 681002);
- define("AXIS_POSITION_TOP"		, 681001);
- define("AXIS_POSITION_BOTTOM"		, 681002);
-
- /* Families of data points */
- define("SERIE_SHAPE_FILLEDCIRCLE"	, 681011);
- define("SERIE_SHAPE_FILLEDTRIANGLE"	, 681012);
- define("SERIE_SHAPE_FILLEDSQUARE"	, 681013);
- define("SERIE_SHAPE_FILLEDDIAMOND"	, 681017);
- define("SERIE_SHAPE_CIRCLE"		, 681014);
- define("SERIE_SHAPE_TRIANGLE"		, 681015);
- define("SERIE_SHAPE_SQUARE"		, 681016);
- define("SERIE_SHAPE_DIAMOND"		, 681018);
-
- /* Axis position */
- define("AXIS_X"			, 682001);
- define("AXIS_Y"			, 682002);
-
- /* Define value limits */
- define("ABSOLUTE_MIN"          	, -10000000000000);
- define("ABSOLUTE_MAX"          	, 10000000000000);
-
- /* Replacement to the PHP NULL keyword */
- define("VOID"                  	, 0.123456789);
-
- /* Euro symbol for GD fonts */
- define("EURO_SYMBOL"			, utf8_encode("&#8364;"));
-
- /* pData class definition */
- class pData
-  {
-   var $Data;
-
-   var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46,"Alpha"=>100),
+    /* Axis configuration */
+    define("AXIS_FORMAT_DEFAULT"		, 680001);
+    define("AXIS_FORMAT_TIME"		, 680002);
+    define("AXIS_FORMAT_DATE"		, 680003);
+    define("AXIS_FORMAT_METRIC"		, 680004);
+    define("AXIS_FORMAT_CURRENCY"		, 680005);
+    define("AXIS_FORMAT_CUSTOM"		, 680006);
+
+    /* Axis position */
+    define("AXIS_POSITION_LEFT"		, 681001);
+    define("AXIS_POSITION_RIGHT"		, 681002);
+    define("AXIS_POSITION_TOP"		, 681001);
+    define("AXIS_POSITION_BOTTOM"		, 681002);
+
+    /* Families of data points */
+    define("SERIE_SHAPE_FILLEDCIRCLE"	, 681011);
+    define("SERIE_SHAPE_FILLEDTRIANGLE"	, 681012);
+    define("SERIE_SHAPE_FILLEDSQUARE"	, 681013);
+    define("SERIE_SHAPE_FILLEDDIAMOND"	, 681017);
+    define("SERIE_SHAPE_CIRCLE"		, 681014);
+    define("SERIE_SHAPE_TRIANGLE"		, 681015);
+    define("SERIE_SHAPE_SQUARE"		, 681016);
+    define("SERIE_SHAPE_DIAMOND"		, 681018);
+
+    /* Axis position */
+    define("AXIS_X"			, 682001);
+    define("AXIS_Y"			, 682002);
+
+    /* Define value limits */
+    define("ABSOLUTE_MIN"          	, -10000000000000);
+    define("ABSOLUTE_MAX"          	, 10000000000000);
+
+    /* Replacement to the PHP NULL keyword */
+    define("VOID"                  	, 0.123456789);
+
+    /* Euro symbol for GD fonts */
+    define("EURO_SYMBOL"			, utf8_encode("&#8364;"));
+
+    /* pData class definition */
+    class pData
+    {
+    var $Data;
+
+    var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46,"Alpha"=>100),
                         "1"=>array("R"=>224,"G"=>100,"B"=>46,"Alpha"=>100),
                         "2"=>array("R"=>224,"G"=>214,"B"=>46,"Alpha"=>100),
                         "3"=>array("R"=>46,"G"=>151,"B"=>224,"Alpha"=>100),
@@ -65,723 +65,723 @@ 
                         "6"=>array("R"=>92,"G"=>224,"B"=>46,"Alpha"=>100),
                         "7"=>array("R"=>224,"G"=>176,"B"=>46,"Alpha"=>100));
 
-   /* Class creator */
-   function pData()
+    /* Class creator */
+    function pData()
     {
-     $this->Data = "";
-     $this->Data["XAxisDisplay"]	= AXIS_FORMAT_DEFAULT;
-     $this->Data["XAxisFormat"]		= NULL;
-     $this->Data["XAxisName"]		= NULL;
-     $this->Data["XAxisUnit"]		= NULL;
-     $this->Data["Abscissa"]		= NULL;
-     $this->Data["AbsicssaPosition"]	= AXIS_POSITION_BOTTOM;
+        $this->Data = "";
+        $this->Data["XAxisDisplay"]	= AXIS_FORMAT_DEFAULT;
+        $this->Data["XAxisFormat"]		= NULL;
+        $this->Data["XAxisName"]		= NULL;
+        $this->Data["XAxisUnit"]		= NULL;
+        $this->Data["Abscissa"]		= NULL;
+        $this->Data["AbsicssaPosition"]	= AXIS_POSITION_BOTTOM;
 
-     $this->Data["Axis"][0]["Display"]  = AXIS_FORMAT_DEFAULT;
-     $this->Data["Axis"][0]["Position"] = AXIS_POSITION_LEFT;
-     $this->Data["Axis"][0]["Identity"] = AXIS_Y;
+        $this->Data["Axis"][0]["Display"]  = AXIS_FORMAT_DEFAULT;
+        $this->Data["Axis"][0]["Position"] = AXIS_POSITION_LEFT;
+        $this->Data["Axis"][0]["Identity"] = AXIS_Y;
     }
 
-   /* Add a single point or an array to the given serie */
-   function addPoints($Values,$SerieName="Serie1")
+    /* Add a single point or an array to the given serie */
+    function addPoints($Values,$SerieName="Serie1")
     {
-     if (!isset($this->Data["Series"][$SerieName]))
-      $this->initialise($SerieName);
+        if (!isset($this->Data["Series"][$SerieName]))
+        $this->initialise($SerieName);
 
-     if ( is_array($Values) )
-      {
-       foreach($Values as $Key => $Value)
+        if ( is_array($Values) )
+        {
+        foreach($Values as $Key => $Value)
         { $this->Data["Series"][$SerieName]["Data"][] = $Value; }
-      }
-     else
-      $this->Data["Series"][$SerieName]["Data"][] = $Values;
+        }
+        else
+        $this->Data["Series"][$SerieName]["Data"][] = $Values;
 
-     if ( $Values != VOID )
-      {
-       $StrippedData = $this->stripVOID($this->Data["Series"][$SerieName]["Data"]);
-       if ( empty($StrippedData) ) { $this->Data["Series"][$SerieName]["Max"] = 0; $this->Data["Series"][$SerieName]["Min"] =0; return(0); }
-       $this->Data["Series"][$SerieName]["Max"] = max($StrippedData);
-       $this->Data["Series"][$SerieName]["Min"] = min($StrippedData);
-      }
+        if ( $Values != VOID )
+        {
+        $StrippedData = $this->stripVOID($this->Data["Series"][$SerieName]["Data"]);
+        if ( empty($StrippedData) ) { $this->Data["Series"][$SerieName]["Max"] = 0; $this->Data["Series"][$SerieName]["Min"] =0; return(0); }
+        $this->Data["Series"][$SerieName]["Max"] = max($StrippedData);
+        $this->Data["Series"][$SerieName]["Min"] = min($StrippedData);
+        }
     }
 
-   /* Strip VOID values */
-   function stripVOID($Values)
+    /* Strip VOID values */
+    function stripVOID($Values)
     { if (!is_array($Values)) { return(array()); } $Result = array(); foreach($Values as $Key => $Value) { if ( $Value != VOID ) { $Result[] = $Value; } } return($Result); }
 
-   /* Return the number of values contained in a given serie */
-   function getSerieCount($Serie)
+    /* Return the number of values contained in a given serie */
+    function getSerieCount($Serie)
     { if (isset($this->Data["Series"][$Serie]["Data"])) { return(sizeof($this->Data["Series"][$Serie]["Data"])); } else { return(0); } }
 
-   /* Remove a serie from the pData object */
-   function removeSerie($Series)
+    /* Remove a serie from the pData object */
+    function removeSerie($Series)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie])) { unset($this->Data["Series"][$Serie]); } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie])) { unset($this->Data["Series"][$Serie]); } }
     }
 
-   /* Return a value from given serie & index */
-   function getValueAt($Serie,$Index=0)
+    /* Return a value from given serie & index */
+    function getValueAt($Serie,$Index=0)
     { if (isset($this->Data["Series"][$Serie]["Data"][$Index])) { return($this->Data["Series"][$Serie]["Data"][$Index]); } else { return(NULL); } }
 
-   /* Return the values array */
-   function getValues($Serie)
+    /* Return the values array */
+    function getValues($Serie)
     { if (isset($this->Data["Series"][$Serie]["Data"])) { return($this->Data["Series"][$Serie]["Data"]); } else { return(NULL); } }
 
-   /* Reverse the values in the given serie */
-   function reverseSerie($Series)
+    /* Reverse the values in the given serie */
+    function reverseSerie($Series)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]["Data"])) { $this->Data["Series"][$Serie]["Data"] = array_reverse($this->Data["Series"][$Serie]["Data"]); } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]["Data"])) { $this->Data["Series"][$Serie]["Data"] = array_reverse($this->Data["Series"][$Serie]["Data"]); } }
     }
 
-   /* Return the sum of the serie values */
-   function getSum($Serie)
+    /* Return the sum of the serie values */
+    function getSum($Serie)
     { if (isset($this->Data["Series"][$Serie])) { return(array_sum($this->Data["Series"][$Serie]["Data"])); } else { return(NULL); } }
 
-   /* Return the max value of a given serie */
-   function getMax($Serie)
+    /* Return the max value of a given serie */
+    function getMax($Serie)
     { if (isset($this->Data["Series"][$Serie]["Max"])) { return($this->Data["Series"][$Serie]["Max"]); } else { return(NULL); } }
 
-   /* Return the min value of a given serie */
-   function getMin($Serie)
+    /* Return the min value of a given serie */
+    function getMin($Serie)
     { if (isset($this->Data["Series"][$Serie]["Min"])) { return($this->Data["Series"][$Serie]["Min"]); } else { return(NULL); } }
 
-   /* Set the description of a given serie */
-   function setSerieShape($Series,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
+    /* Set the description of a given serie */
+    function setSerieShape($Series,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Shape"] = $Shape; } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Shape"] = $Shape; } }
     }
 
-   /* Set the description of a given serie */
-   function setSerieDescription($Series,$Description="My serie")
+    /* Set the description of a given serie */
+    function setSerieDescription($Series,$Description="My serie")
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Description"] = $Description; } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Description"] = $Description; } }
     }
 
-   /* Set a serie as "drawable" while calling a rendering function */
-   function setSerieDrawable($Series,$Drawable=TRUE)
+    /* Set a serie as "drawable" while calling a rendering function */
+    function setSerieDrawable($Series,$Drawable=TRUE)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["isDrawable"] = $Drawable; } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["isDrawable"] = $Drawable; } }
     }
 
-   /* Set the icon associated to a given serie */
-   function setSeriePicture($Series,$Picture=NULL)
+    /* Set the icon associated to a given serie */
+    function setSeriePicture($Series,$Picture=NULL)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Picture"] = $Picture; } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Picture"] = $Picture; } }
     }
 
-   /* Set the name of the X Axis */
-   function setXAxisName($Name)
+    /* Set the name of the X Axis */
+    function setXAxisName($Name)
     { $this->Data["XAxisName"] = $Name; }
 
-   /* Set the display mode of the  X Axis */
-   function setXAxisDisplay($Mode,$Format=NULL)
+    /* Set the display mode of the  X Axis */
+    function setXAxisDisplay($Mode,$Format=NULL)
     { $this->Data["XAxisDisplay"] = $Mode; $this->Data["XAxisFormat"]  = $Format; }
 
-   /* Set the unit that will be displayed on the X axis */
-   function setXAxisUnit($Unit)
+    /* Set the unit that will be displayed on the X axis */
+    function setXAxisUnit($Unit)
     { $this->Data["XAxisUnit"] = $Unit; }
 
-   /* Set the serie that will be used as abscissa */
-   function setAbscissa($Serie)
+    /* Set the serie that will be used as abscissa */
+    function setAbscissa($Serie)
     { if (isset($this->Data["Series"][$Serie])) { $this->Data["Abscissa"] = $Serie; } }
 
-   function setAbsicssaPosition($Position = AXIS_POSITION_BOTTOM)
+    function setAbsicssaPosition($Position = AXIS_POSITION_BOTTOM)
     { $this->Data["AbsicssaPosition"] = $Position; }
 
-   /* Set the name of the abscissa axis */
-   function setAbscissaName($Name)
+    /* Set the name of the abscissa axis */
+    function setAbscissaName($Name)
     { $this->Data["AbscissaName"] = $Name; }
 
-   /* Create a scatter group specifyin X and Y data series */
-   function setScatterSerie($SerieX,$SerieY,$ID=0)
+    /* Create a scatter group specifyin X and Y data series */
+    function setScatterSerie($SerieX,$SerieY,$ID=0)
     { if (isset($this->Data["Series"][$SerieX]) && isset($this->Data["Series"][$SerieY]) ) { $this->initScatterSerie($ID); $this->Data["ScatterSeries"][$ID]["X"] = $SerieX; $this->Data["ScatterSeries"][$ID]["Y"] = $SerieY; } }
 
-   /* Set the shape of a given sctatter serie */
-   function setScatterSerieShape($ID,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
+    /* Set the shape of a given sctatter serie */
+    function setScatterSerieShape($ID,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
     { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Shape"] = $Shape; } }
 
-   /* Set the description of a given scatter serie */
-   function setScatterSerieDescription($ID,$Description="My serie")
+    /* Set the description of a given scatter serie */
+    function setScatterSerieDescription($ID,$Description="My serie")
     { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Description"] = $Description; } }
 
-   /* Set the icon associated to a given scatter serie */
-   function setScatterSeriePicture($ID,$Picture=NULL)
+    /* Set the icon associated to a given scatter serie */
+    function setScatterSeriePicture($ID,$Picture=NULL)
     { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Picture"] = $Picture; } }
 
-   /* Set a scatter serie as "drawable" while calling a rendering function */
-   function setScatterSerieDrawable($ID ,$Drawable=TRUE)
+    /* Set a scatter serie as "drawable" while calling a rendering function */
+    function setScatterSerieDrawable($ID ,$Drawable=TRUE)
     { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["isDrawable"] = $Drawable; } }
 
-   /* Define if a scatter serie should be draw with ticks */
-   function setScatterSerieTicks($ID,$Width=0)
+    /* Define if a scatter serie should be draw with ticks */
+    function setScatterSerieTicks($ID,$Width=0)
     { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Ticks"] = $Width; } }
 
-   /* Define if a scatter serie should be draw with a special weight */
-   function setScatterSerieWeight($ID,$Weight=0)
+    /* Define if a scatter serie should be draw with a special weight */
+    function setScatterSerieWeight($ID,$Weight=0)
     { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Weight"] = $Weight; } }
 
-   /* Associate a color to a scatter serie */
-   function setScatterSerieColor($ID,$Format)
+    /* Associate a color to a scatter serie */
+    function setScatterSerieColor($ID,$Format)
     {
-     $R	    = isset($Format["R"]) ? $Format["R"] : 0;
-     $G	    = isset($Format["G"]) ? $Format["G"] : 0;
-     $B	    = isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $R	    = isset($Format["R"]) ? $Format["R"] : 0;
+        $G	    = isset($Format["G"]) ? $Format["G"] : 0;
+        $B	    = isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
 
-     if ( isset($this->Data["ScatterSeries"][$ID]) )
-      {
-       $this->Data["ScatterSeries"][$ID]["Color"]["R"] = $R;
-       $this->Data["ScatterSeries"][$ID]["Color"]["G"] = $G;
-       $this->Data["ScatterSeries"][$ID]["Color"]["B"] = $B;
-       $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = $Alpha;
-      }
+        if ( isset($this->Data["ScatterSeries"][$ID]) )
+        {
+        $this->Data["ScatterSeries"][$ID]["Color"]["R"] = $R;
+        $this->Data["ScatterSeries"][$ID]["Color"]["G"] = $G;
+        $this->Data["ScatterSeries"][$ID]["Color"]["B"] = $B;
+        $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = $Alpha;
+        }
     }
 
-   /* Compute the series limits for an individual and global point of view */
-   function limits()
+    /* Compute the series limits for an individual and global point of view */
+    function limits()
     {
-     $GlobalMin = ABSOLUTE_MAX;
-     $GlobalMax = ABSOLUTE_MIN;
+        $GlobalMin = ABSOLUTE_MAX;
+        $GlobalMax = ABSOLUTE_MIN;
 
-     foreach($this->Data["Series"] as $Key => $Value)
-      {
-       if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"] == TRUE)
+        foreach($this->Data["Series"] as $Key => $Value)
+        {
+        if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"] == TRUE)
         {
-         if ( $GlobalMin > $this->Data["Series"][$Key]["Min"] ) { $GlobalMin = $this->Data["Series"][$Key]["Min"]; }
-         if ( $GlobalMax < $this->Data["Series"][$Key]["Max"] ) { $GlobalMax = $this->Data["Series"][$Key]["Max"]; }
+            if ( $GlobalMin > $this->Data["Series"][$Key]["Min"] ) { $GlobalMin = $this->Data["Series"][$Key]["Min"]; }
+            if ( $GlobalMax < $this->Data["Series"][$Key]["Max"] ) { $GlobalMax = $this->Data["Series"][$Key]["Max"]; }
         }
-      }
-     $this->Data["Min"] = $GlobalMin;
-     $this->Data["Max"] = $GlobalMax;
+        }
+        $this->Data["Min"] = $GlobalMin;
+        $this->Data["Max"] = $GlobalMax;
 
-     return(array($GlobalMin,$GlobalMax));
+        return(array($GlobalMin,$GlobalMax));
     }
 
-   /* Mark all series as drawable */
-   function drawAll()
+    /* Mark all series as drawable */
+    function drawAll()
     { foreach($this->Data["Series"] as $Key => $Value) { if ( $this->Data["Abscissa"] != $Key ) { $this->Data["Series"][$Key]["isDrawable"]=TRUE; } } }    
 
-   /* Return the average value of the given serie */
-   function getSerieAverage($Serie)
+    /* Return the average value of the given serie */
+    function getSerieAverage($Serie)
     {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
-       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
-       return(array_sum($SerieData)/sizeof($SerieData));
-      }
-     else
-      return(NULL);
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+        return(array_sum($SerieData)/sizeof($SerieData));
+        }
+        else
+        return(NULL);
     }
 
-   /* Return the geometric mean of the given serie */
-   function getGeometricMean($Serie)
+    /* Return the geometric mean of the given serie */
+    function getGeometricMean($Serie)
     {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
-       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
-       $Seriesum  = 1; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum * $Value; }
-       return(pow($Seriesum,1/sizeof($SerieData)));
-      }
-     else
-      return(NULL);
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+        $Seriesum  = 1; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum * $Value; }
+        return(pow($Seriesum,1/sizeof($SerieData)));
+        }
+        else
+        return(NULL);
     }
 
-   /* Return the harmonic mean of the given serie */
-   function getHarmonicMean($Serie)
+    /* Return the harmonic mean of the given serie */
+    function getHarmonicMean($Serie)
     {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
-       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
-       $Seriesum  = 0; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum + 1/$Value; }
-       return(sizeof($SerieData)/$Seriesum);
-      }
-     else
-      return(NULL);
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+        $Seriesum  = 0; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum + 1/$Value; }
+        return(sizeof($SerieData)/$Seriesum);
+        }
+        else
+        return(NULL);
     }
 
-   /* Return the standard deviation of the given serie */
-   function getStandardDeviation($Serie)
+    /* Return the standard deviation of the given serie */
+    function getStandardDeviation($Serie)
     {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
-       $Average   = $this->getSerieAverage($Serie);
-       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+        $Average   = $this->getSerieAverage($Serie);
+        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
 
-       $DeviationSum = 0;
-       foreach($SerieData as $Key => $Value)
+        $DeviationSum = 0;
+        foreach($SerieData as $Key => $Value)
         $DeviationSum = $DeviationSum + ($Value-$Average)*($Value-$Average);
 
-       $Deviation = sqrt($DeviationSum/count($SerieData));
+        $Deviation = sqrt($DeviationSum/count($SerieData));
 
-       return($Deviation);
-      }
-     else
-      return(NULL);
+        return($Deviation);
+        }
+        else
+        return(NULL);
     }
 
-   /* Return the Coefficient of variation of the given serie */
-   function getCoefficientOfVariation($Serie)
+    /* Return the Coefficient of variation of the given serie */
+    function getCoefficientOfVariation($Serie)
     {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
-       $Average           = $this->getSerieAverage($Serie);
-       $StandardDeviation = $this->getStandardDeviation($Serie);
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+        $Average           = $this->getSerieAverage($Serie);
+        $StandardDeviation = $this->getStandardDeviation($Serie);
 
-       if ( $StandardDeviation != 0 )
+        if ( $StandardDeviation != 0 )
         return($StandardDeviation/$Average);
-       else
+        else
+        return(NULL);
+        }
+        else
         return(NULL);
-      }
-     else
-      return(NULL);
     }
 
-   /* Return the median value of the given serie */
-   function getSerieMedian($Serie)
+    /* Return the median value of the given serie */
+    function getSerieMedian($Serie)
     {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
-       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
-       sort($SerieData);
-       $SerieCenter = floor(sizeof($SerieData)/2);
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+        sort($SerieData);
+        $SerieCenter = floor(sizeof($SerieData)/2);
 
-       if ( isset($SerieData[$SerieCenter]) )
+        if ( isset($SerieData[$SerieCenter]) )
         return($SerieData[$SerieCenter]);
-       else
+        else
+        return(NULL);
+        }
+        else
         return(NULL);
-      }
-     else
-      return(NULL);
     }
 
-   /* Return the x th percentil of the given serie */
-   function getSeriePercentile($Serie="Serie1",$Percentil=95)
+    /* Return the x th percentil of the given serie */
+    function getSeriePercentile($Serie="Serie1",$Percentil=95)
     {
-     if (!isset($this->Data["Series"][$Serie]["Data"])) { return(NULL); }
+        if (!isset($this->Data["Series"][$Serie]["Data"])) { return(NULL); }
 
-     $Values = count($this->Data["Series"][$Serie]["Data"])-1;
-     if ( $Values < 0 ) { $Values = 0; }
+        $Values = count($this->Data["Series"][$Serie]["Data"])-1;
+        if ( $Values < 0 ) { $Values = 0; }
 
-     $PercentilID  = floor(($Values/100)*$Percentil+.5);
-     $SortedValues = $this->Data["Series"][$Serie]["Data"];
-     sort($SortedValues);
+        $PercentilID  = floor(($Values/100)*$Percentil+.5);
+        $SortedValues = $this->Data["Series"][$Serie]["Data"];
+        sort($SortedValues);
 
-     if ( is_numeric($SortedValues[$PercentilID]) )
-      return($SortedValues[$PercentilID]);
-     else
-      return(NULL);
+        if ( is_numeric($SortedValues[$PercentilID]) )
+        return($SortedValues[$PercentilID]);
+        else
+        return(NULL);
     }
 
-   /* Add random values to a given serie */
-   function addRandomValues($SerieName="Serie1",$Options="")
+    /* Add random values to a given serie */
+    function addRandomValues($SerieName="Serie1",$Options="")
     {
-     $Values    = isset($Options["Values"]) ? $Options["Values"] : 20;
-     $Min       = isset($Options["Min"]) ? $Options["Min"] : 0;
-     $Max       = isset($Options["Max"]) ? $Options["Max"] : 100;
-     $withFloat = isset($Options["withFloat"]) ? $Options["withFloat"] : FALSE;
+        $Values    = isset($Options["Values"]) ? $Options["Values"] : 20;
+        $Min       = isset($Options["Min"]) ? $Options["Min"] : 0;
+        $Max       = isset($Options["Max"]) ? $Options["Max"] : 100;
+        $withFloat = isset($Options["withFloat"]) ? $Options["withFloat"] : FALSE;
 
-     for ($i=0;$i<=$Values;$i++)
-      {
-       if ( $withFloat ) { $Value = rand($Min*100,$Max*100)/100; } else { $Value = rand($Min,$Max); }
-       $this->addPoints($Value,$SerieName);
-      }
+        for ($i=0;$i<=$Values;$i++)
+        {
+        if ( $withFloat ) { $Value = rand($Min*100,$Max*100)/100; } else { $Value = rand($Min,$Max); }
+        $this->addPoints($Value,$SerieName);
+        }
     }
 
-   /* Test if we have valid data */
-   function containsData()
+    /* Test if we have valid data */
+    function containsData()
     {
-     if (!isset($this->Data["Series"])) { return(FALSE); }
+        if (!isset($this->Data["Series"])) { return(FALSE); }
 
-     $Result = FALSE;
-     foreach($this->Data["Series"] as $Key => $Value)
-      { if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"]==TRUE) { $Result=TRUE; } }
-     return($Result);
+        $Result = FALSE;
+        foreach($this->Data["Series"] as $Key => $Value)
+        { if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"]==TRUE) { $Result=TRUE; } }
+        return($Result);
     }
 
-   /* Set the display mode of an Axis */
-   function setAxisDisplay($AxisID,$Mode=AXIS_FORMAT_DEFAULT,$Format=NULL)
+    /* Set the display mode of an Axis */
+    function setAxisDisplay($AxisID,$Mode=AXIS_FORMAT_DEFAULT,$Format=NULL)
     {
-     if ( isset($this->Data["Axis"][$AxisID] ) )
-      {
-       $this->Data["Axis"][$AxisID]["Display"] = $Mode;
-       if ( $Format != NULL ) { $this->Data["Axis"][$AxisID]["Format"] = $Format; }
-      }
+        if ( isset($this->Data["Axis"][$AxisID] ) )
+        {
+        $this->Data["Axis"][$AxisID]["Display"] = $Mode;
+        if ( $Format != NULL ) { $this->Data["Axis"][$AxisID]["Format"] = $Format; }
+        }
     }
 
-   /* Set the position of an Axis */
-   function setAxisPosition($AxisID,$Position=AXIS_POSITION_LEFT)
+    /* Set the position of an Axis */
+    function setAxisPosition($AxisID,$Position=AXIS_POSITION_LEFT)
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Position"] = $Position; } }
 
-   /* Associate an unit to an axis */
-   function setAxisUnit($AxisID,$Unit)
+    /* Associate an unit to an axis */
+    function setAxisUnit($AxisID,$Unit)
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Unit"] = $Unit; } }
 
-   /* Associate a name to an axis */
-   function setAxisName($AxisID,$Name)
+    /* Associate a name to an axis */
+    function setAxisName($AxisID,$Name)
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Name"] = $Name; } }
 
-   /* Associate a color to an axis */
-   function setAxisColor($AxisID,$Format)
+    /* Associate a color to an axis */
+    function setAxisColor($AxisID,$Format)
     {
-     $R	    = isset($Format["R"]) ? $Format["R"] : 0;
-     $G	    = isset($Format["G"]) ? $Format["G"] : 0;
-     $B	    = isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $R	    = isset($Format["R"]) ? $Format["R"] : 0;
+        $G	    = isset($Format["G"]) ? $Format["G"] : 0;
+        $B	    = isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
 
-     if ( isset($this->Data["Axis"][$AxisID] ) )
-      {
-       $this->Data["Axis"][$AxisID]["Color"]["R"] = $R;
-       $this->Data["Axis"][$AxisID]["Color"]["G"] = $G;
-       $this->Data["Axis"][$AxisID]["Color"]["B"] = $B;
-       $this->Data["Axis"][$AxisID]["Color"]["Alpha"] = $Alpha;
-      }
+        if ( isset($this->Data["Axis"][$AxisID] ) )
+        {
+        $this->Data["Axis"][$AxisID]["Color"]["R"] = $R;
+        $this->Data["Axis"][$AxisID]["Color"]["G"] = $G;
+        $this->Data["Axis"][$AxisID]["Color"]["B"] = $B;
+        $this->Data["Axis"][$AxisID]["Color"]["Alpha"] = $Alpha;
+        }
     }
 
 
-   /* Design an axis as X or Y member */
-   function setAxisXY($AxisID,$Identity=AXIS_Y)
+    /* Design an axis as X or Y member */
+    function setAxisXY($AxisID,$Identity=AXIS_Y)
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Identity"] = $Identity; } }
 
-   /* Associate one data serie with one axis */
-   function setSerieOnAxis($Series,$AxisID)
+    /* Associate one data serie with one axis */
+    function setSerieOnAxis($Series,$AxisID)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie)
-      {
-       $PreviousAxis = $this->Data["Series"][$Serie]["Axis"];
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie)
+        {
+        $PreviousAxis = $this->Data["Series"][$Serie]["Axis"];
 
-       /* Create missing axis */
-       if ( !isset($this->Data["Axis"][$AxisID] ) )
+        /* Create missing axis */
+        if ( !isset($this->Data["Axis"][$AxisID] ) )
         { $this->Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_LEFT; $this->Data["Axis"][$AxisID]["Identity"] = AXIS_Y;}
 
-       $this->Data["Series"][$Serie]["Axis"] = $AxisID;
+        $this->Data["Series"][$Serie]["Axis"] = $AxisID;
 
-       /* Cleanup unused axis */
-       $Found = FALSE;
-       foreach($this->Data["Series"] as $SerieName => $Values) { if ( $Values["Axis"] == $PreviousAxis ) { $Found = TRUE; } }
-       if (!$Found) { unset($this->Data["Axis"][$PreviousAxis]); }
-      }
+        /* Cleanup unused axis */
+        $Found = FALSE;
+        foreach($this->Data["Series"] as $SerieName => $Values) { if ( $Values["Axis"] == $PreviousAxis ) { $Found = TRUE; } }
+        if (!$Found) { unset($this->Data["Axis"][$PreviousAxis]); }
+        }
     }
 
-   /* Define if a serie should be draw with ticks */
-   function setSerieTicks($Series,$Width=0)
+    /* Define if a serie should be draw with ticks */
+    function setSerieTicks($Series,$Width=0)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Ticks"] = $Width; } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Ticks"] = $Width; } }
     }
 
-   /* Define if a serie should be draw with a special weight */
-   function setSerieWeight($Series,$Weight=0)
+    /* Define if a serie should be draw with a special weight */
+    function setSerieWeight($Series,$Weight=0)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Weight"] = $Weight; } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Weight"] = $Weight; } }
     }
 
-   /* Returns the palette of the given serie */
-   function getSeriePalette($Serie)
+    /* Returns the palette of the given serie */
+    function getSeriePalette($Serie)
     {
-     if ( !isset($this->Data["Series"][$Serie]) ) { return(NULL); }
+        if ( !isset($this->Data["Series"][$Serie]) ) { return(NULL); }
 
-     $Result = "";
-     $Result["R"] = $this->Data["Series"][$Serie]["Color"]["R"];
-     $Result["G"] = $this->Data["Series"][$Serie]["Color"]["G"];
-     $Result["B"] = $this->Data["Series"][$Serie]["Color"]["B"];
-     $Result["Alpha"] = $this->Data["Series"][$Serie]["Color"]["Alpha"];
+        $Result = "";
+        $Result["R"] = $this->Data["Series"][$Serie]["Color"]["R"];
+        $Result["G"] = $this->Data["Series"][$Serie]["Color"]["G"];
+        $Result["B"] = $this->Data["Series"][$Serie]["Color"]["B"];
+        $Result["Alpha"] = $this->Data["Series"][$Serie]["Color"]["Alpha"];
 
-     return($Result);
+        return($Result);
     }
 
-   /* Set the color of one serie */
-   function setPalette($Series,$Format=NULL)
+    /* Set the color of one serie */
+    function setPalette($Series,$Format=NULL)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-
-     foreach($Series as $Key => $Serie)
-      {
-       $R	    = isset($Format["R"]) ? $Format["R"] : 0;
-       $G	    = isset($Format["G"]) ? $Format["G"] : 0;
-       $B	    = isset($Format["B"]) ? $Format["B"] : 0;
-       $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
 
-       if ( isset($this->Data["Series"][$Serie]) )
+        foreach($Series as $Key => $Serie)
         {
-         $OldR = $this->Data["Series"][$Serie]["Color"]["R"]; $OldG = $this->Data["Series"][$Serie]["Color"]["G"]; $OldB = $this->Data["Series"][$Serie]["Color"]["B"];
-         $this->Data["Series"][$Serie]["Color"]["R"] = $R;
-         $this->Data["Series"][$Serie]["Color"]["G"] = $G;
-         $this->Data["Series"][$Serie]["Color"]["B"] = $B;
-         $this->Data["Series"][$Serie]["Color"]["Alpha"] = $Alpha;
+        $R	    = isset($Format["R"]) ? $Format["R"] : 0;
+        $G	    = isset($Format["G"]) ? $Format["G"] : 0;
+        $B	    = isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
 
-         /* Do reverse processing on the internal palette array */
-         foreach ($this->Palette as $Key => $Value)
-          { if ($Value["R"] == $OldR && $Value["G"] == $OldG && $Value["B"] == $OldB) { $this->Palette[$Key]["R"] = $R; $this->Palette[$Key]["G"] = $G; $this->Palette[$Key]["B"] = $B; $this->Palette[$Key]["Alpha"] = $Alpha;} }
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+            $OldR = $this->Data["Series"][$Serie]["Color"]["R"]; $OldG = $this->Data["Series"][$Serie]["Color"]["G"]; $OldB = $this->Data["Series"][$Serie]["Color"]["B"];
+            $this->Data["Series"][$Serie]["Color"]["R"] = $R;
+            $this->Data["Series"][$Serie]["Color"]["G"] = $G;
+            $this->Data["Series"][$Serie]["Color"]["B"] = $B;
+            $this->Data["Series"][$Serie]["Color"]["Alpha"] = $Alpha;
+
+            /* Do reverse processing on the internal palette array */
+            foreach ($this->Palette as $Key => $Value)
+            { if ($Value["R"] == $OldR && $Value["G"] == $OldG && $Value["B"] == $OldB) { $this->Palette[$Key]["R"] = $R; $this->Palette[$Key]["G"] = $G; $this->Palette[$Key]["B"] = $B; $this->Palette[$Key]["Alpha"] = $Alpha;} }
+        }
         }
-      }
     }
 
-   /* Load a palette file */
-   function loadPalette($FileName,$Overwrite=FALSE)
+    /* Load a palette file */
+    function loadPalette($FileName,$Overwrite=FALSE)
     {
-     if ( !file_exists($FileName) ) { return(-1); }
-     if ( $Overwrite ) { $this->Palette = ""; }
+        if ( !file_exists($FileName) ) { return(-1); }
+        if ( $Overwrite ) { $this->Palette = ""; }
 
-     $fileHandle = @fopen($FileName, "r");
-     if (!$fileHandle) { return(-1); }
-     while (!feof($fileHandle))
-      {
-       $buffer = fgets($fileHandle, 4096);
-       if ( preg_match("/,/",$buffer) )
+        $fileHandle = @fopen($FileName, "r");
+        if (!$fileHandle) { return(-1); }
+        while (!feof($fileHandle))
         {
-         list($R,$G,$B,$Alpha) = preg_split("/,/",$buffer);
-         if ( $this->Palette == "" ) { $ID = 0; } else { $ID = count($this->Palette); }
-         $this->Palette[$ID] = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+        $buffer = fgets($fileHandle, 4096);
+        if ( preg_match("/,/",$buffer) )
+        {
+            list($R,$G,$B,$Alpha) = preg_split("/,/",$buffer);
+            if ( $this->Palette == "" ) { $ID = 0; } else { $ID = count($this->Palette); }
+            $this->Palette[$ID] = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+        }
         }
-      }
-     fclose($fileHandle);
+        fclose($fileHandle);
 
-     /* Apply changes to current series */
-     $ID = 0;
-     if ( isset($this->Data["Series"]))
-      {
-       foreach($this->Data["Series"] as $Key => $Value)
+        /* Apply changes to current series */
+        $ID = 0;
+        if ( isset($this->Data["Series"]))
         {
-         if ( !isset($this->Palette[$ID]) )
-          $this->Data["Series"][$Key]["Color"] = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>0);
-         else
-          $this->Data["Series"][$Key]["Color"] = $this->Palette[$ID];
-         $ID++;
+        foreach($this->Data["Series"] as $Key => $Value)
+        {
+            if ( !isset($this->Palette[$ID]) )
+            $this->Data["Series"][$Key]["Color"] = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>0);
+            else
+            $this->Data["Series"][$Key]["Color"] = $this->Palette[$ID];
+            $ID++;
+        }
         }
-      }
     }
 
-   /* Initialise a given scatter serie */
-   function initScatterSerie($ID)
+    /* Initialise a given scatter serie */
+    function initScatterSerie($ID)
     {
-     if ( isset($this->Data["ScatterSeries"][$ID]) ) { return(0); }
+        if ( isset($this->Data["ScatterSeries"][$ID]) ) { return(0); }
 
-     $this->Data["ScatterSeries"][$ID]["Description"]	= "Scatter ".$ID;
-     $this->Data["ScatterSeries"][$ID]["isDrawable"]	= TRUE;
-     $this->Data["ScatterSeries"][$ID]["Picture"]	= NULL;
-     $this->Data["ScatterSeries"][$ID]["Ticks"]		= 0;
-     $this->Data["ScatterSeries"][$ID]["Weight"]	= 0;
+        $this->Data["ScatterSeries"][$ID]["Description"]	= "Scatter ".$ID;
+        $this->Data["ScatterSeries"][$ID]["isDrawable"]	= TRUE;
+        $this->Data["ScatterSeries"][$ID]["Picture"]	= NULL;
+        $this->Data["ScatterSeries"][$ID]["Ticks"]		= 0;
+        $this->Data["ScatterSeries"][$ID]["Weight"]	= 0;
 
-     if ( isset($this->Palette[$ID]) )
-      $this->Data["ScatterSeries"][$ID]["Color"] = $this->Palette[$ID];
-     else
-      {
-       $this->Data["ScatterSeries"][$ID]["Color"]["R"] = rand(0,255);
-       $this->Data["ScatterSeries"][$ID]["Color"]["G"] = rand(0,255);
-       $this->Data["ScatterSeries"][$ID]["Color"]["B"] = rand(0,255);
-       $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = 100;
-      }
+        if ( isset($this->Palette[$ID]) )
+        $this->Data["ScatterSeries"][$ID]["Color"] = $this->Palette[$ID];
+        else
+        {
+        $this->Data["ScatterSeries"][$ID]["Color"]["R"] = rand(0,255);
+        $this->Data["ScatterSeries"][$ID]["Color"]["G"] = rand(0,255);
+        $this->Data["ScatterSeries"][$ID]["Color"]["B"] = rand(0,255);
+        $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = 100;
+        }
     }
 
-   /* Initialise a given serie */
-   function initialise($Serie)
+    /* Initialise a given serie */
+    function initialise($Serie)
     {
-     if ( isset($this->Data["Series"]) ) { $ID = count($this->Data["Series"]); } else { $ID = 0; }
+        if ( isset($this->Data["Series"]) ) { $ID = count($this->Data["Series"]); } else { $ID = 0; }
 
-     $this->Data["Series"][$Serie]["Description"]	= $Serie;
-     $this->Data["Series"][$Serie]["isDrawable"]	= TRUE;
-     $this->Data["Series"][$Serie]["Picture"]		= NULL;
-     $this->Data["Series"][$Serie]["Max"]		= NULL;
-     $this->Data["Series"][$Serie]["Min"]		= NULL;
-     $this->Data["Series"][$Serie]["Axis"]		= 0;
-     $this->Data["Series"][$Serie]["Ticks"]		= 0;
-     $this->Data["Series"][$Serie]["Weight"]		= 0;
-     $this->Data["Series"][$Serie]["Shape"]		= SERIE_SHAPE_FILLEDCIRCLE;
+        $this->Data["Series"][$Serie]["Description"]	= $Serie;
+        $this->Data["Series"][$Serie]["isDrawable"]	= TRUE;
+        $this->Data["Series"][$Serie]["Picture"]		= NULL;
+        $this->Data["Series"][$Serie]["Max"]		= NULL;
+        $this->Data["Series"][$Serie]["Min"]		= NULL;
+        $this->Data["Series"][$Serie]["Axis"]		= 0;
+        $this->Data["Series"][$Serie]["Ticks"]		= 0;
+        $this->Data["Series"][$Serie]["Weight"]		= 0;
+        $this->Data["Series"][$Serie]["Shape"]		= SERIE_SHAPE_FILLEDCIRCLE;
 
-     if ( isset($this->Palette[$ID]) )
-      $this->Data["Series"][$Serie]["Color"] = $this->Palette[$ID];
-     else
-      {
-       $this->Data["Series"][$Serie]["Color"]["R"] = rand(0,255);
-       $this->Data["Series"][$Serie]["Color"]["G"] = rand(0,255);
-       $this->Data["Series"][$Serie]["Color"]["B"] = rand(0,255);
-       $this->Data["Series"][$Serie]["Color"]["Alpha"] = 100;
-      }
+        if ( isset($this->Palette[$ID]) )
+        $this->Data["Series"][$Serie]["Color"] = $this->Palette[$ID];
+        else
+        {
+        $this->Data["Series"][$Serie]["Color"]["R"] = rand(0,255);
+        $this->Data["Series"][$Serie]["Color"]["G"] = rand(0,255);
+        $this->Data["Series"][$Serie]["Color"]["B"] = rand(0,255);
+        $this->Data["Series"][$Serie]["Color"]["Alpha"] = 100;
+        }
     }
      
-   function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1)
+    function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1)
     {
-     $Abscissa = $this->Data["Abscissa"];
+        $Abscissa = $this->Data["Abscissa"];
 
-     $SelectedSeries = "";
-     $MaxVal         = 0;
-     foreach($this->Data["Axis"] as $AxisID => $Axis)
-      {
-       if ( $UnitChange != NULL ) { $this->Data["Axis"][$AxisID]["Unit"] = $UnitChange; }
+        $SelectedSeries = "";
+        $MaxVal         = 0;
+        foreach($this->Data["Axis"] as $AxisID => $Axis)
+        {
+        if ( $UnitChange != NULL ) { $this->Data["Axis"][$AxisID]["Unit"] = $UnitChange; }
 
-       foreach($this->Data["Series"] as $SerieName => $Serie)
+        foreach($this->Data["Series"] as $SerieName => $Serie)
         {
-         if ($Serie["Axis"] == $AxisID && $Serie["isDrawable"] == TRUE && $SerieName != $Abscissa)
-          {
-           $SelectedSeries[$SerieName] = $SerieName;
+            if ($Serie["Axis"] == $AxisID && $Serie["isDrawable"] == TRUE && $SerieName != $Abscissa)
+            {
+            $SelectedSeries[$SerieName] = $SerieName;
 
-           if ( count($Serie["Data"] ) > $MaxVal ) { $MaxVal = count($Serie["Data"]); }
-          }
+            if ( count($Serie["Data"] ) > $MaxVal ) { $MaxVal = count($Serie["Data"]); }
+            }
+        }
         }
-      }
 
-     for($i=0;$i<=$MaxVal-1;$i++)
-      {
-       $Factor = 0;
-       foreach ($SelectedSeries as $Key => $SerieName )
+        for($i=0;$i<=$MaxVal-1;$i++)
         {
-         $Value = $this->Data["Series"][$SerieName]["Data"][$i];
-         if ( $Value != VOID )
-          $Factor = $Factor + abs($Value);
+        $Factor = 0;
+        foreach ($SelectedSeries as $Key => $SerieName )
+        {
+            $Value = $this->Data["Series"][$SerieName]["Data"][$i];
+            if ( $Value != VOID )
+            $Factor = $Factor + abs($Value);
         }
 
-       if ( $Factor != 0 )
+        if ( $Factor != 0 )
         {
-         $Factor = $NormalizationFactor / $Factor;
+            $Factor = $NormalizationFactor / $Factor;
 
-         foreach ($SelectedSeries as $Key => $SerieName )
-          {
-           $Value = $this->Data["Series"][$SerieName]["Data"][$i];
+            foreach ($SelectedSeries as $Key => $SerieName )
+            {
+            $Value = $this->Data["Series"][$SerieName]["Data"][$i];
 
-           if ( $Value != VOID && $Factor != $NormalizationFactor )
+            if ( $Value != VOID && $Factor != $NormalizationFactor )
             $this->Data["Series"][$SerieName]["Data"][$i] = round(abs($Value)*$Factor,$Round);
-           elseif ( $Value == VOID || $Value == 0 )
+            elseif ( $Value == VOID || $Value == 0 )
             $this->Data["Series"][$SerieName]["Data"][$i] = VOID;
-           elseif ( $Factor == $NormalizationFactor )
+            elseif ( $Factor == $NormalizationFactor )
             $this->Data["Series"][$SerieName]["Data"][$i] = $NormalizationFactor;
-          }
+            }
+        }
         }
-      }
 
-     foreach ($SelectedSeries as $Key => $SerieName )
-      {
-       $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
-       $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
-      }
+        foreach ($SelectedSeries as $Key => $SerieName )
+        {
+        $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+        $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+        }
     }
 
-   /* Load data from a CSV (or similar) data source */
-   function importFromCSV($FileName,$Options="")
+    /* Load data from a CSV (or similar) data source */
+    function importFromCSV($FileName,$Options="")
     {
-     $Delimiter		= isset($Options["Delimiter"]) ? $Options["Delimiter"] : ",";
-     $GotHeader		= isset($Options["GotHeader"]) ? $Options["GotHeader"] : FALSE;
-     $SkipColumns	= isset($Options["SkipColumns"]) ? $Options["SkipColumns"] : array(-1);
-     $DefaultSerieName	= isset($Options["DefaultSerieName"]) ? $Options["DefaultSerieName"] : "Serie";
+        $Delimiter		= isset($Options["Delimiter"]) ? $Options["Delimiter"] : ",";
+        $GotHeader		= isset($Options["GotHeader"]) ? $Options["GotHeader"] : FALSE;
+        $SkipColumns	= isset($Options["SkipColumns"]) ? $Options["SkipColumns"] : array(-1);
+        $DefaultSerieName	= isset($Options["DefaultSerieName"]) ? $Options["DefaultSerieName"] : "Serie";
 
-     $Handle = @fopen($FileName,"r");
-     if ($Handle)
-      {
-       $HeaderParsed = FALSE; $SerieNames = "";
-       while (!feof($Handle))
+        $Handle = @fopen($FileName,"r");
+        if ($Handle)
         {
-         $Buffer = fgets($Handle, 4096);
-         $Buffer = str_replace(chr(10),"",$Buffer);
-         $Buffer = str_replace(chr(13),"",$Buffer);
-         $Values = preg_split("/".$Delimiter."/",$Buffer);
+        $HeaderParsed = FALSE; $SerieNames = "";
+        while (!feof($Handle))
+        {
+            $Buffer = fgets($Handle, 4096);
+            $Buffer = str_replace(chr(10),"",$Buffer);
+            $Buffer = str_replace(chr(13),"",$Buffer);
+            $Values = preg_split("/".$Delimiter."/",$Buffer);
 
-         if ( $Buffer != "" )
-          {
-           if ( $GotHeader && !$HeaderParsed )
+            if ( $Buffer != "" )
+            {
+            if ( $GotHeader && !$HeaderParsed )
             {
-             foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $Name; } }
-             $HeaderParsed = TRUE;
+                foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $Name; } }
+                $HeaderParsed = TRUE;
             }
-           else
+            else
             {
-             if ($SerieNames == "" ) { foreach($Values as $Key => $Name) {  if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $DefaultSerieName.$Key; } } }
-             foreach($Values as $Key => $Value) {  if ( !in_array($Key,$SkipColumns) ) { $this->addPoints($Value,$SerieNames[$Key]); } }
+                if ($SerieNames == "" ) { foreach($Values as $Key => $Name) {  if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $DefaultSerieName.$Key; } } }
+                foreach($Values as $Key => $Value) {  if ( !in_array($Key,$SkipColumns) ) { $this->addPoints($Value,$SerieNames[$Key]); } }
             }
-          }
+            }
+        }
+        fclose($Handle);
         }
-       fclose($Handle);
-      }
     }
 
-   /* Create a dataset based on a formula */
-   function createFunctionSerie($SerieName,$Formula="",$Options="")
+    /* Create a dataset based on a formula */
+    function createFunctionSerie($SerieName,$Formula="",$Options="")
     {
-     $MinX		= isset($Options["MinX"]) ? $Options["MinX"] : -10;
-     $MaxX		= isset($Options["MaxX"]) ? $Options["MaxX"] : 10;
-     $XStep		= isset($Options["XStep"]) ? $Options["XStep"] : 1;
-     $AutoDescription	= isset($Options["AutoDescription"]) ? $Options["AutoDescription"] : FALSE;
-     $RecordAbscissa	= isset($Options["RecordAbscissa"]) ? $Options["RecordAbscissa"] : FALSE;
-     $AbscissaSerie	= isset($Options["AbscissaSerie"]) ? $Options["AbscissaSerie"] : "Abscissa";
+        $MinX		= isset($Options["MinX"]) ? $Options["MinX"] : -10;
+        $MaxX		= isset($Options["MaxX"]) ? $Options["MaxX"] : 10;
+        $XStep		= isset($Options["XStep"]) ? $Options["XStep"] : 1;
+        $AutoDescription	= isset($Options["AutoDescription"]) ? $Options["AutoDescription"] : FALSE;
+        $RecordAbscissa	= isset($Options["RecordAbscissa"]) ? $Options["RecordAbscissa"] : FALSE;
+        $AbscissaSerie	= isset($Options["AbscissaSerie"]) ? $Options["AbscissaSerie"] : "Abscissa";
 
-     if ( $Formula == "" ) { return(0); }
+        if ( $Formula == "" ) { return(0); }
 
-     $Result = ""; $Abscissa = "";
-     for($i=$MinX; $i<=$MaxX; $i=$i+$XStep)
-      {
-       $Expression = "\$return = '!'.(".str_replace("z",$i,$Formula).");";
-       if ( @eval($Expression) === FALSE ) { $return = VOID; }
-       if ( $return == "!" ) { $return = VOID; } else { $return = $this->right($return,strlen($return)-1); }
-       if ( $return == "NAN" ) { $return = VOID; }
-       if ( $return == "INF" ) { $return = VOID; }
-       if ( $return == "-INF" ) { $return = VOID; }
-
-       $Abscissa[] = $i;
-       $Result[]   = $return;
-      }
+        $Result = ""; $Abscissa = "";
+        for($i=$MinX; $i<=$MaxX; $i=$i+$XStep)
+        {
+        $Expression = "\$return = '!'.(".str_replace("z",$i,$Formula).");";
+        if ( @eval($Expression) === FALSE ) { $return = VOID; }
+        if ( $return == "!" ) { $return = VOID; } else { $return = $this->right($return,strlen($return)-1); }
+        if ( $return == "NAN" ) { $return = VOID; }
+        if ( $return == "INF" ) { $return = VOID; }
+        if ( $return == "-INF" ) { $return = VOID; }
+
+        $Abscissa[] = $i;
+        $Result[]   = $return;
+        }
 
-     $this->addPoints($Result,$SerieName);
-     if ( $AutoDescription ) { $this->setSerieDescription($SerieName,$Formula); }
-     if ( $RecordAbscissa ) { $this->addPoints($Abscissa,$AbscissaSerie); }
+        $this->addPoints($Result,$SerieName);
+        if ( $AutoDescription ) { $this->setSerieDescription($SerieName,$Formula); }
+        if ( $RecordAbscissa ) { $this->addPoints($Abscissa,$AbscissaSerie); }
     }
 
-   function negateValues($Series)
+    function negateValues($Series)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $SerieName)
-      {
-       if (isset($this->Data["Series"][$SerieName]))
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $SerieName)
+        {
+        if (isset($this->Data["Series"][$SerieName]))
         {
-         $Data = "";
-         foreach($this->Data["Series"][$SerieName]["Data"] as $Key => $Value)
-          { if ( $Value == VOID ) { $Data[] = VOID; } else { $Data[] = -$Value; } }
-         $this->Data["Series"][$SerieName]["Data"] = $Data;
+            $Data = "";
+            foreach($this->Data["Series"][$SerieName]["Data"] as $Key => $Value)
+            { if ( $Value == VOID ) { $Data[] = VOID; } else { $Data[] = -$Value; } }
+            $this->Data["Series"][$SerieName]["Data"] = $Data;
 
-         $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
-         $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+            $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+            $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+        }
         }
-      }
     }
 
-   /* Return the data & configuration of the series */
-   function getData()
+    /* Return the data & configuration of the series */
+    function getData()
     { return($this->Data); }
 
-   /* Save a palette element */
-   function savePalette($ID,$Color)
+    /* Save a palette element */
+    function savePalette($ID,$Color)
     { $this->Palette[$ID] = $Color; }
 
-   /* Return the palette of the series */
-   function getPalette()
+    /* Return the palette of the series */
+    function getPalette()
     { return($this->Palette); }
 
-   /* Called by the scaling algorithm to save the config */
-   function saveAxisConfig($Axis) { $this->Data["Axis"]=$Axis; }
+    /* Called by the scaling algorithm to save the config */
+    function saveAxisConfig($Axis) { $this->Data["Axis"]=$Axis; }
 
-   /* Save the Y Margin if set */
-   function saveYMargin($Value) { $this->Data["YMargin"]=$Value; }
+    /* Save the Y Margin if set */
+    function saveYMargin($Value) { $this->Data["YMargin"]=$Value; }
 
-   /* Save extended configuration to the pData object */
-   function saveExtendedData($Tag,$Values) { $this->Data["Extended"][$Tag]=$Values; }
+    /* Save extended configuration to the pData object */
+    function saveExtendedData($Tag,$Values) { $this->Data["Extended"][$Tag]=$Values; }
 
-   /* Called by the scaling algorithm to save the orientation of the scale */
-   function saveOrientation($Orientation) { $this->Data["Orientation"]=$Orientation; }
+    /* Called by the scaling algorithm to save the orientation of the scale */
+    function saveOrientation($Orientation) { $this->Data["Orientation"]=$Orientation; }
 
-   /* Convert a string to a single elements array */
-   function convertToArray($Value)
+    /* Convert a string to a single elements array */
+    function convertToArray($Value)
     { $Values = ""; $Values[] = $Value; return($Values); }
 
-   /* Class string wrapper */
-   function __toString()
+    /* Class string wrapper */
+    function __toString()
     { return("pData object."); }
 
-   function left($value,$NbChar)	{ return substr($value,0,$NbChar); }  
-   function right($value,$NbChar)	{ return substr($value,strlen($value)-$NbChar,$NbChar); }  
-   function mid($value,$Depart,$NbChar)	{ return substr($value,$Depart-1,$NbChar); }  
-  }
+    function left($value,$NbChar)	{ return substr($value,0,$NbChar); }  
+    function right($value,$NbChar)	{ return substr($value,strlen($value)-$NbChar,$NbChar); }  
+    function mid($value,$Depart,$NbChar)	{ return substr($value,$Depart-1,$NbChar); }  
+    }
 ?>
\ No newline at end of file