Changeset 6910

Timestamp:

01/03/08 08:03:55 (11 months ago)

Author:

dwhittle

Message:

dwhittle: updated dwJpgraphPlugin, released 1.0 (updated jpgraph to 2.3) + fixed phpdoc + cleaned up

Files:

• plugins/dwJpgraphPlugin/LICENSE (modified) (1 diff)
• plugins/dwJpgraphPlugin/README (modified) (2 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/README (added)
• plugins/dwJpgraphPlugin/lib/jpgraph/VERSION (added)
• plugins/dwJpgraphPlugin/lib/jpgraph/flags.dat (modified) (previous)
• plugins/dwJpgraphPlugin/lib/jpgraph/flags_thumb100x100.dat (modified) (previous)
• plugins/dwJpgraphPlugin/lib/jpgraph/flags_thumb35x35.dat (modified) (previous)
• plugins/dwJpgraphPlugin/lib/jpgraph/flags_thumb60x60.dat (modified) (previous)
• plugins/dwJpgraphPlugin/lib/jpgraph/imgdata_balls.inc.php (added)
• plugins/dwJpgraphPlugin/lib/jpgraph/imgdata_bevels.inc.php (added)
• plugins/dwJpgraphPlugin/lib/jpgraph/imgdata_diamonds.inc.php (added)
• plugins/dwJpgraphPlugin/lib/jpgraph/imgdata_pushpins.inc.php (added)
• plugins/dwJpgraphPlugin/lib/jpgraph/imgdata_squares.inc.php (added)
• plugins/dwJpgraphPlugin/lib/jpgraph/imgdata_stars.inc.php (added)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpg-config.inc.php (modified) (2 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph.php (modified) (62 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_antispam.php (modified) (1 diff)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_bar.php (modified) (10 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_date.php (modified) (1 diff)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_errhandler.inc.php (modified) (2 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_flags.php (modified) (4 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_gantt.php (modified) (10 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_gradient.php (modified) (11 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_led.php (added)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_line.php (modified) (3 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_log.php (modified) (3 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_pie.php (modified) (12 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_pie3d.php (modified) (2 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_plotmark.inc.php (modified) (13 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_polar.php (modified) (2 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_radar.php (modified) (2 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_scatter.php (modified) (6 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_stock.php (modified) (2 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_ttf.inc.php (added)
• plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph_utils.inc.php (modified) (17 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/lang/de.inc.php (modified) (4 diffs)
• plugins/dwJpgraphPlugin/lib/jpgraph/lang/en.inc.php (modified) (3 diffs)
• plugins/dwJpgraphPlugin/lib/sfJpGraph.class.php (modified) (2 diffs)
• plugins/dwJpgraphPlugin/modules/dwJpgraphPlugin (moved) (moved from plugins/dwJpgraphPlugin/modules/sfJpGraph)
• plugins/dwJpgraphPlugin/modules/dwJpgraphPlugin/actions (copied) (copied from plugins/dwJpgraphPlugin/modules/sfJpGraph/actions)
• plugins/dwJpgraphPlugin/modules/dwJpgraphPlugin/actions/actions.class.php (modified) (2 diffs)
• plugins/dwJpgraphPlugin/modules/sfJpGraph/config (deleted)
• plugins/dwJpgraphPlugin/modules/sfJpGraph/lib (deleted)
• plugins/dwJpgraphPlugin/modules/sfJpGraph/templates (deleted)
• plugins/dwJpgraphPlugin/modules/sfJpGraph/validate (deleted)
• plugins/dwJpgraphPlugin/package.xml (modified) (4 diffs)
• plugins/dwJpgraphPlugin/test/sfJpGraphTest.php (modified) (1 diff)

plugins/dwJpgraphPlugin/LICENSE

@@ -1 @@
-Copyright (c) 2004-2006 Dustin Whittl
+The MIT Licens
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
-
-The JPGRAPH library is licensed under THE Q PUBLIC LICENSE version 1.0, please see lib/jpgraph/QPL.txt for more information.

plugins/dwJpgraphPlugin/README

@@ -1 @@
-sfJpGraphPlugin p
+dwJpgraphP
-
-sfJpGraphPlugin` provides abstraction for the PHP JpG
+dwJpgraphPlugin` provides abstraction for the PHP Jpg
-
-== Installation ==
-
-  * Install the plugin
-
+
-  {{{
-com/sfJpG
+org/dwJpg
-  }}}
-
@@ -18 +18 @@
-
-  * You're done.
+
+== Using the plugin ==
+
+See the example module/action: dwJpgraphPlugin/test.

plugins/dwJpgraphPlugin/lib/jpgraph/jpg-config.inc.php

@@ -52 +52 @@
-// directory from where the image script is executed and store all files
-// there. As ususal this directory must be writeable by the PHP process.
-
-DEFINE("CSIMCACHE_DIR","csimcache/");
-DEFINE("CSIMCACHE_HTTP_DIR","csimcache/");
@@ -198 +197 @@
-// specified group since otherwise it is impossible for Apache
-// to set the specified group.
-www-data
+nobody
-
-// What permissions should the cached file have

plugins/dwJpgraphPlugin/lib/jpgraph/jpgraph.php

@@ -10 +10 @@
-
-require_once('jpg-config.inc.php');
-
-
+
+
+
-
-// Version info
-2.1
+3
-
-// Minimum required PHP version
@@ -20 +21 @@
-
-// Should the image be a truecolor image? 
-// Note 1: Has only effect with GD 2.0.1 and above.
-// Note 2: GD 2.0.1 + PHP 4.0.6 on Win32 crashes when trying to use 
-// trucolor.
-// Note 3: MUST be enabled to get background images working with GD2
-DEFINE('USE_TRUECOLOR',true);
-
@@ -70 +67 @@
-//------------------------------------------------------------------
-
-// TTF Font families
-// Note: First font must be FF_COURIER and the last font family must
-// be given to _LAST_FONT. This is used for error checking in the text
-// handling routines.
-DEFINE("FF_COURIER",10);
-DEFINE("FF_VERDANA",11);
-DEFINE("FF_TIMES",12);
-DEFINE("FF_COMIC",14);
-DEFINE("FF_ARIAL",15);
-DEFINE("FF_GEORGIA",16);
-DEFINE("FF_TREBUCHE",17);
-
-// Gnome Vera font
-// Available from http://www.gnome.org/fonts/
-DEFINE("FF_VERA",18);
-DEFINE("FF_VERAMONO",19);
-DEFINE("FF_VERASERIF",20);
-
-// Chinese font
-DEFINE("FF_SIMSUN",30);
-DEFINE("FF_CHINESE",31);
-DEFINE("FF_BIG5",31);
-
-// Japanese font
-DEFINE("FF_MINCHO",40);
-DEFINE("FF_PMINCHO",41);
-DEFINE("FF_GOTHIC",42);
-DEFINE("FF_PGOTHIC",43);
-
-// Limits for fonts
-DEFINE("_FIRST_FONT",10);
-DEFINE("_LAST_FONT",43);
-
-// TTF Font styles
-DEFINE("FS_NORMAL",9001);
-DEFINE("FS_BOLD",9002);
-DEFINE("FS_ITALIC",9003);
-DEFINE("FS_BOLDIT",9004);
-DEFINE("FS_BOLDITALIC",9004);
-
-//Definitions for internal font, new style
-DEFINE("FF_FONT0",1);
-DEFINE("FF_FONT1",2);
-DEFINE("FF_FONT2",4);
-
-// Tick density
@@ -297 +250 @@
-    elseif( $supported & IMG_GIF ) $img_format="gif";
-    elseif( $supported & IMG_JPG ) $img_format="jpeg";
+    elseif( $supported & IMG_WBMP ) $img_format="wbmp";
+    elseif( $supported & IMG_XPM ) $img_format="xpm";
+
-
-    if( !isset($_SERVER['PHP_SELF']) )
@@ -312 +268 @@
-}
-
-class LanguageConv {
-    private $g2312 = null ;
-
-    function Convert($aTxt,$aFF) {
-  if( LANGUAGE_GREEK ) {
-      if( GREEK_FROM_WINDOWS ) {
-    $unistring = LanguageConv::gr_win2uni($aTxt); 
-      } else  {
-    $unistring = LanguageConv::gr_iso2uni($aTxt);
-      }
-      return $unistring;
-  } elseif( LANGUAGE_CYRILLIC ) {
-      if( CYRILLIC_FROM_WINDOWS && (!defined('LANGUAGE_CHARSET') || stristr(LANGUAGE_CHARSET, 'windows-1251')) ) {
-    $aTxt = convert_cyr_string($aTxt, "w", "k"); 
-      }
-      if( !defined('LANGUAGE_CHARSET') || stristr(LANGUAGE_CHARSET, 'koi8-r') || stristr(LANGUAGE_CHARSET, 'windows-1251')) {
-    $isostring = convert_cyr_string($aTxt, "k", "i");
-    $unistring = LanguageConv::iso2uni($isostring);
-      }
-      else {
-    $unistring = $aTxt;
-      }
-      return $unistring;
-  }
-  elseif( $aFF === FF_SIMSUN ) {
-      // Do Chinese conversion
-      if( $this->g2312 == null ) {
-    include_once 'jpgraph_gb2312.php' ;
-    $this->g2312 = new GB2312toUTF8();
-      }
-      return $this->g2312->gb2utf8($aTxt);
-  }
-  elseif( $aFF === FF_CHINESE ) {
-      if( !function_exists('iconv') ) {
-    JpGraphError::RaiseL(25006);
-//('Usage of FF_CHINESE (FF_BIG5) font family requires that your PHP setup has the iconv() function. By default this is not compiled into PHP (needs the "--width-iconv" when configured).');
-      }
-      return iconv('BIG5','UTF-8',$aTxt);
-  }
-  elseif( ASSUME_EUCJP_ENCODING &&
-    ($aFF == FF_MINCHO || $aFF == FF_GOTHIC || $aFF == FF_PMINCHO || $aFF == FF_PGOTHIC) ) {
-      if( !function_exists('mb_convert_encoding') ) {
-    JpGraphError::RaiseL(25127);
-      }
-      return mb_convert_encoding($aTxt, 'UTF-8','EUC-JP');
-  }
-  else 
-      return $aTxt;
-    }
-
-    // Translate iso encoding to unicode
-    public static function iso2uni ($isoline){
-  $uniline='';
-  for ($i=0; $i < strlen($isoline); $i++){
-      $thischar=substr($isoline,$i,1);
-      $charcode=ord($thischar);
-      $uniline.=($charcode>175) ? "&#" . (1040+($charcode-176)). ";" : $thischar;
-  }
-  return $uniline;
-    }
-
-    // Translate greek iso encoding to unicode
-    public static function gr_iso2uni ($isoline) {
-  $uniline='';
-  for ($i=0; $i < strlen($isoline); $i++) {
-      $thischar=substr($isoline,$i,1);
-      $charcode=ord($thischar);
-      $uniline.=($charcode>179 && $charcode!=183 && $charcode!=187 && $charcode!=189) ? "&#" . (900+($charcode-180)). ";" : $thischar;
-  }
-  return $uniline;
-    }
-
-    // Translate greek win encoding to unicode
-    public static function gr_win2uni ($winline) {
-  $uniline='';
-  for ($i=0; $i < strlen($winline); $i++) {
-      $thischar=substr($winline,$i,1);
-      $charcode=ord($thischar);
-      if ($charcode==161 || $charcode==162) {
-    $uniline.="&#" . (740+$charcode). ";";
-      }
-      else {
-    $uniline.=(($charcode>183 && $charcode!=187 && $charcode!=189) || $charcode==180) ? "&#" . (900+($charcode-180)). ";" : $thischar;
-      }
-  }
-  return $uniline;
-    }
-}
-
-//===================================================
@@ -599 +467 @@
-    public $title,$subtitle,$subsubtitle;   // Title and subtitle(s) text object
-    public $axtype="linlin";  // Type of axis
-;  // Factot to determine the maximum number of ticks depending on the plot wi
+,$ytick_factor;  // Factor to determine the maximum number of ticks depending on the plot wid
-    public $texts=null, $y2texts=null;    // Text object to ge shown in the graph
-    public $lines=null, $y2lines=null;
@@ -613 +481 @@
-    public $iCSIMdisplay=false,$iHasStroked = false;
-    public $footer;
-
+, $iCSIMImgAlt=''
-    public $iDoClipping = false;
-    public $y2orderback=true;
@@ -640 +508 @@
-  $iImgTransFillColor='white',$iImgTransHighQ=false,
-  $iImgTransBorder=false,$iImgTransHorizonPos=0.5;
+    public $legend;
-    protected $iYAxisDeltaPos=50;
-    protected $iIconDepth=DEPTH_BACK;
@@ -991 +860 @@
-    }
-  
-    // Adjust brightness and constrast for background image
-    function AdjBackgroundImage($aBright,$aContr=0,$aSat=0) {
-  $this->background_image_bright=$aBright;
-  $this->background_image_contr=$aContr;
-  $this->background_image_sat=$aSat;
-    }
-  
-    // Adjust brightness and constrast for image
-    function AdjImage($aBright,$aContr=0,$aSat=0) {
-  $this->image_bright=$aBright;
-  $this->image_contr=$aContr;
-  $this->image_sat=$aSat;
-    }
-
-    // Specify axis style (boxed or single)
-    function SetAxisStyle($aStyle) {
@@ -1312 +1167 @@
-    $n = count($value);
-    for( $i=0; $i < $n; ++$i ) {
-
+amp;
-    }
-      }
-      else {
-
+amp;
-      }
-  }
@@ -1328 +1183 @@
-    $n = count($value);
-    for( $i=0; $i < $n; ++$i ) {
-
+amp;
-    }
-      }
-      else {
-
+amp;
-      }
-  }
-
-  return $urlarg;
+    }
+
+    function SetCSIMImgAlt($aAlt) {
+  $this->iCSIMImgAlt = $aAlt;
-    }
-
@@ -1385 +1244 @@
-    $tmp = str_replace('?','%3f',$baseimg);
-    $htmlwrap = $this->GetHTMLImageMap($aCSIMName)."\n".
-
+".$this->iCSIMImgAlt."
-
-    if($fh =  @fopen($basecsim,'w') ) {
@@ -1401 +1260 @@
-    }
-    echo $this->GetHTMLImageMap($aCSIMName);
-
+".$this->iCSIMImgAlt."
-      }
-  }
@@ -2018 +1877 @@
-      for($i=0; $i < count($this->lines); ++$i) {
-    $this->lines[$i]->Stroke($this->img,$this->xscale,$this->yscale);
+    $this->lines[$i]->DoLegend($this);
-      }
-  }
@@ -2024 +1884 @@
-      for($i=0; $i < count($this->y2lines); ++$i) {
-    $this->y2lines[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
+    $this->y2lines[$i]->DoLegend($this);
-      }
-  }
@@ -2059 +1920 @@
-      }
-      
-      // Adjust the appearance of the image
-      $this->AdjustSaturationBrightnessContrast();
-
-      // Should we do any final image transformation
-      if( $this->iImgTrans ) {
@@ -2236 +2094 @@
-    $this->xaxis->SetLabelSide(SIDE_UP);
-    // No title for the top X-axis 
-
+
+
+
-    $this->xaxis->scale->ticks->SetSide($toppos);
-    $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
@@ -2250 +2110 @@
-      $this->yaxis->SetPos('max');
-      // No title for the right side 
-
+
+
+
-      $this->yaxis->SetLabelSide(SIDE_RIGHT);
-      $this->yaxis->scale->ticks->SetSide($rightpos);
@@ -2263 +2125 @@
-
-    // Private helper function for backgound image
-
+static 
-  if( $aImgStr != '' ) {
-      return Image::CreateFromString($aImgStr);
-  }
-
-
+
-  // Remove case sensitivity and setup appropriate function to create image
-  // Get file extension. This should be the LAST '.' separated part of the filename
@@ -2288 +2149 @@
-  if( ( $ext == 'jpg' && !($supported & IMG_JPG) ) ||
-      ( $ext == 'gif' && !($supported & IMG_GIF) ) ||
-
+
+
+
+
-      JpGraphError::RaiseL(25037,$aFile);//('The image format of your background image ('.$aFile.') is not supported in your system configuration. ');
-  }
@@ -2353 +2217 @@
-  }
-  if( $this->background_image != "" ) {
-
-
-
-
+
-  }
-  elseif( $this->background_cflag != "" ) {
@@ -2792 +2653 @@
-    }
-
-    function AdjustSaturationBrightnessContrast() {
-  // Adjust the brightness and contrast of the image
-  if( $this->image_contr || $this->image_bright )
-      $this->img->AdjBrightContrast($this->image_bright,$this->image_contr);
-  if( $this->image_sat )                       
-      $this->img->AdjSat($this->image_sat);
-    }
-
-    // Text scale offset in world coordinates
-    function SetTextScaleOff($aOff) {
@@ -2879 +2732 @@
-    }
-
-} // Class
-
-
-//===================================================
-// CLASS TTF
-// Description: Handle TTF font names
-//===================================================
-class TTF {
-    private $font_files,$style_names;
-//---------------
-// CONSTRUCTOR
-    function TTF() {
-  $this->style_names=array(FS_NORMAL=>'normal',FS_BOLD=>'bold',FS_ITALIC=>'italic',FS_BOLDITALIC=>'bolditalic');
-  // File names for available fonts
-  $this->font_files=array(
-      FF_COURIER => array(FS_NORMAL=>'cour.ttf', FS_BOLD=>'courbd.ttf', FS_ITALIC=>'couri.ttf', FS_BOLDITALIC=>'courbi.ttf' ),
-      FF_GEORGIA => array(FS_NORMAL=>'georgia.ttf', FS_BOLD=>'georgiab.ttf', FS_ITALIC=>'georgiai.ttf', FS_BOLDITALIC=>'' ),
-      FF_TREBUCHE =>array(FS_NORMAL=>'trebuc.ttf', FS_BOLD=>'trebucbd.ttf',   FS_ITALIC=>'trebucit.ttf', FS_BOLDITALIC=>'trebucbi.ttf' ),
-      FF_VERDANA => array(FS_NORMAL=>'verdana.ttf', FS_BOLD=>'verdanab.ttf',  FS_ITALIC=>'verdanai.ttf', FS_BOLDITALIC=>'' ),
-      FF_TIMES =>   array(FS_NORMAL=>'times.ttf',   FS_BOLD=>'timesbd.ttf',   FS_ITALIC=>'timesi.ttf',   FS_BOLDITALIC=>'timesbi.ttf' ),
-      FF_COMIC =>   array(FS_NORMAL=>'comic.ttf',   FS_BOLD=>'comicbd.ttf',   FS_ITALIC=>'',         FS_BOLDITALIC=>'' ),
-      FF_ARIAL =>   array(FS_NORMAL=>'arial.ttf',   FS_BOLD=>'arialbd.ttf',   FS_ITALIC=>'ariali.ttf',   FS_BOLDITALIC=>'arialbi.ttf' ) ,
-      FF_VERA =>    array(FS_NORMAL=>'Vera.ttf',   FS_BOLD=>'VeraBd.ttf',   FS_ITALIC=>'VeraIt.ttf',   FS_BOLDITALIC=>'VeraBI.ttf' ),
-      FF_VERAMONO => array(FS_NORMAL=>'VeraMono.ttf', FS_BOLD=>'VeraMoBd.ttf', FS_ITALIC=>'VeraMoIt.ttf', FS_BOLDITALIC=>'VeraMoBI.ttf' ),
-      FF_VERASERIF => array(FS_NORMAL=>'VeraSe.ttf', FS_BOLD=>'VeraSeBd.ttf', FS_ITALIC=>'', FS_BOLDITALIC=>'' ) ,
-      FF_SIMSUN =>  array(FS_NORMAL=>'simsun.ttc',  FS_BOLD=>'simhei.ttf',   FS_ITALIC=>'',   FS_BOLDITALIC=>'' ),
-      FF_CHINESE => array(FS_NORMAL=>CHINESE_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ),
-      FF_MINCHO =>  array(FS_NORMAL=>MINCHO_TTF_FONT,  FS_BOLD=>'',   FS_ITALIC=>'',   FS_BOLDITALIC=>'' ),
-      FF_PMINCHO => array(FS_NORMAL=>PMINCHO_TTF_FONT,  FS_BOLD=>'',   FS_ITALIC=>'',   FS_BOLDITALIC=>'' ),    
-      FF_GOTHIC  => array(FS_NORMAL=>GOTHIC_TTF_FONT,  FS_BOLD=>'',   FS_ITALIC=>'',   FS_BOLDITALIC=>'' ),    
-      FF_PGOTHIC => array(FS_NORMAL=>PGOTHIC_TTF_FONT,  FS_BOLD=>'',   FS_ITALIC=>'',   FS_BOLDITALIC=>'' ),    
-      FF_MINCHO =>  array(FS_NORMAL=>PMINCHO_TTF_FONT,  FS_BOLD=>'',   FS_ITALIC=>'',   FS_BOLDITALIC=>'' )   
-);
-    }
-
-//---------------
-// PUBLIC METHODS 
-    // Create the TTF file from the font specification
-    function File($family,$style=FS_NORMAL) {
-  $fam = @$this->font_files[$family];
-  if( !$fam ) {
-      JpGraphError::RaiseL(25046,$family);//("Specified TTF font family (id=$family) is unknown or does not exist. Please note that TTF fonts are not distributed with JpGraph for copyright reasons. You can find the MS TTF WEB-fonts (arial, courier etc) for download at http://corefonts.sourceforge.net/");
-  }
-  $f = @$fam[$style];
-
-  if( $f==='' )
-      JpGraphError::RaiseL(25047,$this->style_names[$style],$this->font_files[$family][FS_NORMAL]);//('Style "'.$this->style_names[$style].'" is not available for font family '.$this->font_files[$family][FS_NORMAL].'.');
-  if( !$f ) {
-      JpGraphError::RaiseL(25048,$fam);//("Unknown font style specification [$fam].");
-  }
-
-  if ($family >= FF_MINCHO && $family <= FF_PGOTHIC) {
-      $f = MBTTF_DIR.$f;
-  } else {
-      $f = TTF_DIR.$f;
-  }
-
-  if( file_exists($f) === false || is_readable($f) === false ) {
-      JpGraphError::RaiseL(25049,$f);//("Font file \"$f\" is not readable or does not exist.");
-  }
-  return $f;
-    }
-} // Class
-
@@ -3000 +2791 @@
-    protected $icornerradius=0,$ishadowwidth=3;
-    protected $fcolor='white',$bcolor='black',$shadow=false;
-
+,$iCSIMWinTarget=''
-
-//---------------
@@ -3180 +2971 @@
-    }
-
-Target,$aAlt=null
-
+URITarget,$aAlt='',$aWinTarget=''
+URI
-  $this->iCSIMalt = $aAlt;
+  $this->iCSIMWinTarget = $aWinTarget;
-    }
-
@@ -3226 +3018 @@
-  // Create CSIM targets
-  $coords = $bbox[0].','.$bbox[1].','.$bbox[2].','.$bbox[3].','.$bbox[4].','.$bbox[5].','.$bbox[6].','.$bbox[7];
-
-
+
+
+
+
+
+
+
+
+
-
-  $aImg->PopColor($this->color);  
@@ -3578 +3377 @@
-    // Display the grid
-    function Stroke() {
-
+&& !$this->scale->textscale 
-      $tmp = $this->grid_color;
-      $this->grid_color = $this->grid_mincolor;
@@ -3692 +3491 @@
-    public $tick_step=1;
-    public $pos = false;
+    public $ticks_label = array();
+
-    protected $weight=1;
-    protected $color=array(0,0,0),$label_color=array(0,0,0);
-=false, $ticks_label
+
-    protected $show_first_label=true,$show_last_label=true;
-    protected $label_step=1; // Used by a text axis to specify what multiple of major steps
@@ -4156 +3957 @@
-    public $direction=1; // Should ticks be in(=1) the plot area or outside (=-1)
-    public $supress_last=false,$supress_tickmarks=false,$supress_minor_tickmarks=false;
+    public $maj_ticks_pos = array(), $maj_ticklabels_pos = array(), 
+     $ticks_pos = array(), $maj_ticks_label = array();
-
-    protected $minor_abs_size=3, $major_abs_size=5;
@@ -4280 +4083 @@
-    public $minor_step=1, $major_step=2;
-    public $xlabel_offset=0,$xtick_offset=0;
-    public $maj_ticks_pos = array(), $maj_ticklabels_pos = array(), 
-  $ticks_pos = array(), $maj_ticks_label = array();
-    private $label_offset=0; // What offset should the displayed label have
-    // i.e should we display 0,1,2 or 1,2,3,4 or 2,3,4 etc
@@ -4347 +4148 @@
-  $m=count($this->iManualMinTickPos);
-  $doLbl=count($this->iManualTickLabels) > 0;
-  $this->use_manualtickpos=true;
-
-  $this->maj_ticks_pos = array();
@@ -4448 +4248 @@
-        $this->ticks_pos[] = round($abs_pos);
-        $this->ticks_label[] = $label;
-
+step== 0 || $
-      $this->maj_ticks_pos[$j] = round($abs_pos);
-      $this->maj_ticklabels_pos[$j] = round($abs_pos);
@@ -4464 +4264 @@
-        $this->ticks_pos[$i] = round($abs_pos); 
-        $this->ticks_label[$i]=$label;
-
+step== 0 || $
-      $this->maj_ticks_pos[$j] = round($abs_pos);
-      $this->maj_ticklabels_pos[$j] = round($abs_pos);
@@ -4636 +4436 @@
-    public $textscale=false; // Just a flag to let the Plot class find out if
-    // we are a textscale or not. This is a cludge since
-onformatyion is availaba
+nformation is availab
-    // we don't have access to the graph object in the Plots
-    // stroke method. So we let graph store the status here
@@ -4650 +4450 @@
-    public $auto_ticks=false; // When using manual scale should the ticks be automatically set?
-    public $world_abs_size; // Plot area size in pixels (Needed public in jpgraph_radar.php)
-
-
-
+
+
+
+
-    private $gracetop=0,$gracebottom=0;
-    private $intscale=false; // Restrict autoscale to integers
-//---------------
-// CONSTRUCTOR
@@ -5771 +5571 @@
-    //---------------
-    // CONSTRUCTOR
-
+,$aSetAutoMargin=true
-  $this->CreateImgCanvas($aWidth,$aHeight);
-
+
+
-
-  if( !$this->SetImgFormat($aFormat) ) {
@@ -5790 +5591 @@
-    function SetAntiAliasing($aFlg=true) {
-  $this->use_anti_aliasing = $aFlg;
-
+
+
+
+
+
+
-    }
-
@@ -5939 +5745 @@
-    function SetAutoMargin() {  
-  GLOBAL $gJpgBrandTiming;
-10
+5
-  /*
-  if( $gJpgBrandTiming )
@@ -5946 +5752 @@
-  $lm = min(40,$this->width/7);
-  $rm = min(20,$this->width/10);
-20
+5
-  $bm = max($min_bm,$this->height/7);
-  $this->SetMargin($lm,$rm,$tm,$bm);    
@@ -6091 +5897 @@
-  elseif( $this->text_valign=="center" ) $y -= $height/2;
-  
+  $olda = $this->SetAngle(0);
+
-  if( $shadowcolor ) {
-      $this->PushColor($shadowcolor);
@@ -6129 +5937 @@
-        $x+$width,$y-$ymarg,$x-$xmarg,$y-$ymarg);
-  $this->SetTextAlign($h,$v);
+
+  $this->SetAngle($olda);
+
-  return $bb;
-    }
@@ -6533 +6344 @@
-  
-  
-    // Why this duplication? Because this way we can call this method
-    // for any image and not only the current objsct
-    function AdjSat($sat) { 
-  if( USE_TRUECOLOR )
-      return;
-  $this->_AdjSat($this->img,$sat);  
-    } 
-  
-    function _AdjSat($img,$sat) {
-  $nbr = imagecolorstotal ($img);
-  for( $i=0; $i<$nbr; ++$i ) {
-      $colarr = imagecolorsforindex ($img,$i);
-      $rgb[0]=$colarr["red"];
-      $rgb[1]=$colarr["green"];
-      $rgb[2]=$colarr["blue"];
-      $rgb = $this->AdjRGBSat($rgb,$sat);
-      imagecolorset ($img, $i, $rgb[0], $rgb[1], $rgb[2]);
-  }
-    }
-  
-    function AdjBrightContrast($bright,$contr=0) {
-  if( USE_TRUECOLOR )
-      return;
-  $this->_AdjBrightContrast($this->img,$bright,$contr);
-    }
-
-    function _AdjBrightContrast($img,$bright,$contr=0) {
-  if( $bright < -1 || $bright > 1 || $contr < -1 || $contr > 1 )
-      JpGraphError::RaiseL(25099);//(" Parameters for brightness and Contrast out of range [-1,1]");    
-  $nbr = imagecolorstotal ($img);
-  for( $i=0; $i<$nbr; ++$i ) {
-      $colarr = imagecolorsforindex ($img,$i);
-      $r = $this->AdjRGBBrightContrast($colarr["red"],$bright,$contr);
-      $g = $this->AdjRGBBrightContrast($colarr["green"],$bright,$contr);
-      $b = $this->AdjRGBBrightContrast($colarr["blue"],$bright,$contr);   
-      imagecolorset ($img, $i, $r, $g, $b);
-  }
-    }
-  
-    // Private helper function for adj sat
-    // Adjust saturation for RGB array $u. $sat is a value between -1 and 1
-    // Note: Due to GD inability to handle true color the RGB values are only between
-    // 8 bit. This makes saturation quite sensitive for small increases in parameter sat.
-    // 
-    // Tip: To get a grayscale picture set sat=-100, values <-100 changes the colors
-    // to it's complement.
-    // 
-    // Implementation note: The saturation is implemented directly in the RGB space
-    // by adjusting the perpendicular distance between the RGB point and the "grey"
-    // line (1,1,1). Setting $sat>0 moves the point away from the line along the perp.
-    // distance and a negative value moves the point closer to the line.
-    // The values are truncated when the color point hits the bounding box along the
-    // RGB axis.
-    // DISCLAIMER: I'm not 100% sure this is he correct way to implement a color 
-    // saturation function in RGB space. However, it looks ok and has the expected effect.
-    function AdjRGBSat($rgb,$sat) {
-  // TODO: Should be moved to the RGB class
-  // Grey vector
-  $v=array(1,1,1);
-
-  // Dot product
-  $dot = $rgb[0]*$v[0]+$rgb[1]*$v[1]+$rgb[2]*$v[2];
-
-  // Normalize dot product
-  $normdot = $dot/3;  // dot/|v|^2
-
-  // Direction vector between $u and its projection onto $v
-  for($i=0; $i<3; ++$i)
-      $r[$i] = $rgb[$i] - $normdot*$v[$i];
-
-  // Adjustment factor so that sat==1 sets the highest RGB value to 255
-  if( $sat > 0 ) {
-      $m=0;
-      for( $i=0; $i<3; ++$i) {
-    if( sign($r[$i]) == 1 && $r[$i]>0)
-        $m=max($m,(255-$rgb[$i])/$r[$i]);
-      }
-      $tadj=$m;
-  }
-  else
-      $tadj=1;
-    
-  $tadj = $tadj*$sat; 
-  for($i=0; $i<3; ++$i) {
-      $un[$i] = round($rgb[$i] + $tadj*$r[$i]);   
-      if( $un[$i]<0 ) $un[$i]=0;    // Truncate color when they reach 0
-      if( $un[$i]>255 ) $un[$i]=255;// Avoid potential rounding error
-  }   
-  return $un; 
-    } 
-
-    // Private helper function for AdjBrightContrast
-    function AdjRGBBrightContrast($rgb,$bright,$contr) {
-  // TODO: Should be moved to the RGB class
-  // First handle contrast, i.e change the dynamic range around grey
-  if( $contr <= 0 ) {
-      // Decrease contrast
-      $adj = abs($rgb-128) * (-$contr);
-      if( $rgb < 128 ) $rgb += $adj;
-      else $rgb -= $adj;
-  }
-  else { // $contr > 0
-      // Increase contrast
-      if( $rgb < 128 ) $rgb = $rgb - ($rgb * $contr);
-      else $rgb = $rgb + ((255-$rgb) * $contr);
-  }
-  
-  // Add (or remove) various amount of white
-  $rgb += $bright*255;  
-  $rgb=min($rgb,255);
-  $rgb=max($rgb,0);
-  return $rgb;  
-    }
-  
-    function SetLineWeight($weight) {
-  imagesetthickness($this->img,$weight);
@@ -6671 +6368 @@
-  if( $style=='' ) 
-      $style=IMG_ARC_PIE;
-
-
+
+
+
+
-    }
-
@@ -6735 +6434 @@
-    // Same as Line but take the line_style into account
-    function StyleLine($x1,$y1,$x2,$y2) {
+  if( $this->line_weight <= 0 )
+      return;
+
-  switch( $this->line_style ) {
-      case 1:// Solid
@@ -6756 +6458 @@
-    function DashedLine($x1,$y1,$x2,$y2,$dash_length=1,$dash_space=4) {
-
+  if( $this->line_weight <= 0 )
+      return;
+
-  $x1 = round($x1);
-  $x2 = round($x2);
@@ -6770 +6475 @@
-    function Line($x1,$y1,$x2,$y2) {
-
+  if( $this->line_weight <= 0 )
+      return;
+
-  $x1 = round($x1);
-  $x2 = round($x2);
@@ -6780 +6488 @@
-
-    function Polygon($p,$closed=FALSE,$fast=FALSE) {
-
+
+
+
+
-  $n=count($p);
-  $oldx = $p[0];
@@ -7048 +6759 @@
-      elseif( $supported & IMG_GIF )
-    $this->img_format="gif";
+      elseif( $supported & IMG_WBMP )
+    $this->img_format="wbmp";
+      elseif( $supported & IMG_XPM )
+    $this->img_format="xpm";
-      else
-    JpGraphError::RaiseL(25109);//("Your PHP (and GD-lib) installation does not appear to support any known graphic formats. You need to first make sure GD is compiled as a module to PHP. If you also want to use JPEG images you must get the JPEG library. Please see the PHP docs for details.");
@@ -7060 +6775 @@
-        $tst=false;
-    elseif( $aFormat=="gif" && !($supported & IMG_GIF) )  
+        $tst=false;
+    elseif( $aFormat=="wbmp" && !($supported & IMG_WBMP) )  
+        $tst=false;
+    elseif( $aFormat=="xpm" && !($supported & IMG_XPM) )  
-        $tst=false;
-    else {
@@ -7084 +6803 @@
-    private $m=array();
-  
-
-
+,$aSetAutoMargin=true
+,$aSetAutoMargin
-  $this->dx=$this->left_margin+$this->plotwidth/2;
-  $this->dy=$this->top_margin+$this->plotheight/2;
@@ -7211 +6930 @@
-  
-    function Polygon($pnts,$closed=FALSE,$fast=FALSE) {
-
-
+
+
+
+
+
+
+
-    }
-  
@@ -7521 +7245 @@
-    }
-  
-
-
+,$csimwintarget=''
+,$csimwintarget
-    }
-
@@ -7666 +7390 @@
-    // (As long as it is not an image mark )
-    if( $p[2]->GetType() != MARK_IMG ) {
+