Changeset 8511


Ignore:
Timestamp:
Jan 8, 2011, 12:15:03 AM (10 years ago)
Author:
grum
Message:

Fix language key + minor bug on histogram rendering

Location:
extensions/Histogram
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/Histogram/hgram_histogram.class.inc.php

    r8509 r8511  
    185185    $image=imagecreatetruecolor($options['histo_width'], $options['histo_height']);
    186186    $options['color_bg']=self::colorAllocate($image, $options['color_bg']);
    187     $options['color_l']=self::colorAllocate($image, $options['color_l']);
     187    $options['color_v']=self::colorAllocate($image, $options['color_v']);
    188188    $options['color_r']=self::colorAllocate($image, $options['color_r']);
    189189    $options['color_g']=self::colorAllocate($image, $options['color_g']);
     
    193193
    194194
    195     $histoList=array('l', 'r', 'g', 'b');
     195    $histoList=array('v', 'r', 'g', 'b');
    196196
    197197
     
    203203        case 'surface':
    204204          $points=array(0,$options['histo_height']);
    205           if($histo=='l')
     205          if($histo=='v')
    206206          {
    207207            $histoKey=$options['histo_method'];
     
    341341  {
    342342    if(!isset($options['color_bg']) or !is_numeric($options['color_bg'])) $options['color_bg']=0xffffff;
    343     if(!isset($options['color_l']) or !is_numeric($options['color_l'])) $options['color_l']=0x808080;
     343    if(!isset($options['color_v']) or !is_numeric($options['color_v'])) $options['color_v']=0x808080;
    344344    if(!isset($options['color_r']) or !is_numeric($options['color_r'])) $options['color_r']=0xA00000;
    345345    if(!isset($options['color_g']) or !is_numeric($options['color_g'])) $options['color_g']=0x00A000;
     
    347347
    348348    $modes=array('surface', 'line', 'bar', 'none');
    349     if(!isset($options['mode_l']) or !in_array($options['mode_l'], $modes)) $options['mode_l']='surface';
    350     if(!isset($options['mode_r']) or !in_array($options['mode_l'], $modes)) $options['mode_r']='line';
    351     if(!isset($options['mode_g']) or !in_array($options['mode_l'], $modes)) $options['mode_g']='line';
    352     if(!isset($options['mode_b']) or !in_array($options['mode_l'], $modes)) $options['mode_b']='line';
     349    if(!isset($options['mode_v']) or !in_array($options['mode_v'], $modes)) $options['mode_v']='surface';
     350    if(!isset($options['mode_r']) or !in_array($options['mode_r'], $modes)) $options['mode_r']='line';
     351    if(!isset($options['mode_g']) or !in_array($options['mode_g'], $modes)) $options['mode_g']='line';
     352    if(!isset($options['mode_b']) or !in_array($options['mode_b'], $modes)) $options['mode_b']='line';
    353353
    354354    if(!isset($options['histo_width']) or !is_numeric($options['histo_width']) or $options['histo_width']<=0) $options['histo_width']=256;
  • extensions/Histogram/language/en_UK/plugin.lang.php

    r8509 r8511  
    2323$lang['hgram_histogram']='Histogram';
    2424$lang['hgram_save_config']="Configuration saved";
     25$lang['hgram_loading_histo']='Loading histogram...';
    2526
    2627
  • extensions/Histogram/language/fr_FR/plugin.lang.php

    r8509 r8511  
    2323$lang['hgram_histogram']='Histogramme';
    2424$lang['hgram_save_config']="Configuration sauvegardée";
     25$lang['hgram_loading_histo']="Chargement de l'histogramme";
    2526
    2627
Note: See TracChangeset for help on using the changeset viewer.